feat: add speaker_tag to WordInfo (#40)

* [CHANGE ME] Re-generated to pick up changes in the API or client library generator. * fix: allow proto interface changes
googleapis · Nov 12, 2019 · 3ccf3fe · 3ccf3fe
1 parent 604855f
commit 3ccf3fe
Show file tree

Hide file tree

Showing 34 changed files with 793 additions and 135 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ If you are still having issues, please include as much information as possible:
    General, Core, and Other are also allowed as types
 2. OS type and version:
 3. Java version:
-4. google-cloud-speect version(s):
+4. google-cloud-speech version(s):
 
 #### Steps to reproduce
 

diff --git a/.kokoro/continuous/propose_release.sh b/.kokoro/continuous/propose_release.sh
@@ -22,7 +22,7 @@ if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; th
   # Groom the release PR as new commits are merged.
   npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
     --repo-url=googleapis/java-speech \
-    --package-name="google-cloud-speect" \
+    --package-name="google-cloud-speech" \
     --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
     --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
     --release-type=java-yoshi

diff --git a/.kokoro/release/bump_snapshot.sh b/.kokoro/release/bump_snapshot.sh
@@ -22,7 +22,7 @@ if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; th
   # Groom the snapshot release PR immediately after publishing a release
   npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
     --repo-url=googleapis/java-speech \
-    --package-name="google-cloud-speect" \
+    --package-name="google-cloud-speech" \
     --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
     --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
     --snapshot \

diff --git a/.kokoro/release/drop.cfg b/.kokoro/release/drop.cfg
@@ -4,6 +4,3 @@ env_vars: {
   key: "TRAMPOLINE_BUILD_FILE"
   value: "github/java-speech/.kokoro/release/drop.sh"
 }
-
-# Download staging properties file.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-speech"
diff --git a/.kokoro/release/promote.cfg b/.kokoro/release/promote.cfg
@@ -4,7 +4,3 @@ env_vars: {
   key: "TRAMPOLINE_BUILD_FILE"
   value: "github/java-speech/.kokoro/release/promote.sh"
 }
-
-# Download staging properties file.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-speech"
-
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
@@ -33,7 +33,7 @@ python3 -m pip install gcp-docuploader
 # compile all packages
 mvn clean install -B -DskipTests=true
 
-NAME=google-cloud-speect
+NAME=google-cloud-speech
 VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
 
 # build the docs

diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechSmokeTest.java b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechSmokeTest.java
@@ -53,7 +53,7 @@ public static void executeNoCatch() throws Exception {
               .setSampleRateHertz(sampleRateHertz)
               .setEncoding(encoding)
               .build();
-      String uri = "gs://gapic-toolkit/hello.flac";
+      String uri = "gs://cloud-samples-data/speech/brooklyn_bridge.flac";
       RecognitionAudio audio = RecognitionAudio.newBuilder().setUri(uri).build();
 
       RecognizeResponse response = client.recognize(config, audio);

diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechSmokeTest.java b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/SpeechSmokeTest.java
@@ -53,7 +53,7 @@ public static void executeNoCatch() throws Exception {
               .setSampleRateHertz(sampleRateHertz)
               .setEncoding(encoding)
               .build();
-      String uri = "gs://gapic-toolkit/hello.flac";
+      String uri = "gs://cloud-samples-data/speech/brooklyn_bridge.flac";
       RecognitionAudio audio = RecognitionAudio.newBuilder().setUri(uri).build();
 
       RecognizeResponse response = client.recognize(config, audio);

diff --git a/proto-google-cloud-speech-v1/clirr-ignored-differences.xml b/proto-google-cloud-speech-v1/clirr-ignored-differences.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/speech/v1/*OrBuilder</className>
+    <method>* get*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/speech/v1/*OrBuilder</className>
+    <method>boolean contains*(*)</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/speech/v1/*OrBuilder</className>
+    <method>boolean has*(*)</method>
+  </difference>
+</differences>
diff --git a/...le-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeakerDiarizationConfig.java b/...le-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeakerDiarizationConfig.java
@@ -174,15 +174,13 @@ public int getMaxSpeakerCount() {
    *
    *
    * <pre>
-   * A distinct integer value is assigned for every speaker within
-   * the audio. This field specifies which one of those speakers was detected to
-   * have spoken this word. Value ranges from '1' to diarization_speaker_count.
-   * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
-   * top alternative.
+   * Unused.
    * </pre>
    *
-   * <code>int32 speaker_tag = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
+   * <code>int32 speaker_tag = 5 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY];
+   * </code>
    */
+  @java.lang.Deprecated
   public int getSpeakerTag() {
     return speakerTag_;
   }
@@ -704,31 +702,27 @@ public Builder clearMaxSpeakerCount() {
      *
      *
      * <pre>
-     * A distinct integer value is assigned for every speaker within
-     * the audio. This field specifies which one of those speakers was detected to
-     * have spoken this word. Value ranges from '1' to diarization_speaker_count.
-     * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
-     * top alternative.
+     * Unused.
      * </pre>
      *
-     * <code>int32 speaker_tag = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
+     * <code>int32 speaker_tag = 5 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY];
+     * </code>
      */
+    @java.lang.Deprecated
     public int getSpeakerTag() {
       return speakerTag_;
     }
     /**
      *
      *
      * <pre>
-     * A distinct integer value is assigned for every speaker within
-     * the audio. This field specifies which one of those speakers was detected to
-     * have spoken this word. Value ranges from '1' to diarization_speaker_count.
-     * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
-     * top alternative.
+     * Unused.
      * </pre>
      *
-     * <code>int32 speaker_tag = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
+     * <code>int32 speaker_tag = 5 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY];
+     * </code>
      */
+    @java.lang.Deprecated
     public Builder setSpeakerTag(int value) {
 
       speakerTag_ = value;
@@ -739,15 +733,13 @@ public Builder setSpeakerTag(int value) {
      *
      *
      * <pre>
-     * A distinct integer value is assigned for every speaker within
-     * the audio. This field specifies which one of those speakers was detected to
-     * have spoken this word. Value ranges from '1' to diarization_speaker_count.
-     * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
-     * top alternative.
+     * Unused.
      * </pre>
      *
-     * <code>int32 speaker_tag = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
+     * <code>int32 speaker_tag = 5 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY];
+     * </code>
      */
+    @java.lang.Deprecated
     public Builder clearSpeakerTag() {
 
       speakerTag_ = 0;

diff --git a/...speech-v1/src/main/java/com/google/cloud/speech/v1/SpeakerDiarizationConfigOrBuilder.java b/...speech-v1/src/main/java/com/google/cloud/speech/v1/SpeakerDiarizationConfigOrBuilder.java
@@ -66,14 +66,12 @@ public interface SpeakerDiarizationConfigOrBuilder
    *
    *
    * <pre>
-   * A distinct integer value is assigned for every speaker within
-   * the audio. This field specifies which one of those speakers was detected to
-   * have spoken this word. Value ranges from '1' to diarization_speaker_count.
-   * speaker_tag is set if enable_speaker_diarization = 'true' and only in the
-   * top alternative.
+   * Unused.
    * </pre>
    *
-   * <code>int32 speaker_tag = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
+   * <code>int32 speaker_tag = 5 [deprecated = true, (.google.api.field_behavior) = OUTPUT_ONLY];
+   * </code>
    */
+  @java.lang.Deprecated
   int getSpeakerTag();
 }