Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gcf-merge-on-green merged 2 commits into from
Aug 30, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34189aa
fix!: use correct child_type annotation
gcf-owl-bot[bot] Aug 22, 2023
128e08e
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java-video-stitcher/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions ...stitcher/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
* }
Expand All @@ -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())
Expand All @@ -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);
* }
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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 =
Expand Down
38 changes: 12 additions & 26 deletions ...c/main/java/com/google/cloud/video/stitcher/v1/stub/VideoStitcherServiceStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand All @@ -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();
}

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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))
Expand All @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions ...cher/src/test/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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");
Expand Down
6 changes: 2 additions & 4 deletions ...cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/LiveSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion ...itcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VideoStitcherServiceProto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 6 additions & 2 deletions ...ud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodAdTagDetail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down
28 changes: 7 additions & 21 deletions ...-cloud-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 2 additions & 6 deletions ...deo-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodSessionOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 6 additions & 2 deletions ...d-video-stitcher-v1/src/main/java/com/google/cloud/video/stitcher/v1/VodStitchDetail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down
4 changes: 3 additions & 1 deletion ...loud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/ad_tag_details.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 2 additions & 5 deletions ...ogle-cloud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/sessions.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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];
Expand Down
4 changes: 3 additions & 1 deletion ...loud-video-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/stitch_details.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...eo-stitcher-v1/src/main/proto/google/cloud/video/stitcher/v1/video_stitcher_service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
];

Expand Down
Loading