[aws-android-sdk-polly] Update models to latest (#1111)

Author: awsmobilesdk

aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/AmazonPolly.java

@@ -102,7 +102,7 @@ public interface AmazonPolly {
      * </p>
      * <p>
      * For more information, see <a href=
-     * "http://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
+     * "https://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
      * >Managing Lexicons</a>.
      * </p>
      * 
@@ -170,7 +170,7 @@ DescribeVoicesResult describeVoices(DescribeVoicesRequest describeVoicesRequest)
      * <p>
      * Returns the content of the specified pronunciation lexicon stored in an
      * AWS Region. For more information, see <a href=
-     * "http://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
+     * "https://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
      * >Managing Lexicons</a>.
      * </p>
      * 
@@ -221,7 +221,7 @@ GetSpeechSynthesisTaskResult getSpeechSynthesisTask(
      * <p>
      * Returns a list of pronunciation lexicons stored in an AWS Region. For
      * more information, see <a href=
-     * "http://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
+     * "https://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
      * >Managing Lexicons</a>.
      * </p>
      * 
@@ -276,7 +276,7 @@ ListSpeechSynthesisTasksResult listSpeechSynthesisTasks(
      * </p>
      * <p>
      * For more information, see <a href=
-     * "http://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
+     * "https://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
      * >Managing Lexicons</a>.
      * </p>
      * 
@@ -323,6 +323,7 @@ PutLexiconResult putLexicon(PutLexiconRequest putLexiconRequest) throws AmazonCl
      * @throws InvalidSampleRateException
      * @throws InvalidSnsTopicArnException
      * @throws InvalidSsmlException
+     * @throws EngineNotSupportedException
      * @throws LexiconNotFoundException
      * @throws ServiceFailureException
      * @throws MarksNotSupportedForFormatException
@@ -347,7 +348,7 @@ StartSpeechSynthesisTaskResult startSpeechSynthesisTask(
      * available with all the voices (for example, Cyrillic might not be read at
      * all by English voices) unless phoneme mapping is used. For more
      * information, see <a href=
-     * "http://docs.aws.amazon.com/polly/latest/dg/how-text-to-speech-works.html"
+     * "https://docs.aws.amazon.com/polly/latest/dg/how-text-to-speech-works.html"
      * >How it Works</a>.
      * </p>
      * 
@@ -362,6 +363,7 @@ StartSpeechSynthesisTaskResult startSpeechSynthesisTask(
      * @throws MarksNotSupportedForFormatException
      * @throws SsmlMarksNotSupportedForTextTypeException
      * @throws LanguageNotSupportedException
+     * @throws EngineNotSupportedException
      * @throws AmazonClientException If any internal errors are encountered
      *             inside the client while attempting to make the request or
      *             handle the response. For example if a network connection is

aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/AmazonPollyClient.java

@@ -329,6 +329,7 @@ public AmazonPollyClient(AWSCredentialsProvider awsCredentialsProvider,
 
     private void init() {
         jsonErrorUnmarshallers = new ArrayList<JsonErrorUnmarshaller>();
+        jsonErrorUnmarshallers.add(new EngineNotSupportedExceptionUnmarshaller());
         jsonErrorUnmarshallers.add(new InvalidLexiconExceptionUnmarshaller());
         jsonErrorUnmarshallers.add(new InvalidNextTokenExceptionUnmarshaller());
         jsonErrorUnmarshallers.add(new InvalidS3BucketExceptionUnmarshaller());
@@ -377,7 +378,7 @@ private static ClientConfiguration adjustClientConfiguration(ClientConfiguration
      * </p>
      * <p>
      * For more information, see <a href=
-     * "http://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
+     * "https://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
      * >Managing Lexicons</a>.
      * </p>
      * 
@@ -497,7 +498,7 @@ public DescribeVoicesResult describeVoices(DescribeVoicesRequest describeVoicesR
      * <p>
      * Returns the content of the specified pronunciation lexicon stored in an
      * AWS Region. For more information, see <a href=
-     * "http://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
+     * "https://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
      * >Managing Lexicons</a>.
      * </p>
      * 
@@ -601,7 +602,7 @@ public GetSpeechSynthesisTaskResult getSpeechSynthesisTask(
      * <p>
      * Returns a list of pronunciation lexicons stored in an AWS Region. For
      * more information, see <a href=
-     * "http://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
+     * "https://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
      * >Managing Lexicons</a>.
      * </p>
      * 
@@ -709,7 +710,7 @@ public ListSpeechSynthesisTasksResult listSpeechSynthesisTasks(
      * </p>
      * <p>
      * For more information, see <a href=
-     * "http://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
+     * "https://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
      * >Managing Lexicons</a>.
      * </p>
      * 
@@ -782,6 +783,7 @@ public PutLexiconResult putLexicon(PutLexiconRequest putLexiconRequest)
      * @throws InvalidSampleRateException
      * @throws InvalidSnsTopicArnException
      * @throws InvalidSsmlException
+     * @throws EngineNotSupportedException
      * @throws LexiconNotFoundException
      * @throws ServiceFailureException
      * @throws MarksNotSupportedForFormatException
@@ -833,7 +835,7 @@ public StartSpeechSynthesisTaskResult startSpeechSynthesisTask(
      * available with all the voices (for example, Cyrillic might not be read at
      * all by English voices) unless phoneme mapping is used. For more
      * information, see <a href=
-     * "http://docs.aws.amazon.com/polly/latest/dg/how-text-to-speech-works.html"
+     * "https://docs.aws.amazon.com/polly/latest/dg/how-text-to-speech-works.html"
      * >How it Works</a>.
      * </p>
      * 
@@ -848,6 +850,7 @@ public StartSpeechSynthesisTaskResult startSpeechSynthesisTask(
      * @throws MarksNotSupportedForFormatException
      * @throws SsmlMarksNotSupportedForTextTypeException
      * @throws LanguageNotSupportedException
+     * @throws EngineNotSupportedException
      * @throws AmazonClientException If any internal errors are encountered
      *             inside the client while attempting to make the request or
      *             handle the response. For example if a network connection is

aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/DeleteLexiconRequest.java

@@ -28,7 +28,7 @@
  * </p>
  * <p>
  * For more information, see <a
- * href="http://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
+ * href="https://docs.aws.amazon.com/polly/latest/dg/managing-lexicons.html"
  * >Managing Lexicons</a>.
  * </p>
  */

aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/DescribeVoicesRequest.java

@@ -47,6 +47,17 @@
  * </p>
  */
 public class DescribeVoicesRequest extends AmazonWebServiceRequest implements Serializable {
+    /**
+     * <p>
+     * Specifies the engine (<code>standard</code> or <code>neural</code>) used
+     * by Amazon Polly when processing input text for speech synthesis.
+     * </p>
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Allowed Values: </b>standard, neural
+     */
+    private String engine;
+
     /**
      * <p>
      * The language identification tag (ISO 639 code for the language name-ISO
@@ -86,6 +97,118 @@ public class DescribeVoicesRequest extends AmazonWebServiceRequest implements Se
      */
     private String nextToken;
 
+    /**
+     * <p>
+     * Specifies the engine (<code>standard</code> or <code>neural</code>) used
+     * by Amazon Polly when processing input text for speech synthesis.
+     * </p>
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Allowed Values: </b>standard, neural
+     *
+     * @return <p>
+     *         Specifies the engine (<code>standard</code> or
+     *         <code>neural</code>) used by Amazon Polly when processing input
+     *         text for speech synthesis.
+     *         </p>
+     * @see Engine
+     */
+    public String getEngine() {
+        return engine;
+    }
+
+    /**
+     * <p>
+     * Specifies the engine (<code>standard</code> or <code>neural</code>) used
+     * by Amazon Polly when processing input text for speech synthesis.
+     * </p>
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Allowed Values: </b>standard, neural
+     *
+     * @param engine <p>
+     *            Specifies the engine (<code>standard</code> or
+     *            <code>neural</code>) used by Amazon Polly when processing
+     *            input text for speech synthesis.
+     *            </p>
+     * @see Engine
+     */
+    public void setEngine(String engine) {
+        this.engine = engine;
+    }
+
+    /**
+     * <p>
+     * Specifies the engine (<code>standard</code> or <code>neural</code>) used
+     * by Amazon Polly when processing input text for speech synthesis.
+     * </p>
+     * <p>
+     * Returns a reference to this object so that method calls can be chained
+     * together.
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Allowed Values: </b>standard, neural
+     *
+     * @param engine <p>
+     *            Specifies the engine (<code>standard</code> or
+     *            <code>neural</code>) used by Amazon Polly when processing
+     *            input text for speech synthesis.
+     *            </p>
+     * @return A reference to this updated object so that method calls can be
+     *         chained together.
+     * @see Engine
+     */
+    public DescribeVoicesRequest withEngine(String engine) {
+        this.engine = engine;
+        return this;
+    }
+
+    /**
+     * <p>
+     * Specifies the engine (<code>standard</code> or <code>neural</code>) used
+     * by Amazon Polly when processing input text for speech synthesis.
+     * </p>
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Allowed Values: </b>standard, neural
+     *
+     * @param engine <p>
+     *            Specifies the engine (<code>standard</code> or
+     *            <code>neural</code>) used by Amazon Polly when processing
+     *            input text for speech synthesis.
+     *            </p>
+     * @see Engine
+     */
+    public void setEngine(Engine engine) {
+        this.engine = engine.toString();
+    }
+
+    /**
+     * <p>
+     * Specifies the engine (<code>standard</code> or <code>neural</code>) used
+     * by Amazon Polly when processing input text for speech synthesis.
+     * </p>
+     * <p>
+     * Returns a reference to this object so that method calls can be chained
+     * together.
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Allowed Values: </b>standard, neural
+     *
+     * @param engine <p>
+     *            Specifies the engine (<code>standard</code> or
+     *            <code>neural</code>) used by Amazon Polly when processing
+     *            input text for speech synthesis.
+     *            </p>
+     * @return A reference to this updated object so that method calls can be
+     *         chained together.
+     * @see Engine
+     */
+    public DescribeVoicesRequest withEngine(Engine engine) {
+        this.engine = engine.toString();
+        return this;
+    }
+
     /**
      * <p>
      * The language identification tag (ISO 639 code for the language name-ISO
@@ -401,6 +524,8 @@ public DescribeVoicesRequest withNextToken(String nextToken) {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("{");
+        if (getEngine() != null)
+            sb.append("Engine: " + getEngine() + ",");
         if (getLanguageCode() != null)
             sb.append("LanguageCode: " + getLanguageCode() + ",");
         if (getIncludeAdditionalLanguageCodes() != null)
@@ -417,6 +542,7 @@ public int hashCode() {
         final int prime = 31;
         int hashCode = 1;
 
+        hashCode = prime * hashCode + ((getEngine() == null) ? 0 : getEngine().hashCode());
         hashCode = prime * hashCode
                 + ((getLanguageCode() == null) ? 0 : getLanguageCode().hashCode());
         hashCode = prime
@@ -438,6 +564,10 @@ public boolean equals(Object obj) {
             return false;
         DescribeVoicesRequest other = (DescribeVoicesRequest) obj;
 
+        if (other.getEngine() == null ^ this.getEngine() == null)
+            return false;
+        if (other.getEngine() != null && other.getEngine().equals(this.getEngine()) == false)
+            return false;
         if (other.getLanguageCode() == null ^ this.getLanguageCode() == null)
             return false;
         if (other.getLanguageCode() != null

aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/Engine.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazonaws.services.polly.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Engine
+ */
+public enum Engine {
+
+    Standard("standard"),
+    Neural("neural");
+
+    private String value;
+
+    private Engine(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    private static final Map<String, Engine> enumMap;
+    static {
+        enumMap = new HashMap<String, Engine>();
+        enumMap.put("standard", Standard);
+        enumMap.put("neural", Neural);
+    }
+
+    /**
+     * Use this in place of valueOf.
+     *
+     * @param value real value
+     * @return Engine corresponding to the value
+     */
+    public static Engine fromValue(String value) {
+        if (value == null || value.isEmpty()) {
+            throw new IllegalArgumentException("Value cannot be null or empty!");
+        } else if (enumMap.containsKey(value)) {
+            return enumMap.get(value);
+        } else {
+            throw new IllegalArgumentException("Cannot create enum from " + value + " value!");
+        }
+    }
+}