fix!: [videostitcher] use correct child_type annotation (#9774)

- [ ] Regenerate this pull request now. PiperOrigin-RevId: 558967926 Source-Link: https://togithub.com/googleapis/googleapis/commit/1c4f24e66d8559a680e472eab70ccfb1e6fbd685 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/a25a4446b5d7af20457432c3856bc259d4585df9 Copy-Tag: eyJwIjoiamF2YS12aWRlby1zdGl0Y2hlci8uT3dsQm90LnlhbWwiLCJoIjoiYTI1YTQ0NDZiNWQ3YWYyMDQ1NzQzMmMzODU2YmMyNTlkNDU4NWRmOSJ9
googleapis · Aug 30, 2023 · 8414126 · 8414126
1 parent 08c1a7d
commit 8414126
Show file tree

Hide file tree

Showing 18 changed files with 67 additions and 92 deletions.
diff --git a/java-video-stitcher/README.md b/java-video-stitcher/README.md
@@ -23,7 +23,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.19.0</version>
+      <version>26.22.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -201,7 +201,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
 [stability-image]: https://img.shields.io/badge/stability-preview-yellow
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-video-stitcher.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-video-stitcher/0.21.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-video-stitcher/0.23.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

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
@@ -2834,7 +2834,7 @@ public final UnaryCallable<DeleteSlateRequest, Operation> deleteSlateCallable()
    * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (VideoStitcherServiceClient videoStitcherServiceClient =
    *     VideoStitcherServiceClient.create()) {
-   *   LiveSessionName parent = LiveSessionName.of("[PROJECT]", "[LOCATION]", "[LIVE_SESSION]");
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
    *   LiveSession liveSession = LiveSession.newBuilder().build();
    *   LiveSession response = videoStitcherServiceClient.createLiveSession(parent, liveSession);
    * }
@@ -2845,7 +2845,7 @@ public final UnaryCallable<DeleteSlateRequest, Operation> deleteSlateCallable()
    * @param liveSession Required. Parameters for creating a live session.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final LiveSession createLiveSession(LiveSessionName parent, LiveSession liveSession) {
+  public final LiveSession createLiveSession(LocationName parent, LiveSession liveSession) {
     CreateLiveSessionRequest request =
         CreateLiveSessionRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -2868,7 +2868,7 @@ public final LiveSession createLiveSession(LiveSessionName parent, LiveSession l
    * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
    * try (VideoStitcherServiceClient videoStitcherServiceClient =
    *     VideoStitcherServiceClient.create()) {
-   *   String parent = LiveSessionName.of("[PROJECT]", "[LOCATION]", "[LIVE_SESSION]").toString();
+   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
    *   LiveSession liveSession = LiveSession.newBuilder().build();
    *   LiveSession response = videoStitcherServiceClient.createLiveSession(parent, liveSession);
    * }
@@ -2901,7 +2901,7 @@ public final LiveSession createLiveSession(String parent, LiveSession liveSessio
    *     VideoStitcherServiceClient.create()) {
    *   CreateLiveSessionRequest request =
    *       CreateLiveSessionRequest.newBuilder()
-   *           .setParent(LiveSessionName.of("[PROJECT]", "[LOCATION]", "[LIVE_SESSION]").toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setLiveSession(LiveSession.newBuilder().build())
    *           .build();
    *   LiveSession response = videoStitcherServiceClient.createLiveSession(request);
@@ -2931,7 +2931,7 @@ public final LiveSession createLiveSession(CreateLiveSessionRequest request) {
    *     VideoStitcherServiceClient.create()) {
    *   CreateLiveSessionRequest request =
    *       CreateLiveSessionRequest.newBuilder()
-   *           .setParent(LiveSessionName.of("[PROJECT]", "[LOCATION]", "[LIVE_SESSION]").toString())
+   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
    *           .setLiveSession(LiveSession.newBuilder().build())
    *           .build();
    *   ApiFuture<LiveSession> future =

diff --git a/...c/main/java/com/google/cloud/video/stitcher/v1/stub/VideoStitcherServiceStubSettings.java b/...c/main/java/com/google/cloud/video/stitcher/v1/stub/VideoStitcherServiceStubSettings.java
@@ -927,9 +927,6 @@ public static class Builder
           ImmutableMap.builder();
       definitions.put(
           "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
-      definitions.put(
-          "retry_policy_0_codes",
-          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -946,17 +943,6 @@ public static class Builder
               .setTotalTimeout(Duration.ofMillis(60000L))
               .build();
       definitions.put("no_retry_1_params", settings);
-      settings =
-          RetrySettings.newBuilder()
-              .setInitialRetryDelay(Duration.ofMillis(1000L))
-              .setRetryDelayMultiplier(1.3)
-              .setMaxRetryDelay(Duration.ofMillis(10000L))
-              .setInitialRpcTimeout(Duration.ofMillis(60000L))
-              .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(60000L))
-              .setTotalTimeout(Duration.ofMillis(60000L))
-              .build();
-      definitions.put("retry_policy_0_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -1212,23 +1198,23 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .createLiveConfigSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .listLiveConfigsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .getLiveConfigSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .deleteLiveConfigSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .createCdnKeyOperationSettings()
@@ -1376,8 +1362,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<CreateLiveConfigRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(LiveConfig.class))
@@ -1400,8 +1386,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<DeleteLiveConfigRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Empty.class))

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
@@ -1642,7 +1642,7 @@ public void createLiveSessionTest() throws Exception {
             .build();
     mockVideoStitcherService.addResponse(expectedResponse);
 
-    LiveSessionName parent = LiveSessionName.of("[PROJECT]", "[LOCATION]", "[LIVE_SESSION]");
+    LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
     LiveSession liveSession = LiveSession.newBuilder().build();
 
     LiveSession actualResponse = client.createLiveSession(parent, liveSession);
@@ -1666,7 +1666,7 @@ public void createLiveSessionExceptionTest() throws Exception {
     mockVideoStitcherService.addException(exception);
 
     try {
-      LiveSessionName parent = LiveSessionName.of("[PROJECT]", "[LOCATION]", "[LIVE_SESSION]");
+      LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
       LiveSession liveSession = LiveSession.newBuilder().build();
       client.createLiveSession(parent, liveSession);
       Assert.fail("No exception raised");

diff --git a/...cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSession.java b/...cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSession.java
@@ -111,8 +111,7 @@ public interface GamSettingsOrBuilder
    *
    * <pre>
    * Defines fields related to Google Ad Manager (GAM). This should be set if
-   * GAM
-   * is being used for ads.
+   * GAM is being used for ads.
    * </pre>
    *
    * Protobuf type {@code google.cloud.video.stitcher.v1.LiveSession.GamSettings}
@@ -369,8 +368,7 @@ protected Builder newBuilderForType(
      *
      * <pre>
      * Defines fields related to Google Ad Manager (GAM). This should be set if
-     * GAM
-     * is being used for ads.
+     * GAM is being used for ads.
      * </pre>
      *
      * Protobuf type {@code google.cloud.video.stitcher.v1.LiveSession.GamSettings}

diff --git a/...itcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceProto.java b/...itcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceProto.java
@@ -249,7 +249,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "uf.FieldMaskB\004\342A\001\002\"O\n\022DeleteSlateRequest"
           + "\0229\n\004name\030\001 \001(\tB+\342A\001\002\372A$\n\"videostitcher.g"
           + "oogleapis.com/Slate\"\246\001\n\030CreateLiveSessio"
-          + "nRequest\022A\n\006parent\030\001 \001(\tB1\342A\001\002\372A*\n(video"
+          + "nRequest\022A\n\006parent\030\001 \001(\tB1\342A\001\002\372A*\022(video"
           + "stitcher.googleapis.com/LiveSession\022G\n\014l"
           + "ive_session\030\002 \001(\0132+.google.cloud.video.s"
           + "titcher.v1.LiveSessionB\004\342A\001\002\"X\n\025GetLiveS"

diff --git a/...ud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodAdTagDetail.java b/...ud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodAdTagDetail.java
@@ -22,7 +22,9 @@
  *
  *
  * <pre>
- * Information related to the details for one ad tag.
+ * Information related to the details for one ad tag. This resource is only
+ * available for VOD sessions that do not implement Google Ad Manager ad
+ * insertion.
  * </pre>
  *
  * Protobuf type {@code google.cloud.video.stitcher.v1.VodAdTagDetail}
@@ -361,7 +363,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Information related to the details for one ad tag.
+   * Information related to the details for one ad tag. This resource is only
+   * available for VOD sessions that do not implement Google Ad Manager ad
+   * insertion.
    * </pre>
    *
    * Protobuf type {@code google.cloud.video.stitcher.v1.VodAdTagDetail}

diff --git a/...-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSession.java b/...-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSession.java
@@ -1446,9 +1446,7 @@ public com.google.protobuf.ByteString getAssetIdBytes() {
    *
    *
    * <pre>
-   * Required. Determines how the ad should be tracked. If
-   * [gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
-   * is set, the value must be `CLIENT` because the IMA SDK handles ad tracking.
+   * Required. Determines how the ad should be tracked.
    * </pre>
    *
    * <code>
@@ -1465,9 +1463,7 @@ public int getAdTrackingValue() {
    *
    *
    * <pre>
-   * Required. Determines how the ad should be tracked. If
-   * [gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
-   * is set, the value must be `CLIENT` because the IMA SDK handles ad tracking.
+   * Required. Determines how the ad should be tracked.
    * </pre>
    *
    * <code>
@@ -3322,9 +3318,7 @@ public Builder setAssetIdBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Required. Determines how the ad should be tracked. If
-     * [gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
-     * is set, the value must be `CLIENT` because the IMA SDK handles ad tracking.
+     * Required. Determines how the ad should be tracked.
      * </pre>
      *
      * <code>
@@ -3341,9 +3335,7 @@ public int getAdTrackingValue() {
      *
      *
      * <pre>
-     * Required. Determines how the ad should be tracked. If
-     * [gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
-     * is set, the value must be `CLIENT` because the IMA SDK handles ad tracking.
+     * Required. Determines how the ad should be tracked.
      * </pre>
      *
      * <code>
@@ -3363,9 +3355,7 @@ public Builder setAdTrackingValue(int value) {
      *
      *
      * <pre>
-     * Required. Determines how the ad should be tracked. If
-     * [gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
-     * is set, the value must be `CLIENT` because the IMA SDK handles ad tracking.
+     * Required. Determines how the ad should be tracked.
      * </pre>
      *
      * <code>
@@ -3384,9 +3374,7 @@ public com.google.cloud.video.stitcher.v1.AdTracking getAdTracking() {
      *
      *
      * <pre>
-     * Required. Determines how the ad should be tracked. If
-     * [gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
-     * is set, the value must be `CLIENT` because the IMA SDK handles ad tracking.
+     * Required. Determines how the ad should be tracked.
      * </pre>
      *
      * <code>
@@ -3409,9 +3397,7 @@ public Builder setAdTracking(com.google.cloud.video.stitcher.v1.AdTracking value
      *
      *
      * <pre>
-     * Required. Determines how the ad should be tracked. If
-     * [gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
-     * is set, the value must be `CLIENT` because the IMA SDK handles ad tracking.
+     * Required. Determines how the ad should be tracked.
      * </pre>
      *
      * <code>

diff --git a/...deo-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSessionOrBuilder.java b/...deo-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSessionOrBuilder.java
@@ -343,9 +343,7 @@ java.lang.String getAdTagMacroMapOrDefault(
    *
    *
    * <pre>
-   * Required. Determines how the ad should be tracked. If
-   * [gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
-   * is set, the value must be `CLIENT` because the IMA SDK handles ad tracking.
+   * Required. Determines how the ad should be tracked.
    * </pre>
    *
    * <code>
@@ -359,9 +357,7 @@ java.lang.String getAdTagMacroMapOrDefault(
    *
    *
    * <pre>
-   * Required. Determines how the ad should be tracked. If
-   * [gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
-   * is set, the value must be `CLIENT` because the IMA SDK handles ad tracking.
+   * Required. Determines how the ad should be tracked.
    * </pre>
    *
    * <code>

diff --git a/...d-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodStitchDetail.java b/...d-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodStitchDetail.java
@@ -22,7 +22,9 @@
  *
  *
  * <pre>
- * Detailed information related to the interstitial of a VOD session.
+ * Detailed information related to the interstitial of a VOD session. This
+ * resource is only available for VOD sessions that do not implement Google Ad
+ * Manager ad insertion.
  * </pre>
  *
  * Protobuf type {@code google.cloud.video.stitcher.v1.VodStitchDetail}
@@ -363,7 +365,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Detailed information related to the interstitial of a VOD session.
+   * Detailed information related to the interstitial of a VOD session. This
+   * resource is only available for VOD sessions that do not implement Google Ad
+   * Manager ad insertion.
    * </pre>
    *
    * Protobuf type {@code google.cloud.video.stitcher.v1.VodStitchDetail}

diff --git a/...loud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/ad_tag_details.proto b/...loud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/ad_tag_details.proto
@@ -40,7 +40,9 @@ message LiveAdTagDetail {
   repeated AdRequest ad_requests = 2;
 }
 
-// Information related to the details for one ad tag.
+// Information related to the details for one ad tag. This resource is only
+// available for VOD sessions that do not implement Google Ad Manager ad
+// insertion.
 message VodAdTagDetail {
   option (google.api.resource) = {
     type: "videostitcher.googleapis.com/VodAdTagDetail"

diff --git a/...ogle-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/sessions.proto b/...ogle-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/sessions.proto
@@ -81,9 +81,7 @@ message VodSession {
   // Output only. The generated ID of the VodSession's source media.
   string asset_id = 10 [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Required. Determines how the ad should be tracked. If
-  // [gam_vod_config][google.cloud.video.stitcher.v1.VodSession.gam_vod_config]
-  // is set, the value must be `CLIENT` because the IMA SDK handles ad tracking.
+  // Required. Determines how the ad should be tracked.
   AdTracking ad_tracking = 11 [(google.api.field_behavior) = REQUIRED];
 
   // This field should be set with appropriate values if GAM is being used for
@@ -147,8 +145,7 @@ message LiveSession {
   };
 
   // Defines fields related to Google Ad Manager (GAM). This should be set if
-  // GAM
-  // is being used for ads.
+  // GAM is being used for ads.
   message GamSettings {
     // Required. The stream ID generated by Ad Manager.
     string stream_id = 1 [(google.api.field_behavior) = REQUIRED];

diff --git a/...loud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/stitch_details.proto b/...loud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/stitch_details.proto
@@ -26,7 +26,9 @@ option java_multiple_files = true;
 option java_outer_classname = "StitchDetailsProto";
 option java_package = "com.google.cloud.video.stitcher.v1";
 
-// Detailed information related to the interstitial of a VOD session.
+// Detailed information related to the interstitial of a VOD session. This
+// resource is only available for VOD sessions that do not implement Google Ad
+// Manager ad insertion.
 message VodStitchDetail {
   option (google.api.resource) = {
     type: "videostitcher.googleapis.com/VodStitchDetail"

diff --git a/...eo-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/video_stitcher_service.proto b/...eo-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/video_stitcher_service.proto
@@ -647,7 +647,7 @@ message CreateLiveSessionRequest {
   string parent = 1 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = {
-      type: "videostitcher.googleapis.com/LiveSession"
+      child_type: "videostitcher.googleapis.com/LiveSession"
     }
   ];