feat: Support output transcript to GCS for LongRunningRecognize

google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/AdaptationClient.java

@@ -30,6 +30,7 @@
 import com.google.cloud.speech.v1p1beta1.stub.AdaptationStubSettings;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -496,6 +497,35 @@ public final UnaryCallable<ListPhraseSetRequest, ListPhraseSetResponse> listPhra
     return stub.listPhraseSetCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Update a phrase set.
+   *
+   * <p>Sample code:
+   *
+   * <pre>{@code
+   * try (AdaptationClient adaptationClient = AdaptationClient.create()) {
+   *   PhraseSet phraseSet = PhraseSet.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   PhraseSet response = adaptationClient.updatePhraseSet(phraseSet, updateMask);
+   * }
+   * }</pre>
+   *
+   * @param phraseSet Required. The phrase set to update.
+   *     <p>The phrase set's `name` field is used to identify the set to be updated. Format:
+   *     {api_version}/projects/{project}/locations/{location}/phraseSets/{phrase_set}
+   * @param updateMask The list of fields to be updated.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final PhraseSet updatePhraseSet(PhraseSet phraseSet, FieldMask updateMask) {
+    UpdatePhraseSetRequest request =
+        UpdatePhraseSetRequest.newBuilder()
+            .setPhraseSet(phraseSet)
+            .setUpdateMask(updateMask)
+            .build();
+    return updatePhraseSet(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Update a phrase set.
@@ -977,6 +1007,35 @@ public final ListCustomClassesPagedResponse listCustomClasses(ListCustomClassesR
     return stub.listCustomClassesCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Update a custom class.
+   *
+   * <p>Sample code:
+   *
+   * <pre>{@code
+   * try (AdaptationClient adaptationClient = AdaptationClient.create()) {
+   *   CustomClass customClass = CustomClass.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   CustomClass response = adaptationClient.updateCustomClass(customClass, updateMask);
+   * }
+   * }</pre>
+   *
+   * @param customClass Required. The custom class to update.
+   *     <p>The custom class's `name` field is used to identify the custom class to be updated.
+   *     Format: {api_version}/projects/{project}/locations/{location}/customClasses/{custom_class}
+   * @param updateMask The list of fields to be updated.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final CustomClass updateCustomClass(CustomClass customClass, FieldMask updateMask) {
+    UpdateCustomClassRequest request =
+        UpdateCustomClassRequest.newBuilder()
+            .setCustomClass(customClass)
+            .setUpdateMask(updateMask)
+            .build();
+    return updateCustomClass(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Update a custom class.

google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechClient.java

@@ -273,6 +273,7 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
    *       LongRunningRecognizeRequest.newBuilder()
    *           .setConfig(RecognitionConfig.newBuilder().build())
    *           .setAudio(RecognitionAudio.newBuilder().build())
+   *           .setOutputConfig(TranscriptOutputConfig.newBuilder().build())
    *           .build();
    *   LongRunningRecognizeResponse response = speechClient.longRunningRecognizeAsync(request).get();
    * }
@@ -301,6 +302,7 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
    *       LongRunningRecognizeRequest.newBuilder()
    *           .setConfig(RecognitionConfig.newBuilder().build())
    *           .setAudio(RecognitionAudio.newBuilder().build())
+   *           .setOutputConfig(TranscriptOutputConfig.newBuilder().build())
    *           .build();
    *   OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata> future =
    *       speechClient.longRunningRecognizeOperationCallable().futureCall(request);
@@ -330,6 +332,7 @@ public final UnaryCallable<RecognizeRequest, RecognizeResponse> recognizeCallabl
    *       LongRunningRecognizeRequest.newBuilder()
    *           .setConfig(RecognitionConfig.newBuilder().build())
    *           .setAudio(RecognitionAudio.newBuilder().build())
+   *           .setOutputConfig(TranscriptOutputConfig.newBuilder().build())
    *           .build();
    *   ApiFuture<Operation> future = speechClient.longRunningRecognizeCallable().futureCall(request);
    *   // Do something.

google-cloud-speech/src/main/java/com/google/cloud/speech/v1p1beta1/gapic_metadata.json

@@ -53,10 +53,10 @@
               "methods": ["listPhraseSet", "listPhraseSet", "listPhraseSet", "listPhraseSetPagedCallable", "listPhraseSetCallable"]
             },
             "UpdateCustomClass": {
-              "methods": ["updateCustomClass", "updateCustomClassCallable"]
+              "methods": ["updateCustomClass", "updateCustomClass", "updateCustomClassCallable"]
             },
             "UpdatePhraseSet": {
-              "methods": ["updatePhraseSet", "updatePhraseSetCallable"]
+              "methods": ["updatePhraseSet", "updatePhraseSet", "updatePhraseSetCallable"]
             }
           }
         }

google-cloud-speech/src/test/java/com/google/cloud/speech/v1p1beta1/AdaptationClientTest.java

@@ -352,21 +352,18 @@ public void updatePhraseSetTest() throws Exception {
             .build();
     mockAdaptation.addResponse(expectedResponse);
 
-    UpdatePhraseSetRequest request =
-        UpdatePhraseSetRequest.newBuilder()
-            .setPhraseSet(PhraseSet.newBuilder().build())
-            .setUpdateMask(FieldMask.newBuilder().build())
-            .build();
+    PhraseSet phraseSet = PhraseSet.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
 
-    PhraseSet actualResponse = client.updatePhraseSet(request);
+    PhraseSet actualResponse = client.updatePhraseSet(phraseSet, updateMask);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockAdaptation.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     UpdatePhraseSetRequest actualRequest = ((UpdatePhraseSetRequest) actualRequests.get(0));
 
-    Assert.assertEquals(request.getPhraseSet(), actualRequest.getPhraseSet());
-    Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask());
+    Assert.assertEquals(phraseSet, actualRequest.getPhraseSet());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -379,12 +376,9 @@ public void updatePhraseSetExceptionTest() throws Exception {
     mockAdaptation.addException(exception);
 
     try {
-      UpdatePhraseSetRequest request =
-          UpdatePhraseSetRequest.newBuilder()
-              .setPhraseSet(PhraseSet.newBuilder().build())
-              .setUpdateMask(FieldMask.newBuilder().build())
-              .build();
-      client.updatePhraseSet(request);
+      PhraseSet phraseSet = PhraseSet.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
+      client.updatePhraseSet(phraseSet, updateMask);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception.
@@ -729,21 +723,18 @@ public void updateCustomClassTest() throws Exception {
             .build();
     mockAdaptation.addResponse(expectedResponse);
 
-    UpdateCustomClassRequest request =
-        UpdateCustomClassRequest.newBuilder()
-            .setCustomClass(CustomClass.newBuilder().build())
-            .setUpdateMask(FieldMask.newBuilder().build())
-            .build();
+    CustomClass customClass = CustomClass.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
 
-    CustomClass actualResponse = client.updateCustomClass(request);
+    CustomClass actualResponse = client.updateCustomClass(customClass, updateMask);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockAdaptation.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     UpdateCustomClassRequest actualRequest = ((UpdateCustomClassRequest) actualRequests.get(0));
 
-    Assert.assertEquals(request.getCustomClass(), actualRequest.getCustomClass());
-    Assert.assertEquals(request.getUpdateMask(), actualRequest.getUpdateMask());
+    Assert.assertEquals(customClass, actualRequest.getCustomClass());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -756,12 +747,9 @@ public void updateCustomClassExceptionTest() throws Exception {
     mockAdaptation.addException(exception);
 
     try {
-      UpdateCustomClassRequest request =
-          UpdateCustomClassRequest.newBuilder()
-              .setCustomClass(CustomClass.newBuilder().build())
-              .setUpdateMask(FieldMask.newBuilder().build())
-              .build();
-      client.updateCustomClass(request);
+      CustomClass customClass = CustomClass.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
+      client.updateCustomClass(customClass, updateMask);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception.

proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeMetadata.java

@@ -267,8 +267,8 @@ public com.google.protobuf.TimestampOrBuilder getLastUpdateTimeOrBuilder() {
    *
    *
    * <pre>
-   * Output only. The URI of the audio file being transcribed. Empty if the
-   * audio was sent as byte content.
+   * Output only. The URI of the audio file being transcribed. Empty if the audio was sent
+   * as byte content.
    * </pre>
    *
    * <code>string uri = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -291,8 +291,8 @@ public java.lang.String getUri() {
    *
    *
    * <pre>
-   * Output only. The URI of the audio file being transcribed. Empty if the
-   * audio was sent as byte content.
+   * Output only. The URI of the audio file being transcribed. Empty if the audio was sent
+   * as byte content.
    * </pre>
    *
    * <code>string uri = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1131,8 +1131,8 @@ public com.google.protobuf.TimestampOrBuilder getLastUpdateTimeOrBuilder() {
      *
      *
      * <pre>
-     * Output only. The URI of the audio file being transcribed. Empty if the
-     * audio was sent as byte content.
+     * Output only. The URI of the audio file being transcribed. Empty if the audio was sent
+     * as byte content.
      * </pre>
      *
      * <code>string uri = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1154,8 +1154,8 @@ public java.lang.String getUri() {
      *
      *
      * <pre>
-     * Output only. The URI of the audio file being transcribed. Empty if the
-     * audio was sent as byte content.
+     * Output only. The URI of the audio file being transcribed. Empty if the audio was sent
+     * as byte content.
      * </pre>
      *
      * <code>string uri = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1177,8 +1177,8 @@ public com.google.protobuf.ByteString getUriBytes() {
      *
      *
      * <pre>
-     * Output only. The URI of the audio file being transcribed. Empty if the
-     * audio was sent as byte content.
+     * Output only. The URI of the audio file being transcribed. Empty if the audio was sent
+     * as byte content.
      * </pre>
      *
      * <code>string uri = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1199,8 +1199,8 @@ public Builder setUri(java.lang.String value) {
      *
      *
      * <pre>
-     * Output only. The URI of the audio file being transcribed. Empty if the
-     * audio was sent as byte content.
+     * Output only. The URI of the audio file being transcribed. Empty if the audio was sent
+     * as byte content.
      * </pre>
      *
      * <code>string uri = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1217,8 +1217,8 @@ public Builder clearUri() {
      *
      *
      * <pre>
-     * Output only. The URI of the audio file being transcribed. Empty if the
-     * audio was sent as byte content.
+     * Output only. The URI of the audio file being transcribed. Empty if the audio was sent
+     * as byte content.
      * </pre>
      *
      * <code>string uri = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>

proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeMetadataOrBuilder.java

@@ -111,8 +111,8 @@ public interface LongRunningRecognizeMetadataOrBuilder
    *
    *
    * <pre>
-   * Output only. The URI of the audio file being transcribed. Empty if the
-   * audio was sent as byte content.
+   * Output only. The URI of the audio file being transcribed. Empty if the audio was sent
+   * as byte content.
    * </pre>
    *
    * <code>string uri = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -124,8 +124,8 @@ public interface LongRunningRecognizeMetadataOrBuilder
    *
    *
    * <pre>
-   * Output only. The URI of the audio file being transcribed. Empty if the
-   * audio was sent as byte content.
+   * Output only. The URI of the audio file being transcribed. Empty if the audio was sent
+   * as byte content.
    * </pre>
    *
    * <code>string uri = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>