diff --git a/java-video-stitcher/README.md b/java-video-stitcher/README.md index 2ae06eedb791..f1126129b2ae 100644 --- 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: com.google.cloud libraries-bom - 26.19.0 + 26.22.0 pom import @@ -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/java-video-stitcher/google-cloud-video-stitcher/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClient.java b/java-video-stitcher/google-cloud-video-stitcher/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClient.java index 5c43ac2f6263..bdae0baac27f 100644 --- a/java-video-stitcher/google-cloud-video-stitcher/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClient.java +++ b/java-video-stitcher/google-cloud-video-stitcher/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClient.java @@ -2834,7 +2834,7 @@ public final UnaryCallable 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 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 future = diff --git a/java-video-stitcher/google-cloud-video-stitcher/src/main/java/com/google/cloud/video/stitcher/v1/stub/VideoStitcherServiceStubSettings.java b/java-video-stitcher/google-cloud-video-stitcher/src/main/java/com/google/cloud/video/stitcher/v1/stub/VideoStitcherServiceStubSettings.java index 9fde4dfca8fb..9512be8625bd 100644 --- a/java-video-stitcher/google-cloud-video-stitcher/src/main/java/com/google/cloud/video/stitcher/v1/stub/VideoStitcherServiceStubSettings.java +++ b/java-video-stitcher/google-cloud-video-stitcher/src/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.newArrayList())); - definitions.put( - "retry_policy_0_codes", - ImmutableSet.copyOf(Lists.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 .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 .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/java-video-stitcher/google-cloud-video-stitcher/src/test/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClientTest.java b/java-video-stitcher/google-cloud-video-stitcher/src/test/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClientTest.java index a25842b5c793..f3216459f9c0 100644 --- a/java-video-stitcher/google-cloud-video-stitcher/src/test/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClientTest.java +++ b/java-video-stitcher/google-cloud-video-stitcher/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/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSession.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSession.java index ff296aedb3f6..6c22b539e042 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSession.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSession.java @@ -111,8 +111,7 @@ public interface GamSettingsOrBuilder * *
    * 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.
    * 
* * Protobuf type {@code google.cloud.video.stitcher.v1.LiveSession.GamSettings} @@ -369,8 +368,7 @@ protected Builder newBuilderForType( * *
      * 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.
      * 
* * Protobuf type {@code google.cloud.video.stitcher.v1.LiveSession.GamSettings} diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceProto.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceProto.java index 308403bc14f5..1d7c03b8ec79 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceProto.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-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/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodAdTagDetail.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodAdTagDetail.java index b668936976db..8ae3029b124f 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodAdTagDetail.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodAdTagDetail.java @@ -22,7 +22,9 @@ * * *
- * 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.
  * 
* * Protobuf type {@code google.cloud.video.stitcher.v1.VodAdTagDetail} @@ -361,7 +363,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * * *
-   * 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.
    * 
* * Protobuf type {@code google.cloud.video.stitcher.v1.VodAdTagDetail} diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSession.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSession.java index 5a10427abc8e..364e76686ce3 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSession.java +++ b/java-video-stitcher/proto-google-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() { * * *
-   * 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.
    * 
* * @@ -1465,9 +1463,7 @@ public int getAdTrackingValue() { * * *
-   * 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.
    * 
* * @@ -3322,9 +3318,7 @@ public Builder setAssetIdBytes(com.google.protobuf.ByteString value) { * * *
-     * 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.
      * 
* * @@ -3341,9 +3335,7 @@ public int getAdTrackingValue() { * * *
-     * 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.
      * 
* * @@ -3363,9 +3355,7 @@ public Builder setAdTrackingValue(int value) { * * *
-     * 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.
      * 
* * @@ -3384,9 +3374,7 @@ public com.google.cloud.video.stitcher.v1.AdTracking getAdTracking() { * * *
-     * 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.
      * 
* * @@ -3409,9 +3397,7 @@ public Builder setAdTracking(com.google.cloud.video.stitcher.v1.AdTracking value * * *
-     * 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.
      * 
* * diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSessionOrBuilder.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSessionOrBuilder.java index 1d35c64d9be8..c2a4f5dbb088 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSessionOrBuilder.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSessionOrBuilder.java @@ -343,9 +343,7 @@ java.lang.String getAdTagMacroMapOrDefault( * * *
-   * 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.
    * 
* * @@ -359,9 +357,7 @@ java.lang.String getAdTagMacroMapOrDefault( * * *
-   * 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.
    * 
* * diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodStitchDetail.java b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodStitchDetail.java index b6b2c4a22de5..d9867bce73df 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodStitchDetail.java +++ b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodStitchDetail.java @@ -22,7 +22,9 @@ * * *
- * 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.
  * 
* * Protobuf type {@code google.cloud.video.stitcher.v1.VodStitchDetail} @@ -363,7 +365,9 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * * *
-   * 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.
    * 
* * Protobuf type {@code google.cloud.video.stitcher.v1.VodStitchDetail} diff --git a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/ad_tag_details.proto b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/ad_tag_details.proto index 9efe99e2de14..ef5b4697d8ba 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/ad_tag_details.proto +++ b/java-video-stitcher/proto-google-cloud-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/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/sessions.proto b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/sessions.proto index 70c30bdfd78f..72eeb899ad5a 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/sessions.proto +++ b/java-video-stitcher/proto-google-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/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/stitch_details.proto b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/stitch_details.proto index e51c72d642e9..b7f85944df14 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/stitch_details.proto +++ b/java-video-stitcher/proto-google-cloud-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/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/video_stitcher_service.proto b/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/video_stitcher_service.proto index 3cd6a27f0d8b..f84aa09b22b2 100644 --- a/java-video-stitcher/proto-google-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/video_stitcher_service.proto +++ b/java-video-stitcher/proto-google-cloud-video-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" } ]; diff --git a/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/AsyncCreateLiveSession.java b/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/AsyncCreateLiveSession.java index b7ba1378c63c..fa6d33b2da96 100644 --- a/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/AsyncCreateLiveSession.java +++ b/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/AsyncCreateLiveSession.java @@ -20,7 +20,7 @@ import com.google.api.core.ApiFuture; import com.google.cloud.video.stitcher.v1.CreateLiveSessionRequest; import com.google.cloud.video.stitcher.v1.LiveSession; -import com.google.cloud.video.stitcher.v1.LiveSessionName; +import com.google.cloud.video.stitcher.v1.LocationName; import com.google.cloud.video.stitcher.v1.VideoStitcherServiceClient; public class AsyncCreateLiveSession { @@ -39,7 +39,7 @@ public static void asyncCreateLiveSession() throws Exception { 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 future = diff --git a/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSession.java b/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSession.java index d69542faef5d..17554a95a5ed 100644 --- a/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSession.java +++ b/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSession.java @@ -19,7 +19,7 @@ // [START videostitcher_v1_generated_VideoStitcherService_CreateLiveSession_sync] import com.google.cloud.video.stitcher.v1.CreateLiveSessionRequest; import com.google.cloud.video.stitcher.v1.LiveSession; -import com.google.cloud.video.stitcher.v1.LiveSessionName; +import com.google.cloud.video.stitcher.v1.LocationName; import com.google.cloud.video.stitcher.v1.VideoStitcherServiceClient; public class SyncCreateLiveSession { @@ -38,7 +38,7 @@ public static void syncCreateLiveSession() throws Exception { 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); diff --git a/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSessionLivesessionnameLivesession.java b/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSessionLocationnameLivesession.java similarity index 78% rename from java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSessionLivesessionnameLivesession.java rename to java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSessionLocationnameLivesession.java index 9a5b0c84f9bb..1d8e87617506 100644 --- a/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSessionLivesessionnameLivesession.java +++ b/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSessionLocationnameLivesession.java @@ -16,18 +16,18 @@ package com.google.cloud.video.stitcher.v1.samples; -// [START videostitcher_v1_generated_VideoStitcherService_CreateLiveSession_LivesessionnameLivesession_sync] +// [START videostitcher_v1_generated_VideoStitcherService_CreateLiveSession_LocationnameLivesession_sync] import com.google.cloud.video.stitcher.v1.LiveSession; -import com.google.cloud.video.stitcher.v1.LiveSessionName; +import com.google.cloud.video.stitcher.v1.LocationName; import com.google.cloud.video.stitcher.v1.VideoStitcherServiceClient; -public class SyncCreateLiveSessionLivesessionnameLivesession { +public class SyncCreateLiveSessionLocationnameLivesession { public static void main(String[] args) throws Exception { - syncCreateLiveSessionLivesessionnameLivesession(); + syncCreateLiveSessionLocationnameLivesession(); } - public static void syncCreateLiveSessionLivesessionnameLivesession() throws Exception { + public static void syncCreateLiveSessionLocationnameLivesession() throws Exception { // This snippet has been automatically generated and should be regarded as a code template only. // It will require modifications to work: // - It may require correct/in-range values for request initialization. @@ -35,10 +35,10 @@ public static void syncCreateLiveSessionLivesessionnameLivesession() throws Exce // 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); } } } -// [END videostitcher_v1_generated_VideoStitcherService_CreateLiveSession_LivesessionnameLivesession_sync] +// [END videostitcher_v1_generated_VideoStitcherService_CreateLiveSession_LocationnameLivesession_sync] diff --git a/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSessionStringLivesession.java b/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSessionStringLivesession.java index b753fb119d20..193829e9e581 100644 --- a/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSessionStringLivesession.java +++ b/java-video-stitcher/samples/snippets/generated/com/google/cloud/video/stitcher/v1/videostitcherservice/createlivesession/SyncCreateLiveSessionStringLivesession.java @@ -18,7 +18,7 @@ // [START videostitcher_v1_generated_VideoStitcherService_CreateLiveSession_StringLivesession_sync] import com.google.cloud.video.stitcher.v1.LiveSession; -import com.google.cloud.video.stitcher.v1.LiveSessionName; +import com.google.cloud.video.stitcher.v1.LocationName; import com.google.cloud.video.stitcher.v1.VideoStitcherServiceClient; public class SyncCreateLiveSessionStringLivesession { @@ -35,7 +35,7 @@ public static void syncCreateLiveSessionStringLivesession() throws Exception { // 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); }