feat(Speech to Text): Add generated code from newest version of service

Author: lpatino10

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

@@ -26,17 +26,22 @@
 public class AddAudioOptions extends GenericModel {
 
   /**
-   * For an audio-type resource, the format (MIME type) of the audio. For more information, see **Content types for
-   * audio-type resources** in the method description.
+   * **For an archive-type resource,** specify the format of the audio files that are contained in the archive file if
+   * they are of type `audio/alaw`, `audio/basic`, `audio/l16`, or `audio/mulaw`. Include the `rate`, `channels`, and
+   * `endianness` parameters where necessary. In this case, all audio files that are contained in the archive file must
+   * be of the indicated type.
    *
-   * For an archive-type resource, the media type of the archive file. For more information, see **Content types for
-   * archive-type resources** in the method description.
+   * For all other audio formats, you can omit the header. In this case, the audio files can be of multiple types as
+   * long as they are not of the types listed in the previous paragraph.
+   *
+   * The parameter accepts all of the audio formats that are supported for use with speech recognition. For more
+   * information, see **Content types for audio-type resources** in the method description.
+   *
+   * **For an audio-type resource,** omit the header.
    */
-  public interface ContentType {
-    /** application/zip. */
-    String APPLICATION_ZIP = "application/zip";
-    /** application/gzip. */
-    String APPLICATION_GZIP = "application/gzip";
+  public interface ContainedContentType {
+    /** audio/alaw. */
+    String AUDIO_ALAW = "audio/alaw";
     /** audio/basic. */
     String AUDIO_BASIC = "audio/basic";
     /** audio/flac. */
@@ -68,12 +73,19 @@ public interface ContentType {
   }
 
   /**
-   * For an archive-type resource, specifies the format of the audio files that are contained in the archive file. The
-   * parameter accepts all of the audio formats that are supported for use with speech recognition, including the
-   * `rate`, `channels`, and `endianness` parameters that are used with some formats. For more information, see
-   * **Content types for audio-type resources** in the method description.
+   * For an audio-type resource, the format (MIME type) of the audio. For more information, see **Content types for
+   * audio-type resources** in the method description.
+   *
+   * For an archive-type resource, the media type of the archive file. For more information, see **Content types for
+   * archive-type resources** in the method description.
    */
-  public interface ContainedContentType {
+  public interface ContentType {
+    /** application/zip. */
+    String APPLICATION_ZIP = "application/zip";
+    /** application/gzip. */
+    String APPLICATION_GZIP = "application/gzip";
+    /** audio/alaw. */
+    String AUDIO_ALAW = "audio/alaw";
     /** audio/basic. */
     String AUDIO_BASIC = "audio/basic";
     /** audio/flac. */
@@ -107,9 +119,9 @@ public interface ContainedContentType {
   private String customizationId;
   private String audioName;
   private InputStream audioResource;
-  private String contentType;
   private String containedContentType;
   private Boolean allowOverwrite;
+  private String contentType;
 
   /**
    * Builder.
@@ -118,17 +130,17 @@ public static class Builder {
     private String customizationId;
     private String audioName;
     private InputStream audioResource;
-    private String contentType;
     private String containedContentType;
     private Boolean allowOverwrite;
+    private String contentType;
 
     private Builder(AddAudioOptions addAudioOptions) {
-      customizationId = addAudioOptions.customizationId;
-      audioName = addAudioOptions.audioName;
-      audioResource = addAudioOptions.audioResource;
-      contentType = addAudioOptions.contentType;
-      containedContentType = addAudioOptions.containedContentType;
-      allowOverwrite = addAudioOptions.allowOverwrite;
+      this.customizationId = addAudioOptions.customizationId;
+      this.audioName = addAudioOptions.audioName;
+      this.audioResource = addAudioOptions.audioResource;
+      this.containedContentType = addAudioOptions.containedContentType;
+      this.allowOverwrite = addAudioOptions.allowOverwrite;
+      this.contentType = addAudioOptions.contentType;
     }
 
     /**
@@ -137,34 +149,6 @@ private Builder(AddAudioOptions addAudioOptions) {
     public Builder() {
     }
 
-    /**
-     * Instantiates a new builder.
-     *
-     * @param customizationId the customizationId
-     * @param audioName the audioName
-     * @deprecated audioResource is now required, so this constructor will be removed in the next major release.
-     */
-    public Builder(String customizationId, String audioName) {
-      this.customizationId = customizationId;
-      this.audioName = audioName;
-    }
-
-    /**
-     * Instantiates a new builder.
-     *
-     * @param customizationId the customizationId
-     * @param audioName the audioName
-     * @param audioResource the audioResource
-     * @param contentType the contentType
-     * @deprecated contentType is no longer required, so this constructor will be removed in the next major release.
-     */
-    public Builder(String customizationId, String audioName, InputStream audioResource, String contentType) {
-      this.customizationId = customizationId;
-      this.audioName = audioName;
-      this.audioResource = audioResource;
-      this.contentType = contentType;
-    }
-
     /**
      * Instantiates a new builder with required properties.
      *
@@ -220,17 +204,6 @@ public Builder audioResource(InputStream audioResource) {
       return this;
     }
 
-    /**
-     * Set the contentType.
-     *
-     * @param contentType the contentType
-     * @return the AddAudioOptions builder
-     */
-    public Builder contentType(String contentType) {
-      this.contentType = contentType;
-      return this;
-    }
-
     /**
      * Set the containedContentType.
      *
@@ -253,6 +226,17 @@ public Builder allowOverwrite(Boolean allowOverwrite) {
       return this;
     }
 
+    /**
+     * Set the contentType.
+     *
+     * @param contentType the contentType
+     * @return the AddAudioOptions builder
+     */
+    public Builder contentType(String contentType) {
+      this.contentType = contentType;
+      return this;
+    }
+
     /**
      * Set the audioResource.
      *
@@ -274,9 +258,9 @@ private AddAudioOptions(Builder builder) {
     customizationId = builder.customizationId;
     audioName = builder.audioName;
     audioResource = builder.audioResource;
-    contentType = builder.contentType;
     containedContentType = builder.containedContentType;
     allowOverwrite = builder.allowOverwrite;
+    contentType = builder.contentType;
   }
 
   /**
@@ -327,27 +311,20 @@ public InputStream audioResource() {
   }
 
   /**
-   * Gets the contentType.
+   * Gets the containedContentType.
    *
-   * For an audio-type resource, the format (MIME type) of the audio. For more information, see **Content types for
-   * audio-type resources** in the method description.
+   * **For an archive-type resource,** specify the format of the audio files that are contained in the archive file if
+   * they are of type `audio/alaw`, `audio/basic`, `audio/l16`, or `audio/mulaw`. Include the `rate`, `channels`, and
+   * `endianness` parameters where necessary. In this case, all audio files that are contained in the archive file must
+   * be of the indicated type.
    *
-   * For an archive-type resource, the media type of the archive file. For more information, see **Content types for
-   * archive-type resources** in the method description.
+   * For all other audio formats, you can omit the header. In this case, the audio files can be of multiple types as
+   * long as they are not of the types listed in the previous paragraph.
    *
-   * @return the contentType
-   */
-  public String contentType() {
-    return contentType;
-  }
-
-  /**
-   * Gets the containedContentType.
+   * The parameter accepts all of the audio formats that are supported for use with speech recognition. For more
+   * information, see **Content types for audio-type resources** in the method description.
    *
-   * For an archive-type resource, specifies the format of the audio files that are contained in the archive file. The
-   * parameter accepts all of the audio formats that are supported for use with speech recognition, including the
-   * `rate`, `channels`, and `endianness` parameters that are used with some formats. For more information, see
-   * **Content types for audio-type resources** in the method description.
+   * **For an audio-type resource,** omit the header.
    *
    * @return the containedContentType
    */
@@ -367,4 +344,19 @@ public String containedContentType() {
   public Boolean allowOverwrite() {
     return allowOverwrite;
   }
+
+  /**
+   * Gets the contentType.
+   *
+   * For an audio-type resource, the format (MIME type) of the audio. For more information, see **Content types for
+   * audio-type resources** in the method description.
+   *
+   * For an archive-type resource, the media type of the archive file. For more information, see **Content types for
+   * archive-type resources** in the method description.
+   *
+   * @return the contentType
+   */
+  public String contentType() {
+    return contentType;
+  }
 }

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

@@ -28,7 +28,6 @@ public class AddCorpusOptions extends GenericModel {
   private String customizationId;
   private String corpusName;
   private InputStream corpusFile;
-  private String corpusFilename;
   private Boolean allowOverwrite;
 
   /**
@@ -38,15 +37,13 @@ public static class Builder {
     private String customizationId;
     private String corpusName;
     private InputStream corpusFile;
-    private String corpusFilename;
     private Boolean allowOverwrite;
 
     private Builder(AddCorpusOptions addCorpusOptions) {
-      customizationId = addCorpusOptions.customizationId;
-      corpusName = addCorpusOptions.corpusName;
-      corpusFile = addCorpusOptions.corpusFile;
-      corpusFilename = addCorpusOptions.corpusFilename;
-      allowOverwrite = addCorpusOptions.allowOverwrite;
+      this.customizationId = addCorpusOptions.customizationId;
+      this.corpusName = addCorpusOptions.corpusName;
+      this.corpusFile = addCorpusOptions.corpusFile;
+      this.allowOverwrite = addCorpusOptions.allowOverwrite;
     }
 
     /**
@@ -110,17 +107,6 @@ public Builder corpusFile(InputStream corpusFile) {
       return this;
     }
 
-    /**
-     * Set the corpusFilename.
-     *
-     * @param corpusFilename the corpusFilename
-     * @return the AddCorpusOptions builder
-     */
-    public Builder corpusFilename(String corpusFilename) {
-      this.corpusFilename = corpusFilename;
-      return this;
-    }
-
     /**
      * Set the allowOverwrite.
      *
@@ -142,7 +128,6 @@ public Builder allowOverwrite(Boolean allowOverwrite) {
      */
     public Builder corpusFile(File corpusFile) throws FileNotFoundException {
       this.corpusFile = new FileInputStream(corpusFile);
-      this.corpusFilename = corpusFile.getName();
       return this;
     }
   }
@@ -154,7 +139,6 @@ private AddCorpusOptions(Builder builder) {
     customizationId = builder.customizationId;
     corpusName = builder.corpusName;
     corpusFile = builder.corpusFile;
-    corpusFilename = builder.corpusFilename;
     allowOverwrite = builder.allowOverwrite;
   }
 
@@ -214,17 +198,6 @@ public InputStream corpusFile() {
     return corpusFile;
   }
 
-  /**
-   * Gets the corpusFilename.
-   *
-   * The filename for corpusFile.
-   *
-   * @return the corpusFilename
-   */
-  public String corpusFilename() {
-    return corpusFilename;
-  }
-
   /**
    * Gets the allowOverwrite.
    *

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

@@ -55,11 +55,11 @@ public static class Builder {
     private Boolean allowOverwrite;
 
     private Builder(AddGrammarOptions addGrammarOptions) {
-      customizationId = addGrammarOptions.customizationId;
-      grammarName = addGrammarOptions.grammarName;
-      grammarFile = addGrammarOptions.grammarFile;
-      contentType = addGrammarOptions.contentType;
-      allowOverwrite = addGrammarOptions.allowOverwrite;
+      this.customizationId = addGrammarOptions.customizationId;
+      this.grammarName = addGrammarOptions.grammarName;
+      this.grammarFile = addGrammarOptions.grammarFile;
+      this.contentType = addGrammarOptions.contentType;
+      this.allowOverwrite = addGrammarOptions.allowOverwrite;
     }
 
     /**

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

@@ -40,11 +40,11 @@ public static class Builder {
     private String displayAs;
 
     private Builder(AddWordOptions addWordOptions) {
-      customizationId = addWordOptions.customizationId;
-      wordName = addWordOptions.wordName;
-      word = addWordOptions.word;
-      soundsLike = addWordOptions.soundsLike;
-      displayAs = addWordOptions.displayAs;
+      this.customizationId = addWordOptions.customizationId;
+      this.wordName = addWordOptions.wordName;
+      this.word = addWordOptions.word;
+      this.soundsLike = addWordOptions.soundsLike;
+      this.displayAs = addWordOptions.displayAs;
     }
 
     /**

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

@@ -34,8 +34,8 @@ public static class Builder {
     private List<CustomWord> words;
 
     private Builder(AddWordsOptions addWordsOptions) {
-      customizationId = addWordsOptions.customizationId;
-      words = addWordsOptions.words;
+      this.customizationId = addWordsOptions.customizationId;
+      this.words = addWordsOptions.words;
     }
 
     /**

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

@@ -40,7 +40,7 @@ public interface Status {
     String INVALID = "invalid";
   }
 
-  private Double duration;
+  private Long duration;
   private String name;
   private AudioDetails details;
   private String status;
@@ -50,12 +50,11 @@ public interface Status {
   /**
    * Gets the duration.
    *
-   * **For an audio-type resource,** the total seconds of audio in the resource. The value is always a whole number.
-   * Omitted for an archive-type resource.
+   * **For an audio-type resource,** the total seconds of audio in the resource. Omitted for an archive-type resource.
    *
    * @return the duration
    */
-  public Double getDuration() {
+  public Long getDuration() {
     return duration;
   }