chore: Integrate new gapic-generator-java and rules_gapic (googleapis#41

) - [ ] Regenerate this pull request now. PiperOrigin-RevId: 454027580 Source-Link: googleapis/googleapis@1b22277 Source-Link: https://github.com/googleapis/googleapis-gen/commit/e04cea20d0d12eb5c3bdb360a9e72b654edcb638 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTA0Y2VhMjBkMGQxMmViNWMzYmRiMzYwYTllNzJiNjU0ZWRjYjYzOCJ9 feat: add asset_id and stream_id fields to VodSession and LiveSession responses fix!: remove COMPLETE_POD stitching option PiperOrigin-RevId: 454023909 Source-Link: googleapis/googleapis@f296ef5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/bb5e9fcb21404eb0f6e649443c41c5acfdc301e1 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYmI1ZTlmY2IyMTQwNGViMGY2ZTY0OTQ0M2M0MWM1YWNmZGMzMDFlMSJ9
suztomo · Jun 24, 2022 · 98686dd · 98686dd
1 parent 879617c
commit 98686dd
Show file tree

Hide file tree

Showing 13 changed files with 680 additions and 369 deletions.
diff --git a/...stitcher/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClient.java b/...stitcher/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClient.java
@@ -435,7 +435,7 @@ public final ListCdnKeysPagedResponse listCdnKeys(ListCdnKeysRequest request) {
    *   while (true) {
    *     ListCdnKeysResponse response =
    *         videoStitcherServiceClient.listCdnKeysCallable().call(request);
-   *     for (CdnKey element : response.getResponsesList()) {
+   *     for (CdnKey element : response.getCdnKeysList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -1107,7 +1107,7 @@ public final ListVodStitchDetailsPagedResponse listVodStitchDetails(
    *   while (true) {
    *     ListVodStitchDetailsResponse response =
    *         videoStitcherServiceClient.listVodStitchDetailsCallable().call(request);
-   *     for (VodStitchDetail element : response.getResponsesList()) {
+   *     for (VodStitchDetail element : response.getVodStitchDetailsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -1386,7 +1386,7 @@ public final ListVodAdTagDetailsPagedResponse listVodAdTagDetails(
    *   while (true) {
    *     ListVodAdTagDetailsResponse response =
    *         videoStitcherServiceClient.listVodAdTagDetailsCallable().call(request);
-   *     for (VodAdTagDetail element : response.getResponsesList()) {
+   *     for (VodAdTagDetail element : response.getVodAdTagDetailsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -1663,7 +1663,7 @@ public final ListLiveAdTagDetailsPagedResponse listLiveAdTagDetails(
    *   while (true) {
    *     ListLiveAdTagDetailsResponse response =
    *         videoStitcherServiceClient.listLiveAdTagDetailsCallable().call(request);
-   *     for (LiveAdTagDetail element : response.getResponsesList()) {
+   *     for (LiveAdTagDetail element : response.getLiveAdTagDetailsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -2065,7 +2065,7 @@ public final UnaryCallable<ListSlatesRequest, ListSlatesPagedResponse> listSlate
    *           .build();
    *   while (true) {
    *     ListSlatesResponse response = videoStitcherServiceClient.listSlatesCallable().call(request);
-   *     for (Slate element : response.getResponsesList()) {
+   *     for (Slate element : response.getSlatesList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
@@ -2387,15 +2387,6 @@ public final UnaryCallable<DeleteSlateRequest, Empty> deleteSlateCallable() {
    *
    * @param parent Required. The project and location in which the live session should be created,
    *     in the form of `projects/{project_number}/locations/{location}`.
-   *     <p>Valid locations:
-   *     <ul>
-   *       <li>`-` (Video Stitcher API will pick a location that is closest to the caller.)
-   *       <li>`us-east1`
-   *       <li>`us-west1`
-   *       <li>`us-central1`
-   *       <li>`europe-west1`
-   *     </ul>
-   *
    * @param liveSession Required. Parameters for creating a live session.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
@@ -2427,15 +2418,6 @@ public final LiveSession createLiveSession(LiveSessionName parent, LiveSession l
    *
    * @param parent Required. The project and location in which the live session should be created,
    *     in the form of `projects/{project_number}/locations/{location}`.
-   *     <p>Valid locations:
-   *     <ul>
-   *       <li>`-` (Video Stitcher API will pick a location that is closest to the caller.)
-   *       <li>`us-east1`
-   *       <li>`us-west1`
-   *       <li>`us-central1`
-   *       <li>`europe-west1`
-   *     </ul>
-   *
    * @param liveSession Required. Parameters for creating a live session.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */

diff --git a/...cher/src/test/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClientTest.java b/...cher/src/test/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClientTest.java
@@ -464,6 +464,7 @@ public void createVodSessionTest() throws Exception {
             .putAllAdTagMacroMap(new HashMap<String, String>())
             .setClientAdTracking(true)
             .setManifestOptions(ManifestOptions.newBuilder().build())
+            .setAssetId("assetId-704776149")
             .build();
     mockVideoStitcherService.addResponse(expectedResponse);
 
@@ -512,6 +513,7 @@ public void createVodSessionTest2() throws Exception {
             .putAllAdTagMacroMap(new HashMap<String, String>())
             .setClientAdTracking(true)
             .setManifestOptions(ManifestOptions.newBuilder().build())
+            .setAssetId("assetId-704776149")
             .build();
     mockVideoStitcherService.addResponse(expectedResponse);
 
@@ -560,6 +562,7 @@ public void getVodSessionTest() throws Exception {
             .putAllAdTagMacroMap(new HashMap<String, String>())
             .setClientAdTracking(true)
             .setManifestOptions(ManifestOptions.newBuilder().build())
+            .setAssetId("assetId-704776149")
             .build();
     mockVideoStitcherService.addResponse(expectedResponse);
 
@@ -605,6 +608,7 @@ public void getVodSessionTest2() throws Exception {
             .putAllAdTagMacroMap(new HashMap<String, String>())
             .setClientAdTracking(true)
             .setManifestOptions(ManifestOptions.newBuilder().build())
+            .setAssetId("assetId-704776149")
             .build();
     mockVideoStitcherService.addResponse(expectedResponse);
 
@@ -1544,6 +1548,7 @@ public void createLiveSessionTest() throws Exception {
             .setClientAdTracking(true)
             .setDefaultSlateId("defaultSlateId-122056941")
             .setManifestOptions(ManifestOptions.newBuilder().build())
+            .setStreamId("streamId1790933179")
             .build();
     mockVideoStitcherService.addResponse(expectedResponse);
 
@@ -1593,6 +1598,7 @@ public void createLiveSessionTest2() throws Exception {
             .setClientAdTracking(true)
             .setDefaultSlateId("defaultSlateId-122056941")
             .setManifestOptions(ManifestOptions.newBuilder().build())
+            .setStreamId("streamId1790933179")
             .build();
     mockVideoStitcherService.addResponse(expectedResponse);
 
@@ -1642,6 +1648,7 @@ public void getLiveSessionTest() throws Exception {
             .setClientAdTracking(true)
             .setDefaultSlateId("defaultSlateId-122056941")
             .setManifestOptions(ManifestOptions.newBuilder().build())
+            .setStreamId("streamId1790933179")
             .build();
     mockVideoStitcherService.addResponse(expectedResponse);
 
@@ -1688,6 +1695,7 @@ public void getLiveSessionTest2() throws Exception {
             .setClientAdTracking(true)
             .setDefaultSlateId("defaultSlateId-122056941")
             .setManifestOptions(ManifestOptions.newBuilder().build())
+            .setStreamId("streamId1790933179")
             .build();
     mockVideoStitcherService.addResponse(expectedResponse);
 

diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/clirr-ignored-differences.xml b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/clirr-ignored-differences.xml
@@ -16,4 +16,14 @@
     <className>com/google/cloud/video/stitcher/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>6001</differenceType>
+    <className>com/google/cloud/video/stitcher/v1/LiveSession$StitchingPolicy</className>
+    <field>COMPLETE_POD</field>
+  </difference>
+  <difference>
+    <differenceType>6011</differenceType>
+    <className>com/google/cloud/video/stitcher/v1/LiveSession$StitchingPolicy</className>
+    <field>COMPLETE_POD_VALUE</field>
+  </difference>
 </differences>
diff --git a/...titcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequest.java b/...titcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequest.java
@@ -137,13 +137,6 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * <pre>
    * Required. The project and location in which the live session should be created,
    * in the form of `projects/{project_number}/locations/{location}`.
-   * Valid locations:
-   * * `-` (Video Stitcher API will pick a location that is closest to the
-   * caller.)
-   * * `us-east1`
-   * * `us-west1`
-   * * `us-central1`
-   * * `europe-west1`
    * </pre>
    *
    * <code>
@@ -170,13 +163,6 @@ public java.lang.String getParent() {
    * <pre>
    * Required. The project and location in which the live session should be created,
    * in the form of `projects/{project_number}/locations/{location}`.
-   * Valid locations:
-   * * `-` (Video Stitcher API will pick a location that is closest to the
-   * caller.)
-   * * `us-east1`
-   * * `us-west1`
-   * * `us-central1`
-   * * `europe-west1`
    * </pre>
    *
    * <code>
@@ -606,13 +592,6 @@ public Builder mergeFrom(
      * <pre>
      * Required. The project and location in which the live session should be created,
      * in the form of `projects/{project_number}/locations/{location}`.
-     * Valid locations:
-     * * `-` (Video Stitcher API will pick a location that is closest to the
-     * caller.)
-     * * `us-east1`
-     * * `us-west1`
-     * * `us-central1`
-     * * `europe-west1`
      * </pre>
      *
      * <code>
@@ -638,13 +617,6 @@ public java.lang.String getParent() {
      * <pre>
      * Required. The project and location in which the live session should be created,
      * in the form of `projects/{project_number}/locations/{location}`.
-     * Valid locations:
-     * * `-` (Video Stitcher API will pick a location that is closest to the
-     * caller.)
-     * * `us-east1`
-     * * `us-west1`
-     * * `us-central1`
-     * * `europe-west1`
      * </pre>
      *
      * <code>
@@ -670,13 +642,6 @@ public com.google.protobuf.ByteString getParentBytes() {
      * <pre>
      * Required. The project and location in which the live session should be created,
      * in the form of `projects/{project_number}/locations/{location}`.
-     * Valid locations:
-     * * `-` (Video Stitcher API will pick a location that is closest to the
-     * caller.)
-     * * `us-east1`
-     * * `us-west1`
-     * * `us-central1`
-     * * `europe-west1`
      * </pre>
      *
      * <code>
@@ -701,13 +666,6 @@ public Builder setParent(java.lang.String value) {
      * <pre>
      * Required. The project and location in which the live session should be created,
      * in the form of `projects/{project_number}/locations/{location}`.
-     * Valid locations:
-     * * `-` (Video Stitcher API will pick a location that is closest to the
-     * caller.)
-     * * `us-east1`
-     * * `us-west1`
-     * * `us-central1`
-     * * `europe-west1`
      * </pre>
      *
      * <code>
@@ -728,13 +686,6 @@ public Builder clearParent() {
      * <pre>
      * Required. The project and location in which the live session should be created,
      * in the form of `projects/{project_number}/locations/{location}`.
-     * Valid locations:
-     * * `-` (Video Stitcher API will pick a location that is closest to the
-     * caller.)
-     * * `us-east1`
-     * * `us-west1`
-     * * `us-central1`
-     * * `europe-west1`
      * </pre>
      *
      * <code>

diff --git a/...1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequestOrBuilder.java b/...1/src/main/java/com/google/cloud/video/stitcher/v1/CreateLiveSessionRequestOrBuilder.java
@@ -29,13 +29,6 @@ public interface CreateLiveSessionRequestOrBuilder
    * <pre>
    * Required. The project and location in which the live session should be created,
    * in the form of `projects/{project_number}/locations/{location}`.
-   * Valid locations:
-   * * `-` (Video Stitcher API will pick a location that is closest to the
-   * caller.)
-   * * `us-east1`
-   * * `us-west1`
-   * * `us-central1`
-   * * `europe-west1`
    * </pre>
    *
    * <code>
@@ -51,13 +44,6 @@ public interface CreateLiveSessionRequestOrBuilder
    * <pre>
    * Required. The project and location in which the live session should be created,
    * in the form of `projects/{project_number}/locations/{location}`.
-   * Valid locations:
-   * * `-` (Video Stitcher API will pick a location that is closest to the
-   * caller.)
-   * * `us-east1`
-   * * `us-west1`
-   * * `us-central1`
-   * * `europe-west1`
    * </pre>
    *
    * <code>