Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

Commit 1ea1db0

Browse files
jinseopkim0jinseopkim0
authored
Merge branch 'main' into release-please--branches--main
2 parents bb116f2 + 1838215 commit 1ea1db0

12 files changed

Lines changed: 7136 additions & 1000 deletions

File tree

‎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.79.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.80.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.71.0
2-
googleapis_commitish: 62e4ecb2f4390728990514fea14aad0431881a52
3-
libraries_bom_version: 26.79.0
1+
gapic_generator_version: 2.72.0
2+
googleapis_commitish: c2648728afb6deff882cfc4167a21abd382870fa
3+
libraries_bom_version: 26.80.0
44
libraries:
55
- api_shortname: firestore
66
name_pretty: Cloud Firestore

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

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,6 +1601,96 @@
16011601
"allDeclaredClasses": true,
16021602
"allPublicClasses": true
16031603
},
1604+
{
1605+
"name": "com.google.firestore.admin.v1.Index$IndexField$SearchConfig",
1606+
"queryAllDeclaredConstructors": true,
1607+
"queryAllPublicConstructors": true,
1608+
"queryAllDeclaredMethods": true,
1609+
"allPublicMethods": true,
1610+
"allDeclaredClasses": true,
1611+
"allPublicClasses": true
1612+
},
1613+
{
1614+
"name": "com.google.firestore.admin.v1.Index$IndexField$SearchConfig$Builder",
1615+
"queryAllDeclaredConstructors": true,
1616+
"queryAllPublicConstructors": true,
1617+
"queryAllDeclaredMethods": true,
1618+
"allPublicMethods": true,
1619+
"allDeclaredClasses": true,
1620+
"allPublicClasses": true
1621+
},
1622+
{
1623+
"name": "com.google.firestore.admin.v1.Index$IndexField$SearchConfig$SearchGeoSpec",
1624+
"queryAllDeclaredConstructors": true,
1625+
"queryAllPublicConstructors": true,
1626+
"queryAllDeclaredMethods": true,
1627+
"allPublicMethods": true,
1628+
"allDeclaredClasses": true,
1629+
"allPublicClasses": true
1630+
},
1631+
{
1632+
"name": "com.google.firestore.admin.v1.Index$IndexField$SearchConfig$SearchGeoSpec$Builder",
1633+
"queryAllDeclaredConstructors": true,
1634+
"queryAllPublicConstructors": true,
1635+
"queryAllDeclaredMethods": true,
1636+
"allPublicMethods": true,
1637+
"allDeclaredClasses": true,
1638+
"allPublicClasses": true
1639+
},
1640+
{
1641+
"name": "com.google.firestore.admin.v1.Index$IndexField$SearchConfig$SearchTextIndexSpec",
1642+
"queryAllDeclaredConstructors": true,
1643+
"queryAllPublicConstructors": true,
1644+
"queryAllDeclaredMethods": true,
1645+
"allPublicMethods": true,
1646+
"allDeclaredClasses": true,
1647+
"allPublicClasses": true
1648+
},
1649+
{
1650+
"name": "com.google.firestore.admin.v1.Index$IndexField$SearchConfig$SearchTextIndexSpec$Builder",
1651+
"queryAllDeclaredConstructors": true,
1652+
"queryAllPublicConstructors": true,
1653+
"queryAllDeclaredMethods": true,
1654+
"allPublicMethods": true,
1655+
"allDeclaredClasses": true,
1656+
"allPublicClasses": true
1657+
},
1658+
{
1659+
"name": "com.google.firestore.admin.v1.Index$IndexField$SearchConfig$SearchTextSpec",
1660+
"queryAllDeclaredConstructors": true,
1661+
"queryAllPublicConstructors": true,
1662+
"queryAllDeclaredMethods": true,
1663+
"allPublicMethods": true,
1664+
"allDeclaredClasses": true,
1665+
"allPublicClasses": true
1666+
},
1667+
{
1668+
"name": "com.google.firestore.admin.v1.Index$IndexField$SearchConfig$SearchTextSpec$Builder",
1669+
"queryAllDeclaredConstructors": true,
1670+
"queryAllPublicConstructors": true,
1671+
"queryAllDeclaredMethods": true,
1672+
"allPublicMethods": true,
1673+
"allDeclaredClasses": true,
1674+
"allPublicClasses": true
1675+
},
1676+
{
1677+
"name": "com.google.firestore.admin.v1.Index$IndexField$SearchConfig$TextIndexType",
1678+
"queryAllDeclaredConstructors": true,
1679+
"queryAllPublicConstructors": true,
1680+
"queryAllDeclaredMethods": true,
1681+
"allPublicMethods": true,
1682+
"allDeclaredClasses": true,
1683+
"allPublicClasses": true
1684+
},
1685+
{
1686+
"name": "com.google.firestore.admin.v1.Index$IndexField$SearchConfig$TextMatchType",
1687+
"queryAllDeclaredConstructors": true,
1688+
"queryAllPublicConstructors": true,
1689+
"queryAllDeclaredMethods": true,
1690+
"allPublicMethods": true,
1691+
"allDeclaredClasses": true,
1692+
"allPublicClasses": true
1693+
},
16041694
{
16051695
"name": "com.google.firestore.admin.v1.Index$IndexField$VectorConfig",
16061696
"queryAllDeclaredConstructors": true,
@@ -1646,6 +1736,24 @@
16461736
"allDeclaredClasses": true,
16471737
"allPublicClasses": true
16481738
},
1739+
{
1740+
"name": "com.google.firestore.admin.v1.Index$SearchIndexOptions",
1741+
"queryAllDeclaredConstructors": true,
1742+
"queryAllPublicConstructors": true,
1743+
"queryAllDeclaredMethods": true,
1744+
"allPublicMethods": true,
1745+
"allDeclaredClasses": true,
1746+
"allPublicClasses": true
1747+
},
1748+
{
1749+
"name": "com.google.firestore.admin.v1.Index$SearchIndexOptions$Builder",
1750+
"queryAllDeclaredConstructors": true,
1751+
"queryAllPublicConstructors": true,
1752+
"queryAllDeclaredMethods": true,
1753+
"allPublicMethods": true,
1754+
"allDeclaredClasses": true,
1755+
"allPublicClasses": true
1756+
},
16491757
{
16501758
"name": "com.google.firestore.admin.v1.Index$State",
16511759
"queryAllDeclaredConstructors": true,

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ public void createIndexTest() throws Exception {
121121
.setMultikey(true)
122122
.setShardCount(-495377042)
123123
.setUnique(true)
124+
.setSearchIndexOptions(Index.SearchIndexOptions.newBuilder().build())
124125
.build();
125126
Operation resultOperation =
126127
Operation.newBuilder()
@@ -177,6 +178,7 @@ public void createIndexTest2() throws Exception {
177178
.setMultikey(true)
178179
.setShardCount(-495377042)
179180
.setUnique(true)
181+
.setSearchIndexOptions(Index.SearchIndexOptions.newBuilder().build())
180182
.build();
181183
Operation resultOperation =
182184
Operation.newBuilder()
@@ -337,6 +339,7 @@ public void getIndexTest() throws Exception {
337339
.setMultikey(true)
338340
.setShardCount(-495377042)
339341
.setUnique(true)
342+
.setSearchIndexOptions(Index.SearchIndexOptions.newBuilder().build())
340343
.build();
341344
mockService.addResponse(expectedResponse);
342345

@@ -385,6 +388,7 @@ public void getIndexTest2() throws Exception {
385388
.setMultikey(true)
386389
.setShardCount(-495377042)
387390
.setUnique(true)
391+
.setSearchIndexOptions(Index.SearchIndexOptions.newBuilder().build())
388392
.build();
389393
mockService.addResponse(expectedResponse);
390394

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ public void createIndexTest() throws Exception {
158158
.setMultikey(true)
159159
.setShardCount(-495377042)
160160
.setUnique(true)
161+
.setSearchIndexOptions(Index.SearchIndexOptions.newBuilder().build())
161162
.build();
162163
Operation resultOperation =
163164
Operation.newBuilder()
@@ -212,6 +213,7 @@ public void createIndexTest2() throws Exception {
212213
.setMultikey(true)
213214
.setShardCount(-495377042)
214215
.setUnique(true)
216+
.setSearchIndexOptions(Index.SearchIndexOptions.newBuilder().build())
215217
.build();
216218
Operation resultOperation =
217219
Operation.newBuilder()
@@ -354,6 +356,7 @@ public void getIndexTest() throws Exception {
354356
.setMultikey(true)
355357
.setShardCount(-495377042)
356358
.setUnique(true)
359+
.setSearchIndexOptions(Index.SearchIndexOptions.newBuilder().build())
357360
.build();
358361
mockFirestoreAdmin.addResponse(expectedResponse);
359362

@@ -396,6 +399,7 @@ public void getIndexTest2() throws Exception {
396399
.setMultikey(true)
397400
.setShardCount(-495377042)
398401
.setUnique(true)
402+
.setSearchIndexOptions(Index.SearchIndexOptions.newBuilder().build())
399403
.build();
400404
mockFirestoreAdmin.addResponse(expectedResponse);
401405

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,11 @@ public com.google.firestore.admin.v1.Backup.Stats getDefaultInstanceForType() {
10081008
* Output only. The unique resource name of the Backup.
10091009
*
10101010
* Format is `projects/{project}/locations/{location}/backups/{backup}`.
1011+
*
1012+
* The location in the name will be the Standard Managed Multi-Region (SMMR)
1013+
* location (e.g. `us`) if the backup was created with an SMMR location, or
1014+
* the Google Managed Multi-Region (GMMR) location (e.g. `nam5`) if the backup
1015+
* was created with a GMMR location.
10111016
* </pre>
10121017
*
10131018
* <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1034,6 +1039,11 @@ public java.lang.String getName() {
10341039
* Output only. The unique resource name of the Backup.
10351040
*
10361041
* Format is `projects/{project}/locations/{location}/backups/{backup}`.
1042+
*
1043+
* The location in the name will be the Standard Managed Multi-Region (SMMR)
1044+
* location (e.g. `us`) if the backup was created with an SMMR location, or
1045+
* the Google Managed Multi-Region (GMMR) location (e.g. `nam5`) if the backup
1046+
* was created with a GMMR location.
10371047
* </pre>
10381048
*
10391049
* <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1892,6 +1902,11 @@ public Builder mergeFrom(
18921902
* Output only. The unique resource name of the Backup.
18931903
*
18941904
* Format is `projects/{project}/locations/{location}/backups/{backup}`.
1905+
*
1906+
* The location in the name will be the Standard Managed Multi-Region (SMMR)
1907+
* location (e.g. `us`) if the backup was created with an SMMR location, or
1908+
* the Google Managed Multi-Region (GMMR) location (e.g. `nam5`) if the backup
1909+
* was created with a GMMR location.
18951910
* </pre>
18961911
*
18971912
* <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1917,6 +1932,11 @@ public java.lang.String getName() {
19171932
* Output only. The unique resource name of the Backup.
19181933
*
19191934
* Format is `projects/{project}/locations/{location}/backups/{backup}`.
1935+
*
1936+
* The location in the name will be the Standard Managed Multi-Region (SMMR)
1937+
* location (e.g. `us`) if the backup was created with an SMMR location, or
1938+
* the Google Managed Multi-Region (GMMR) location (e.g. `nam5`) if the backup
1939+
* was created with a GMMR location.
19201940
* </pre>
19211941
*
19221942
* <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1942,6 +1962,11 @@ public com.google.protobuf.ByteString getNameBytes() {
19421962
* Output only. The unique resource name of the Backup.
19431963
*
19441964
* Format is `projects/{project}/locations/{location}/backups/{backup}`.
1965+
*
1966+
* The location in the name will be the Standard Managed Multi-Region (SMMR)
1967+
* location (e.g. `us`) if the backup was created with an SMMR location, or
1968+
* the Google Managed Multi-Region (GMMR) location (e.g. `nam5`) if the backup
1969+
* was created with a GMMR location.
19451970
* </pre>
19461971
*
19471972
* <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1966,6 +1991,11 @@ public Builder setName(java.lang.String value) {
19661991
* Output only. The unique resource name of the Backup.
19671992
*
19681993
* Format is `projects/{project}/locations/{location}/backups/{backup}`.
1994+
*
1995+
* The location in the name will be the Standard Managed Multi-Region (SMMR)
1996+
* location (e.g. `us`) if the backup was created with an SMMR location, or
1997+
* the Google Managed Multi-Region (GMMR) location (e.g. `nam5`) if the backup
1998+
* was created with a GMMR location.
19691999
* </pre>
19702000
*
19712001
* <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -1986,6 +2016,11 @@ public Builder clearName() {
19862016
* Output only. The unique resource name of the Backup.
19872017
*
19882018
* Format is `projects/{project}/locations/{location}/backups/{backup}`.
2019+
*
2020+
* The location in the name will be the Standard Managed Multi-Region (SMMR)
2021+
* location (e.g. `us`) if the backup was created with an SMMR location, or
2022+
* the Google Managed Multi-Region (GMMR) location (e.g. `nam5`) if the backup
2023+
* was created with a GMMR location.
19892024
* </pre>
19902025
*
19912026
* <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ public interface BackupOrBuilder
3333
* Output only. The unique resource name of the Backup.
3434
*
3535
* Format is `projects/{project}/locations/{location}/backups/{backup}`.
36+
*
37+
* The location in the name will be the Standard Managed Multi-Region (SMMR)
38+
* location (e.g. `us`) if the backup was created with an SMMR location, or
39+
* the Google Managed Multi-Region (GMMR) location (e.g. `nam5`) if the backup
40+
* was created with a GMMR location.
3641
* </pre>
3742
*
3843
* <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -48,6 +53,11 @@ public interface BackupOrBuilder
4853
* Output only. The unique resource name of the Backup.
4954
*
5055
* Format is `projects/{project}/locations/{location}/backups/{backup}`.
56+
*
57+
* The location in the name will be the Standard Managed Multi-Region (SMMR)
58+
* location (e.g. `us`) if the backup was created with an SMMR location, or
59+
* the Google Managed Multi-Region (GMMR) location (e.g. `nam5`) if the backup
60+
* was created with a GMMR location.
5161
* </pre>
5262
*
5363
* <code>string name = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>

0 commit comments

Comments
 (0)