Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/hermetic_library_generation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
with:
fetch-depth: 0
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
- uses: googleapis/sdk-platform-java/.github/scripts@v2.60.1
- uses: googleapis/sdk-platform-java/.github/scripts@v2.60.2
if: env.SHOULD_RUN == 'true'
with:
base_ref: ${{ github.base_ref }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
If you are using Gradle 5.x or later, add this to your dependencies:

```Groovy
implementation platform('com.google.cloud:libraries-bom:26.61.0')
implementation platform('com.google.cloud:libraries-bom:26.64.0')

implementation 'com.google.cloud:google-cloud-firestore'
```
Expand Down
6 changes: 3 additions & 3 deletions generation_config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
gapic_generator_version: 2.60.1
googleapis_commitish: e0ccc57ed01b0057222f865de5765b7e453cfd81
libraries_bom_version: 26.61.0
gapic_generator_version: 2.60.2
googleapis_commitish: fb0d8ac09cd1c2d94e9da572f0ad4692c8781410
libraries_bom_version: 26.64.0
libraries:
- api_shortname: firestore
name_pretty: Cloud Firestore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4312,6 +4312,7 @@ public final UnaryCallable<DeleteBackupRequest, Empty> deleteBackupCallable() {
* .setDatabaseId("databaseId1688905718")
* .setBackup(BackupName.of("[PROJECT]", "[LOCATION]", "[BACKUP]").toString())
* .setEncryptionConfig(Database.EncryptionConfig.newBuilder().build())
* .putAllTags(new HashMap<String, String>())
* .build();
* Database response = firestoreAdminClient.restoreDatabaseAsync(request).get();
* }
Expand Down Expand Up @@ -4357,6 +4358,7 @@ public final OperationFuture<Database, RestoreDatabaseMetadata> restoreDatabaseA
* .setDatabaseId("databaseId1688905718")
* .setBackup(BackupName.of("[PROJECT]", "[LOCATION]", "[BACKUP]").toString())
* .setEncryptionConfig(Database.EncryptionConfig.newBuilder().build())
* .putAllTags(new HashMap<String, String>())
* .build();
* OperationFuture<Database, RestoreDatabaseMetadata> future =
* firestoreAdminClient.restoreDatabaseOperationCallable().futureCall(request);
Expand Down Expand Up @@ -4402,6 +4404,7 @@ public final OperationFuture<Database, RestoreDatabaseMetadata> restoreDatabaseA
* .setDatabaseId("databaseId1688905718")
* .setBackup(BackupName.of("[PROJECT]", "[LOCATION]", "[BACKUP]").toString())
* .setEncryptionConfig(Database.EncryptionConfig.newBuilder().build())
* .putAllTags(new HashMap<String, String>())
* .build();
* ApiFuture<Operation> future =
* firestoreAdminClient.restoreDatabaseCallable().futureCall(request);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.ExecutionException;
import javax.annotation.Generated;
Expand Down Expand Up @@ -1051,6 +1052,7 @@ public void createDatabaseTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1117,6 +1119,7 @@ public void createDatabaseTest2() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1183,6 +1186,7 @@ public void getDatabaseTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1240,6 +1244,7 @@ public void getDatabaseTest2() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1387,6 +1392,7 @@ public void updateDatabaseTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand All @@ -1412,6 +1418,7 @@ public void updateDatabaseTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1457,6 +1464,7 @@ public void updateDatabaseExceptionTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand All @@ -1483,6 +1491,7 @@ public void deleteDatabaseTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1545,6 +1554,7 @@ public void deleteDatabaseTest2() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -2517,6 +2527,7 @@ public void restoreDatabaseTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand All @@ -2534,6 +2545,7 @@ public void restoreDatabaseTest() throws Exception {
.setDatabaseId("databaseId1688905718")
.setBackup(BackupName.of("[PROJECT]", "[LOCATION]", "[BACKUP]").toString())
.setEncryptionConfig(Database.EncryptionConfig.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.build();

Database actualResponse = client.restoreDatabaseAsync(request).get();
Expand Down Expand Up @@ -2568,6 +2580,7 @@ public void restoreDatabaseExceptionTest() throws Exception {
.setDatabaseId("databaseId1688905718")
.setBackup(BackupName.of("[PROJECT]", "[LOCATION]", "[BACKUP]").toString())
.setEncryptionConfig(Database.EncryptionConfig.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.build();
client.restoreDatabaseAsync(request).get();
Assert.fail("No exception raised");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
Expand Down Expand Up @@ -980,6 +981,7 @@ public void createDatabaseTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1045,6 +1047,7 @@ public void createDatabaseTest2() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1110,6 +1113,7 @@ public void getDatabaseTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1161,6 +1165,7 @@ public void getDatabaseTest2() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1290,6 +1295,7 @@ public void updateDatabaseTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1352,6 +1358,7 @@ public void deleteDatabaseTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -1411,6 +1418,7 @@ public void deleteDatabaseTest2() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand Down Expand Up @@ -2264,6 +2272,7 @@ public void restoreDatabaseTest() throws Exception {
.setCmekConfig(Database.CmekConfig.newBuilder().build())
.setPreviousId("previousId-32447886")
.setSourceInfo(Database.SourceInfo.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.setFreeTier(true)
.setEtag("etag3123477")
.build();
Expand All @@ -2281,6 +2290,7 @@ public void restoreDatabaseTest() throws Exception {
.setDatabaseId("databaseId1688905718")
.setBackup(BackupName.of("[PROJECT]", "[LOCATION]", "[BACKUP]").toString())
.setEncryptionConfig(Database.EncryptionConfig.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.build();

Database actualResponse = client.restoreDatabaseAsync(request).get();
Expand All @@ -2294,6 +2304,7 @@ public void restoreDatabaseTest() throws Exception {
Assert.assertEquals(request.getDatabaseId(), actualRequest.getDatabaseId());
Assert.assertEquals(request.getBackup(), actualRequest.getBackup());
Assert.assertEquals(request.getEncryptionConfig(), actualRequest.getEncryptionConfig());
Assert.assertEquals(request.getTagsMap(), actualRequest.getTagsMap());
Assert.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
Expand All @@ -2312,6 +2323,7 @@ public void restoreDatabaseExceptionTest() throws Exception {
.setDatabaseId("databaseId1688905718")
.setBackup(BackupName.of("[PROJECT]", "[LOCATION]", "[BACKUP]").toString())
.setEncryptionConfig(Database.EncryptionConfig.newBuilder().build())
.putAllTags(new HashMap<String, String>())
.build();
client.restoreDatabaseAsync(request).get();
Assert.fail("No exception raised");
Expand Down
Loading