Skip to content

Commit 9ac2164

Browse files
jinseopkim0jinseopkim0
authored
Merge branch 'main' into deps/update-sdk-platform-3-56-1
2 parents 2afe93a + 01290af commit 9ac2164

37 files changed

+1864
-258
lines changed

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.66.0
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.66.1
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
4949
If you are using Gradle 5.x or later, add this to your dependencies:
5050

5151
```Groovy
52-
implementation platform('com.google.cloud:libraries-bom:26.74.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.75.0')
5353
5454
implementation 'com.google.cloud:google-cloud-firestore'
5555
```

‎generation_config.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
gapic_generator_version: 2.66.0
2-
googleapis_commitish: a3647b486682580b8f0dd2851fb9cb3999cef93a
3-
libraries_bom_version: 26.74.0
1+
gapic_generator_version: 2.66.1
2+
googleapis_commitish: 5b2aa2c08c23f26d6e8abe65377077c624878d12
3+
libraries_bom_version: 26.75.0
44
libraries:
55
- api_shortname: firestore
66
name_pretty: Cloud Firestore

‎google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2512,7 +2512,7 @@ public final UnaryCallable<BulkDeleteDocumentsRequest, Operation> bulkDeleteDocu
25122512
* <p>This value should be 4-63 characters. Valid characters are /[a-z][0-9]-/ with first
25132513
* character a letter and the last a letter or a number. Must not be UUID-like
25142514
* /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.
2515-
* <p>"(default)" database ID is also valid.
2515+
* <p>"(default)" database ID is also valid if the database is Standard edition.
25162516
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
25172517
*/
25182518
public final OperationFuture<Database, CreateDatabaseMetadata> createDatabaseAsync(
@@ -2554,7 +2554,7 @@ public final OperationFuture<Database, CreateDatabaseMetadata> createDatabaseAsy
25542554
* <p>This value should be 4-63 characters. Valid characters are /[a-z][0-9]-/ with first
25552555
* character a letter and the last a letter or a number. Must not be UUID-like
25562556
* /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.
2557-
* <p>"(default)" database ID is also valid.
2557+
* <p>"(default)" database ID is also valid if the database is Standard edition.
25582558
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
25592559
*/
25602560
public final OperationFuture<Database, CreateDatabaseMetadata> createDatabaseAsync(

‎google-cloud-firestore-admin/src/main/resources/META-INF/native-image/com.google.cloud.firestore.v1/reflect-config.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,15 @@
836836
"allDeclaredClasses": true,
837837
"allPublicClasses": true
838838
},
839+
{
840+
"name": "com.google.firestore.admin.v1.Database$DataAccessMode",
841+
"queryAllDeclaredConstructors": true,
842+
"queryAllPublicConstructors": true,
843+
"queryAllDeclaredMethods": true,
844+
"allPublicMethods": true,
845+
"allDeclaredClasses": true,
846+
"allPublicClasses": true
847+
},
839848
{
840849
"name": "com.google.firestore.admin.v1.Database$DatabaseEdition",
841850
"queryAllDeclaredConstructors": true,
@@ -1880,6 +1889,15 @@
18801889
"allDeclaredClasses": true,
18811890
"allPublicClasses": true
18821891
},
1892+
{
1893+
"name": "com.google.firestore.admin.v1.RealtimeUpdatesMode",
1894+
"queryAllDeclaredConstructors": true,
1895+
"queryAllPublicConstructors": true,
1896+
"queryAllDeclaredMethods": true,
1897+
"allPublicMethods": true,
1898+
"allDeclaredClasses": true,
1899+
"allPublicClasses": true
1900+
},
18831901
{
18841902
"name": "com.google.firestore.admin.v1.ResetUserPasswordRequest",
18851903
"queryAllDeclaredConstructors": true,

‎google-cloud-firestore-admin/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientHttpJsonTest.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import com.google.firestore.admin.v1.LocationName;
5454
import com.google.firestore.admin.v1.PitrSnapshot;
5555
import com.google.firestore.admin.v1.ProjectName;
56+
import com.google.firestore.admin.v1.RealtimeUpdatesMode;
5657
import com.google.firestore.admin.v1.RestoreDatabaseRequest;
5758
import com.google.firestore.admin.v1.UserCreds;
5859
import com.google.firestore.admin.v1.UserCredsName;
@@ -119,6 +120,7 @@ public void createIndexTest() throws Exception {
119120
.addAllFields(new ArrayList<Index.IndexField>())
120121
.setMultikey(true)
121122
.setShardCount(-495377042)
123+
.setUnique(true)
122124
.build();
123125
Operation resultOperation =
124126
Operation.newBuilder()
@@ -174,6 +176,7 @@ public void createIndexTest2() throws Exception {
174176
.addAllFields(new ArrayList<Index.IndexField>())
175177
.setMultikey(true)
176178
.setShardCount(-495377042)
179+
.setUnique(true)
177180
.build();
178181
Operation resultOperation =
179182
Operation.newBuilder()
@@ -333,6 +336,7 @@ public void getIndexTest() throws Exception {
333336
.addAllFields(new ArrayList<Index.IndexField>())
334337
.setMultikey(true)
335338
.setShardCount(-495377042)
339+
.setUnique(true)
336340
.build();
337341
mockService.addResponse(expectedResponse);
338342

@@ -380,6 +384,7 @@ public void getIndexTest2() throws Exception {
380384
.addAllFields(new ArrayList<Index.IndexField>())
381385
.setMultikey(true)
382386
.setShardCount(-495377042)
387+
.setUnique(true)
383388
.build();
384389
mockService.addResponse(expectedResponse);
385390

@@ -1057,6 +1062,7 @@ public void createDatabaseTest() throws Exception {
10571062
.putAllTags(new HashMap<String, String>())
10581063
.setFreeTier(true)
10591064
.setEtag("etag3123477")
1065+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
10601066
.build();
10611067
Operation resultOperation =
10621068
Operation.newBuilder()
@@ -1124,6 +1130,7 @@ public void createDatabaseTest2() throws Exception {
11241130
.putAllTags(new HashMap<String, String>())
11251131
.setFreeTier(true)
11261132
.setEtag("etag3123477")
1133+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
11271134
.build();
11281135
Operation resultOperation =
11291136
Operation.newBuilder()
@@ -1191,6 +1198,7 @@ public void getDatabaseTest() throws Exception {
11911198
.putAllTags(new HashMap<String, String>())
11921199
.setFreeTier(true)
11931200
.setEtag("etag3123477")
1201+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
11941202
.build();
11951203
mockService.addResponse(expectedResponse);
11961204

@@ -1249,6 +1257,7 @@ public void getDatabaseTest2() throws Exception {
12491257
.putAllTags(new HashMap<String, String>())
12501258
.setFreeTier(true)
12511259
.setEtag("etag3123477")
1260+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
12521261
.build();
12531262
mockService.addResponse(expectedResponse);
12541263

@@ -1397,6 +1406,7 @@ public void updateDatabaseTest() throws Exception {
13971406
.putAllTags(new HashMap<String, String>())
13981407
.setFreeTier(true)
13991408
.setEtag("etag3123477")
1409+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
14001410
.build();
14011411
Operation resultOperation =
14021412
Operation.newBuilder()
@@ -1423,6 +1433,7 @@ public void updateDatabaseTest() throws Exception {
14231433
.putAllTags(new HashMap<String, String>())
14241434
.setFreeTier(true)
14251435
.setEtag("etag3123477")
1436+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
14261437
.build();
14271438
FieldMask updateMask = FieldMask.newBuilder().build();
14281439

@@ -1469,6 +1480,7 @@ public void updateDatabaseExceptionTest() throws Exception {
14691480
.putAllTags(new HashMap<String, String>())
14701481
.setFreeTier(true)
14711482
.setEtag("etag3123477")
1483+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
14721484
.build();
14731485
FieldMask updateMask = FieldMask.newBuilder().build();
14741486
client.updateDatabaseAsync(database, updateMask).get();
@@ -1496,6 +1508,7 @@ public void deleteDatabaseTest() throws Exception {
14961508
.putAllTags(new HashMap<String, String>())
14971509
.setFreeTier(true)
14981510
.setEtag("etag3123477")
1511+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
14991512
.build();
15001513
Operation resultOperation =
15011514
Operation.newBuilder()
@@ -1559,6 +1572,7 @@ public void deleteDatabaseTest2() throws Exception {
15591572
.putAllTags(new HashMap<String, String>())
15601573
.setFreeTier(true)
15611574
.setEtag("etag3123477")
1575+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
15621576
.build();
15631577
Operation resultOperation =
15641578
Operation.newBuilder()
@@ -2532,6 +2546,7 @@ public void restoreDatabaseTest() throws Exception {
25322546
.putAllTags(new HashMap<String, String>())
25332547
.setFreeTier(true)
25342548
.setEtag("etag3123477")
2549+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
25352550
.build();
25362551
Operation resultOperation =
25372552
Operation.newBuilder()
@@ -3043,6 +3058,7 @@ public void cloneDatabaseTest() throws Exception {
30433058
.putAllTags(new HashMap<String, String>())
30443059
.setFreeTier(true)
30453060
.setEtag("etag3123477")
3061+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
30463062
.build();
30473063
Operation resultOperation =
30483064
Operation.newBuilder()

‎google-cloud-firestore-admin/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientTest.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
import com.google.firestore.admin.v1.LocationName;
7878
import com.google.firestore.admin.v1.PitrSnapshot;
7979
import com.google.firestore.admin.v1.ProjectName;
80+
import com.google.firestore.admin.v1.RealtimeUpdatesMode;
8081
import com.google.firestore.admin.v1.ResetUserPasswordRequest;
8182
import com.google.firestore.admin.v1.RestoreDatabaseRequest;
8283
import com.google.firestore.admin.v1.UpdateBackupScheduleRequest;
@@ -156,6 +157,7 @@ public void createIndexTest() throws Exception {
156157
.addAllFields(new ArrayList<Index.IndexField>())
157158
.setMultikey(true)
158159
.setShardCount(-495377042)
160+
.setUnique(true)
159161
.build();
160162
Operation resultOperation =
161163
Operation.newBuilder()
@@ -209,6 +211,7 @@ public void createIndexTest2() throws Exception {
209211
.addAllFields(new ArrayList<Index.IndexField>())
210212
.setMultikey(true)
211213
.setShardCount(-495377042)
214+
.setUnique(true)
212215
.build();
213216
Operation resultOperation =
214217
Operation.newBuilder()
@@ -350,6 +353,7 @@ public void getIndexTest() throws Exception {
350353
.addAllFields(new ArrayList<Index.IndexField>())
351354
.setMultikey(true)
352355
.setShardCount(-495377042)
356+
.setUnique(true)
353357
.build();
354358
mockFirestoreAdmin.addResponse(expectedResponse);
355359

@@ -391,6 +395,7 @@ public void getIndexTest2() throws Exception {
391395
.addAllFields(new ArrayList<Index.IndexField>())
392396
.setMultikey(true)
393397
.setShardCount(-495377042)
398+
.setUnique(true)
394399
.build();
395400
mockFirestoreAdmin.addResponse(expectedResponse);
396401

@@ -986,6 +991,7 @@ public void createDatabaseTest() throws Exception {
986991
.putAllTags(new HashMap<String, String>())
987992
.setFreeTier(true)
988993
.setEtag("etag3123477")
994+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
989995
.build();
990996
Operation resultOperation =
991997
Operation.newBuilder()
@@ -1052,6 +1058,7 @@ public void createDatabaseTest2() throws Exception {
10521058
.putAllTags(new HashMap<String, String>())
10531059
.setFreeTier(true)
10541060
.setEtag("etag3123477")
1061+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
10551062
.build();
10561063
Operation resultOperation =
10571064
Operation.newBuilder()
@@ -1118,6 +1125,7 @@ public void getDatabaseTest() throws Exception {
11181125
.putAllTags(new HashMap<String, String>())
11191126
.setFreeTier(true)
11201127
.setEtag("etag3123477")
1128+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
11211129
.build();
11221130
mockFirestoreAdmin.addResponse(expectedResponse);
11231131

@@ -1170,6 +1178,7 @@ public void getDatabaseTest2() throws Exception {
11701178
.putAllTags(new HashMap<String, String>())
11711179
.setFreeTier(true)
11721180
.setEtag("etag3123477")
1181+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
11731182
.build();
11741183
mockFirestoreAdmin.addResponse(expectedResponse);
11751184

@@ -1300,6 +1309,7 @@ public void updateDatabaseTest() throws Exception {
13001309
.putAllTags(new HashMap<String, String>())
13011310
.setFreeTier(true)
13021311
.setEtag("etag3123477")
1312+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
13031313
.build();
13041314
Operation resultOperation =
13051315
Operation.newBuilder()
@@ -1363,6 +1373,7 @@ public void deleteDatabaseTest() throws Exception {
13631373
.putAllTags(new HashMap<String, String>())
13641374
.setFreeTier(true)
13651375
.setEtag("etag3123477")
1376+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
13661377
.build();
13671378
Operation resultOperation =
13681379
Operation.newBuilder()
@@ -1423,6 +1434,7 @@ public void deleteDatabaseTest2() throws Exception {
14231434
.putAllTags(new HashMap<String, String>())
14241435
.setFreeTier(true)
14251436
.setEtag("etag3123477")
1437+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
14261438
.build();
14271439
Operation resultOperation =
14281440
Operation.newBuilder()
@@ -2277,6 +2289,7 @@ public void restoreDatabaseTest() throws Exception {
22772289
.putAllTags(new HashMap<String, String>())
22782290
.setFreeTier(true)
22792291
.setEtag("etag3123477")
2292+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
22802293
.build();
22812294
Operation resultOperation =
22822295
Operation.newBuilder()
@@ -2725,6 +2738,7 @@ public void cloneDatabaseTest() throws Exception {
27252738
.putAllTags(new HashMap<String, String>())
27262739
.setFreeTier(true)
27272740
.setEtag("etag3123477")
2741+
.setRealtimeUpdatesMode(RealtimeUpdatesMode.forNumber(0))
27282742
.build();
27292743
Operation resultOperation =
27302744
Operation.newBuilder()

‎proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CloneDatabaseRequest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public com.google.protobuf.ByteString getParentBytes() {
161161
* with first character a letter and the last a letter or a number. Must not
162162
* be UUID-like /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.
163163
*
164-
* "(default)" database ID is also valid.
164+
* "(default)" database ID is also valid if the database is Standard edition.
165165
* </pre>
166166
*
167167
* <code>string database_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -193,7 +193,7 @@ public java.lang.String getDatabaseId() {
193193
* with first character a letter and the last a letter or a number. Must not
194194
* be UUID-like /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.
195195
*
196-
* "(default)" database ID is also valid.
196+
* "(default)" database ID is also valid if the database is Standard edition.
197197
* </pre>
198198
*
199199
* <code>string database_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1093,7 +1093,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
10931093
* with first character a letter and the last a letter or a number. Must not
10941094
* be UUID-like /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.
10951095
*
1096-
* "(default)" database ID is also valid.
1096+
* "(default)" database ID is also valid if the database is Standard edition.
10971097
* </pre>
10981098
*
10991099
* <code>string database_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1124,7 +1124,7 @@ public java.lang.String getDatabaseId() {
11241124
* with first character a letter and the last a letter or a number. Must not
11251125
* be UUID-like /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.
11261126
*
1127-
* "(default)" database ID is also valid.
1127+
* "(default)" database ID is also valid if the database is Standard edition.
11281128
* </pre>
11291129
*
11301130
* <code>string database_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1155,7 +1155,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
11551155
* with first character a letter and the last a letter or a number. Must not
11561156
* be UUID-like /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.
11571157
*
1158-
* "(default)" database ID is also valid.
1158+
* "(default)" database ID is also valid if the database is Standard edition.
11591159
* </pre>
11601160
*
11611161
* <code>string database_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1185,7 +1185,7 @@ public Builder setDatabaseId(java.lang.String value) {
11851185
* with first character a letter and the last a letter or a number. Must not
11861186
* be UUID-like /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.
11871187
*
1188-
* "(default)" database ID is also valid.
1188+
* "(default)" database ID is also valid if the database is Standard edition.
11891189
* </pre>
11901190
*
11911191
* <code>string database_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1211,7 +1211,7 @@ public Builder clearDatabaseId() {
12111211
* with first character a letter and the last a letter or a number. Must not
12121212
* be UUID-like /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.
12131213
*
1214-
* "(default)" database ID is also valid.
1214+
* "(default)" database ID is also valid if the database is Standard edition.
12151215
* </pre>
12161216
*
12171217
* <code>string database_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>

‎proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CloneDatabaseRequestOrBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public interface CloneDatabaseRequestOrBuilder
7070
* with first character a letter and the last a letter or a number. Must not
7171
* be UUID-like /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.
7272
*
73-
* "(default)" database ID is also valid.
73+
* "(default)" database ID is also valid if the database is Standard edition.
7474
* </pre>
7575
*
7676
* <code>string database_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -91,7 +91,7 @@ public interface CloneDatabaseRequestOrBuilder
9191
* with first character a letter and the last a letter or a number. Must not
9292
* be UUID-like /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/.
9393
*
94-
* "(default)" database ID is also valid.
94+
* "(default)" database ID is also valid if the database is Standard edition.
9595
* </pre>
9696
*
9797
* <code>string database_id = 2 [(.google.api.field_behavior) = REQUIRED];</code>

0 commit comments

Comments
 (0)