Skip to content

Commit 9a236ed

Browse files
authored
Merge branch 'main' into feat/jspecify-auth
2 parents 5b70f89 + 56678e6 commit 9a236ed

1,183 files changed

Lines changed: 307292 additions & 8978 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

google-auth-library-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474

7575
<properties>
7676
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
77-
<project.google.http.version>2.1.1</project.google.http.version>
77+
<project.google.http.version>2.2.0</project.google.http.version>
7878
<project.junit.version>5.11.4</project.junit.version>
7979
<project.guava.version>33.5.0-jre</project.guava.version>
8080
<project.appengine.version>2.0.33</project.appengine.version>

grpc-gcp-java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<api-common.version>2.66.0-SNAPSHOT</api-common.version><!-- {x-version-update:api-common:current} -->
6666
<auto-value.version>1.11.0</auto-value.version>
6767
<error-prone-annotations.version>2.48.0</error-prone-annotations.version>
68-
<google-http-client.version>2.1.1</google-http-client.version>
68+
<google-http-client.version>2.2.0</google-http-client.version>
6969
<gson.version>2.13.2</gson.version>
7070
<guava.version>33.5.0-jre</guava.version>
7171
<protobuf.version>4.33.2</protobuf.version>

java-admanager/ad-manager/src/main/java/com/google/ads/admanager/v1/AdBreakServiceClient.java

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
* </tr>
6868
* <tr>
6969
* <td><p> GetAdBreak</td>
70-
* <td><p> API to retrieve an `AdBreak` object.
70+
* <td><p> Retrieves an `AdBreak` object.
7171
* <p> Query an ad break by its resource name or custom asset key. Check the resource's `breakState` field to determine its state.</td>
7272
* <td>
7373
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
@@ -87,7 +87,7 @@
8787
* </tr>
8888
* <tr>
8989
* <td><p> ListAdBreaks</td>
90-
* <td><p> API to retrieve a list of `AdBreak` objects.
90+
* <td><p> Lists `AdBreak` objects.
9191
* <p> By default, when no `orderBy` query parameter is specified, ad breaks are ordered reverse chronologically. However, ad breaks with a 'breakState' of 'SCHEDULED' or 'DECISIONED' are prioritized and appear first.</td>
9292
* <td>
9393
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
@@ -108,7 +108,7 @@
108108
* </tr>
109109
* <tr>
110110
* <td><p> CreateAdBreak</td>
111-
* <td><p> API to create an `AdBreak` object.
111+
* <td><p> Creates an `AdBreak` object.
112112
* <p> Informs DAI of an upcoming ad break for a live stream event, with an optional expected start time. DAI will begin decisioning ads for the break shortly before the expected start time, if provided. Each live stream event can only have one incomplete ad break at any given time. The next ad break can be scheduled after the previous ad break has started serving, indicated by its state being [`COMPLETE`][google.ads.admanager.v1.AdBreakStateEnum.AdBreakState.COMPLETE], or it has been deleted.
113113
* <p> This method cannot be used if the `LiveStreamEvent` has [prefetching ad breaks enabled](https://developers.google.com/ad-manager/api/reference/latest/LiveStreamEventService.LiveStreamEvent#prefetchenabled) or the event is not active. If a `LiveStreamEvent` is deactivated after creating an ad break and before the ad break is complete, the ad break is discarded.
114114
* <p> An ad break's state is complete when the following occurs: - Full service DAI: after a matching ad break shows in the `LiveStreamEvent` manifest only when the ad break has started decisioning. - Pod Serving: after the ad break is requested using the ad break ID or break sequence.</td>
@@ -130,7 +130,7 @@
130130
* </tr>
131131
* <tr>
132132
* <td><p> UpdateAdBreak</td>
133-
* <td><p> API to update an `AdBreak` object.
133+
* <td><p> Updates an `AdBreak` object.
134134
* <p> Modify an ad break when its state is [`SCHEDULED`][google.ads.admanager.v1.AdBreakStateEnum.AdBreakState.SCHEDULED].</td>
135135
* <td>
136136
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
@@ -149,7 +149,7 @@
149149
* </tr>
150150
* <tr>
151151
* <td><p> DeleteAdBreak</td>
152-
* <td><p> API to delete an `AdBreak` object.
152+
* <td><p> Deletes an `AdBreak` object.
153153
* <p> Deletes and cancels an incomplete ad break, mitigating the need to wait for the current break to serve before recreating an ad break. You can delete an ad break that has not started serving or seen in manifests, indicated by its state being [`SCHEDULED`][google.ads.admanager.v1.AdBreakStateEnum.AdBreakState.SCHEDULED] or [`DECISIONED`][google.ads.admanager.v1.AdBreakStateEnum.AdBreakState.DECISIONED].</td>
154154
* <td>
155155
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
@@ -261,7 +261,7 @@ public AdBreakServiceStub getStub() {
261261

262262
// AUTO-GENERATED DOCUMENTATION AND METHOD.
263263
/**
264-
* API to retrieve an `AdBreak` object.
264+
* Retrieves an `AdBreak` object.
265265
*
266266
* <p>Query an ad break by its resource name or custom asset key. Check the resource's
267267
* `breakState` field to determine its state.
@@ -294,7 +294,7 @@ public final AdBreak getAdBreak(@Nullable AdBreakName name) {
294294

295295
// AUTO-GENERATED DOCUMENTATION AND METHOD.
296296
/**
297-
* API to retrieve an `AdBreak` object.
297+
* Retrieves an `AdBreak` object.
298298
*
299299
* <p>Query an ad break by its resource name or custom asset key. Check the resource's
300300
* `breakState` field to determine its state.
@@ -326,7 +326,7 @@ public final AdBreak getAdBreak(String name) {
326326

327327
// AUTO-GENERATED DOCUMENTATION AND METHOD.
328328
/**
329-
* API to retrieve an `AdBreak` object.
329+
* Retrieves an `AdBreak` object.
330330
*
331331
* <p>Query an ad break by its resource name or custom asset key. Check the resource's
332332
* `breakState` field to determine its state.
@@ -357,7 +357,7 @@ public final AdBreak getAdBreak(GetAdBreakRequest request) {
357357

358358
// AUTO-GENERATED DOCUMENTATION AND METHOD.
359359
/**
360-
* API to retrieve an `AdBreak` object.
360+
* Retrieves an `AdBreak` object.
361361
*
362362
* <p>Query an ad break by its resource name or custom asset key. Check the resource's
363363
* `breakState` field to determine its state.
@@ -387,7 +387,7 @@ public final UnaryCallable<GetAdBreakRequest, AdBreak> getAdBreakCallable() {
387387

388388
// AUTO-GENERATED DOCUMENTATION AND METHOD.
389389
/**
390-
* API to retrieve a list of `AdBreak` objects.
390+
* Lists `AdBreak` objects.
391391
*
392392
* <p>By default, when no `orderBy` query parameter is specified, ad breaks are ordered reverse
393393
* chronologically. However, ad breaks with a 'breakState' of 'SCHEDULED' or 'DECISIONED' are
@@ -424,7 +424,7 @@ public final ListAdBreaksPagedResponse listAdBreaks(@Nullable LiveStreamEventNam
424424

425425
// AUTO-GENERATED DOCUMENTATION AND METHOD.
426426
/**
427-
* API to retrieve a list of `AdBreak` objects.
427+
* Lists `AdBreak` objects.
428428
*
429429
* <p>By default, when no `orderBy` query parameter is specified, ad breaks are ordered reverse
430430
* chronologically. However, ad breaks with a 'breakState' of 'SCHEDULED' or 'DECISIONED' are
@@ -458,7 +458,7 @@ public final ListAdBreaksPagedResponse listAdBreaks(String parent) {
458458

459459
// AUTO-GENERATED DOCUMENTATION AND METHOD.
460460
/**
461-
* API to retrieve a list of `AdBreak` objects.
461+
* Lists `AdBreak` objects.
462462
*
463463
* <p>By default, when no `orderBy` query parameter is specified, ad breaks are ordered reverse
464464
* chronologically. However, ad breaks with a 'breakState' of 'SCHEDULED' or 'DECISIONED' are
@@ -497,7 +497,7 @@ public final ListAdBreaksPagedResponse listAdBreaks(ListAdBreaksRequest request)
497497

498498
// AUTO-GENERATED DOCUMENTATION AND METHOD.
499499
/**
500-
* API to retrieve a list of `AdBreak` objects.
500+
* Lists `AdBreak` objects.
501501
*
502502
* <p>By default, when no `orderBy` query parameter is specified, ad breaks are ordered reverse
503503
* chronologically. However, ad breaks with a 'breakState' of 'SCHEDULED' or 'DECISIONED' are
@@ -537,7 +537,7 @@ public final ListAdBreaksPagedResponse listAdBreaks(ListAdBreaksRequest request)
537537

538538
// AUTO-GENERATED DOCUMENTATION AND METHOD.
539539
/**
540-
* API to retrieve a list of `AdBreak` objects.
540+
* Lists `AdBreak` objects.
541541
*
542542
* <p>By default, when no `orderBy` query parameter is specified, ad breaks are ordered reverse
543543
* chronologically. However, ad breaks with a 'breakState' of 'SCHEDULED' or 'DECISIONED' are
@@ -582,7 +582,7 @@ public final UnaryCallable<ListAdBreaksRequest, ListAdBreaksResponse> listAdBrea
582582

583583
// AUTO-GENERATED DOCUMENTATION AND METHOD.
584584
/**
585-
* API to create an `AdBreak` object.
585+
* Creates an `AdBreak` object.
586586
*
587587
* <p>Informs DAI of an upcoming ad break for a live stream event, with an optional expected start
588588
* time. DAI will begin decisioning ads for the break shortly before the expected start time, if
@@ -634,7 +634,7 @@ public final AdBreak createAdBreak(@Nullable LiveStreamEventName parent, AdBreak
634634

635635
// AUTO-GENERATED DOCUMENTATION AND METHOD.
636636
/**
637-
* API to create an `AdBreak` object.
637+
* Creates an `AdBreak` object.
638638
*
639639
* <p>Informs DAI of an upcoming ad break for a live stream event, with an optional expected start
640640
* time. DAI will begin decisioning ads for the break shortly before the expected start time, if
@@ -683,7 +683,7 @@ public final AdBreak createAdBreak(String parent, AdBreak adBreak) {
683683

684684
// AUTO-GENERATED DOCUMENTATION AND METHOD.
685685
/**
686-
* API to create an `AdBreak` object.
686+
* Creates an `AdBreak` object.
687687
*
688688
* <p>Informs DAI of an upcoming ad break for a live stream event, with an optional expected start
689689
* time. DAI will begin decisioning ads for the break shortly before the expected start time, if
@@ -729,7 +729,7 @@ public final AdBreak createAdBreak(CreateAdBreakRequest request) {
729729

730730
// AUTO-GENERATED DOCUMENTATION AND METHOD.
731731
/**
732-
* API to create an `AdBreak` object.
732+
* Creates an `AdBreak` object.
733733
*
734734
* <p>Informs DAI of an upcoming ad break for a live stream event, with an optional expected start
735735
* time. DAI will begin decisioning ads for the break shortly before the expected start time, if
@@ -774,7 +774,7 @@ public final UnaryCallable<CreateAdBreakRequest, AdBreak> createAdBreakCallable(
774774

775775
// AUTO-GENERATED DOCUMENTATION AND METHOD.
776776
/**
777-
* API to update an `AdBreak` object.
777+
* Updates an `AdBreak` object.
778778
*
779779
* <p>Modify an ad break when its state is
780780
* [`SCHEDULED`][google.ads.admanager.v1.AdBreakStateEnum.AdBreakState.SCHEDULED].
@@ -807,7 +807,7 @@ public final AdBreak updateAdBreak(AdBreak adBreak, FieldMask updateMask) {
807807

808808
// AUTO-GENERATED DOCUMENTATION AND METHOD.
809809
/**
810-
* API to update an `AdBreak` object.
810+
* Updates an `AdBreak` object.
811811
*
812812
* <p>Modify an ad break when its state is
813813
* [`SCHEDULED`][google.ads.admanager.v1.AdBreakStateEnum.AdBreakState.SCHEDULED].
@@ -839,7 +839,7 @@ public final AdBreak updateAdBreak(UpdateAdBreakRequest request) {
839839

840840
// AUTO-GENERATED DOCUMENTATION AND METHOD.
841841
/**
842-
* API to update an `AdBreak` object.
842+
* Updates an `AdBreak` object.
843843
*
844844
* <p>Modify an ad break when its state is
845845
* [`SCHEDULED`][google.ads.admanager.v1.AdBreakStateEnum.AdBreakState.SCHEDULED].
@@ -870,7 +870,7 @@ public final UnaryCallable<UpdateAdBreakRequest, AdBreak> updateAdBreakCallable(
870870

871871
// AUTO-GENERATED DOCUMENTATION AND METHOD.
872872
/**
873-
* API to delete an `AdBreak` object.
873+
* Deletes an `AdBreak` object.
874874
*
875875
* <p>Deletes and cancels an incomplete ad break, mitigating the need to wait for the current
876876
* break to serve before recreating an ad break. You can delete an ad break that has not started
@@ -905,7 +905,7 @@ public final void deleteAdBreak(@Nullable AdBreakName name) {
905905

906906
// AUTO-GENERATED DOCUMENTATION AND METHOD.
907907
/**
908-
* API to delete an `AdBreak` object.
908+
* Deletes an `AdBreak` object.
909909
*
910910
* <p>Deletes and cancels an incomplete ad break, mitigating the need to wait for the current
911911
* break to serve before recreating an ad break. You can delete an ad break that has not started
@@ -939,7 +939,7 @@ public final void deleteAdBreak(String name) {
939939

940940
// AUTO-GENERATED DOCUMENTATION AND METHOD.
941941
/**
942-
* API to delete an `AdBreak` object.
942+
* Deletes an `AdBreak` object.
943943
*
944944
* <p>Deletes and cancels an incomplete ad break, mitigating the need to wait for the current
945945
* break to serve before recreating an ad break. You can delete an ad break that has not started
@@ -973,7 +973,7 @@ public final void deleteAdBreak(DeleteAdBreakRequest request) {
973973

974974
// AUTO-GENERATED DOCUMENTATION AND METHOD.
975975
/**
976-
* API to delete an `AdBreak` object.
976+
* Deletes an `AdBreak` object.
977977
*
978978
* <p>Deletes and cancels an incomplete ad break, mitigating the need to wait for the current
979979
* break to serve before recreating an ad break. You can delete an ad break that has not started

0 commit comments

Comments
 (0)