Skip to content

Commit e4025fb

Browse files
1 parent 0da5b1a commit e4025fb

File tree

13 files changed

+306
-95
lines changed

13 files changed

+306
-95
lines changed

clients/google-api-services-firestore/v1/2.0.0/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Add the following lines to your `pom.xml` file:
2222
<dependency>
2323
<groupId>com.google.apis</groupId>
2424
<artifactId>google-api-services-firestore</artifactId>
25-
<version>v1-rev20240713-2.0.0</version>
25+
<version>v1-rev20240804-2.0.0</version>
2626
</dependency>
2727
</dependencies>
2828
</project>
@@ -35,7 +35,7 @@ repositories {
3535
mavenCentral()
3636
}
3737
dependencies {
38-
implementation 'com.google.apis:google-api-services-firestore:v1-rev20240713-2.0.0'
38+
implementation 'com.google.apis:google-api-services-firestore:v1-rev20240804-2.0.0'
3939
}
4040
```
4141

clients/google-api-services-firestore/v1/2.0.0/com/google/api/services/firestore/v1/model/DocumentChange.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919
/**
2020
* A Document has changed. May be the result of multiple writes, including deletes, that ultimately
2121
* resulted in a new value for the Document. Multiple DocumentChange messages may be returned for
22-
* the same logical change, if multiple targets are affected. For PipelineQueryTargets, `document`
23-
* will be in the new pipeline format, For a Listen stream with both QueryTargets and
24-
* PipelineQueryTargets present, if a document matches both types of queries, then a separate
25-
* DocumentChange messages will be sent out one for each set.
22+
* the same logical change, if multiple targets are affected.
2623
*
2724
* <p> This is the Java data model class that specifies how to parse/serialize into the JSON that is
2825
* transmitted over HTTP when working with the Cloud Firestore API. For a detailed explanation see:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
/*
2+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
3+
* in compliance with the License. You may obtain a copy of the License at
4+
*
5+
* http://www.apache.org/licenses/LICENSE-2.0
6+
*
7+
* Unless required by applicable law or agreed to in writing, software distributed under the License
8+
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
9+
* or implied. See the License for the specific language governing permissions and limitations under
10+
* the License.
11+
*/
12+
/*
13+
* This code was generated by https://github.com/googleapis/google-api-java-client-services/
14+
* Modify at your own risk.
15+
*/
16+
17+
package com.google.api.services.firestore.v1.model;
18+
19+
/**
20+
* The configuration options for using CMEK (Customer Managed Encryption Key) encryption.
21+
*
22+
* <p> This is the Java data model class that specifies how to parse/serialize into the JSON that is
23+
* transmitted over HTTP when working with the Cloud Firestore API. For a detailed explanation see:
24+
* <a href="https://developers.google.com/api-client-library/java/google-http-java-client/json">https://developers.google.com/api-client-library/java/google-http-java-client/json</a>
25+
* </p>
26+
*
27+
* @author Google, Inc.
28+
*/
29+
@SuppressWarnings("javadoc")
30+
public final class GoogleFirestoreAdminV1CustomerManagedEncryptionOptions extends com.google.api.client.json.GenericJson {
31+
32+
/**
33+
* Required. Only keys in the same location as the database are allowed to be used for encryption.
34+
* For Firestore's nam5 multi-region, this corresponds to Cloud KMS multi-region us. For
35+
* Firestore's eur3 multi-region, this corresponds to Cloud KMS multi-region europe. See
36+
* https://cloud.google.com/kms/docs/locations. The expected format is
37+
* `projects/{project_id}/locations/{kms_location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}`.
38+
* The value may be {@code null}.
39+
*/
40+
@com.google.api.client.util.Key
41+
private java.lang.String kmsKeyName;
42+
43+
/**
44+
* Required. Only keys in the same location as the database are allowed to be used for encryption.
45+
* For Firestore's nam5 multi-region, this corresponds to Cloud KMS multi-region us. For
46+
* Firestore's eur3 multi-region, this corresponds to Cloud KMS multi-region europe. See
47+
* https://cloud.google.com/kms/docs/locations. The expected format is
48+
* `projects/{project_id}/locations/{kms_location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}`.
49+
* @return value or {@code null} for none
50+
*/
51+
public java.lang.String getKmsKeyName() {
52+
return kmsKeyName;
53+
}
54+
55+
/**
56+
* Required. Only keys in the same location as the database are allowed to be used for encryption.
57+
* For Firestore's nam5 multi-region, this corresponds to Cloud KMS multi-region us. For
58+
* Firestore's eur3 multi-region, this corresponds to Cloud KMS multi-region europe. See
59+
* https://cloud.google.com/kms/docs/locations. The expected format is
60+
* `projects/{project_id}/locations/{kms_location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}`.
61+
* @param kmsKeyName kmsKeyName or {@code null} for none
62+
*/
63+
public GoogleFirestoreAdminV1CustomerManagedEncryptionOptions setKmsKeyName(java.lang.String kmsKeyName) {
64+
this.kmsKeyName = kmsKeyName;
65+
return this;
66+
}
67+
68+
@Override
69+
public GoogleFirestoreAdminV1CustomerManagedEncryptionOptions set(String fieldName, Object value) {
70+
return (GoogleFirestoreAdminV1CustomerManagedEncryptionOptions) super.set(fieldName, value);
71+
}
72+
73+
@Override
74+
public GoogleFirestoreAdminV1CustomerManagedEncryptionOptions clone() {
75+
return (GoogleFirestoreAdminV1CustomerManagedEncryptionOptions) super.clone();
76+
}
77+
78+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
/*
2+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
3+
* in compliance with the License. You may obtain a copy of the License at
4+
*
5+
* http://www.apache.org/licenses/LICENSE-2.0
6+
*
7+
* Unless required by applicable law or agreed to in writing, software distributed under the License
8+
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
9+
* or implied. See the License for the specific language governing permissions and limitations under
10+
* the License.
11+
*/
12+
/*
13+
* This code was generated by https://github.com/googleapis/google-api-java-client-services/
14+
* Modify at your own risk.
15+
*/
16+
17+
package com.google.api.services.firestore.v1.model;
18+
19+
/**
20+
* Encryption configuration for a new database being created from another source. The source could
21+
* be a Backup or a DatabaseSnapshot.
22+
*
23+
* <p> This is the Java data model class that specifies how to parse/serialize into the JSON that is
24+
* transmitted over HTTP when working with the Cloud Firestore API. For a detailed explanation see:
25+
* <a href="https://developers.google.com/api-client-library/java/google-http-java-client/json">https://developers.google.com/api-client-library/java/google-http-java-client/json</a>
26+
* </p>
27+
*
28+
* @author Google, Inc.
29+
*/
30+
@SuppressWarnings("javadoc")
31+
public final class GoogleFirestoreAdminV1EncryptionConfig extends com.google.api.client.json.GenericJson {
32+
33+
/**
34+
* Use Customer Managed Encryption Keys (CMEK) for encryption.
35+
* The value may be {@code null}.
36+
*/
37+
@com.google.api.client.util.Key
38+
private GoogleFirestoreAdminV1CustomerManagedEncryptionOptions customerManagedEncryption;
39+
40+
/**
41+
* Use Google default encryption.
42+
* The value may be {@code null}.
43+
*/
44+
@com.google.api.client.util.Key
45+
private GoogleFirestoreAdminV1GoogleDefaultEncryptionOptions googleDefaultEncryption;
46+
47+
/**
48+
* The database will use the same encryption configuration as the source.
49+
* The value may be {@code null}.
50+
*/
51+
@com.google.api.client.util.Key
52+
private GoogleFirestoreAdminV1SourceEncryptionOptions useSourceEncryption;
53+
54+
/**
55+
* Use Customer Managed Encryption Keys (CMEK) for encryption.
56+
* @return value or {@code null} for none
57+
*/
58+
public GoogleFirestoreAdminV1CustomerManagedEncryptionOptions getCustomerManagedEncryption() {
59+
return customerManagedEncryption;
60+
}
61+
62+
/**
63+
* Use Customer Managed Encryption Keys (CMEK) for encryption.
64+
* @param customerManagedEncryption customerManagedEncryption or {@code null} for none
65+
*/
66+
public GoogleFirestoreAdminV1EncryptionConfig setCustomerManagedEncryption(GoogleFirestoreAdminV1CustomerManagedEncryptionOptions customerManagedEncryption) {
67+
this.customerManagedEncryption = customerManagedEncryption;
68+
return this;
69+
}
70+
71+
/**
72+
* Use Google default encryption.
73+
* @return value or {@code null} for none
74+
*/
75+
public GoogleFirestoreAdminV1GoogleDefaultEncryptionOptions getGoogleDefaultEncryption() {
76+
return googleDefaultEncryption;
77+
}
78+
79+
/**
80+
* Use Google default encryption.
81+
* @param googleDefaultEncryption googleDefaultEncryption or {@code null} for none
82+
*/
83+
public GoogleFirestoreAdminV1EncryptionConfig setGoogleDefaultEncryption(GoogleFirestoreAdminV1GoogleDefaultEncryptionOptions googleDefaultEncryption) {
84+
this.googleDefaultEncryption = googleDefaultEncryption;
85+
return this;
86+
}
87+
88+
/**
89+
* The database will use the same encryption configuration as the source.
90+
* @return value or {@code null} for none
91+
*/
92+
public GoogleFirestoreAdminV1SourceEncryptionOptions getUseSourceEncryption() {
93+
return useSourceEncryption;
94+
}
95+
96+
/**
97+
* The database will use the same encryption configuration as the source.
98+
* @param useSourceEncryption useSourceEncryption or {@code null} for none
99+
*/
100+
public GoogleFirestoreAdminV1EncryptionConfig setUseSourceEncryption(GoogleFirestoreAdminV1SourceEncryptionOptions useSourceEncryption) {
101+
this.useSourceEncryption = useSourceEncryption;
102+
return this;
103+
}
104+
105+
@Override
106+
public GoogleFirestoreAdminV1EncryptionConfig set(String fieldName, Object value) {
107+
return (GoogleFirestoreAdminV1EncryptionConfig) super.set(fieldName, value);
108+
}
109+
110+
@Override
111+
public GoogleFirestoreAdminV1EncryptionConfig clone() {
112+
return (GoogleFirestoreAdminV1EncryptionConfig) super.clone();
113+
}
114+
115+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
3+
* in compliance with the License. You may obtain a copy of the License at
4+
*
5+
* http://www.apache.org/licenses/LICENSE-2.0
6+
*
7+
* Unless required by applicable law or agreed to in writing, software distributed under the License
8+
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
9+
* or implied. See the License for the specific language governing permissions and limitations under
10+
* the License.
11+
*/
12+
/*
13+
* This code was generated by https://github.com/googleapis/google-api-java-client-services/
14+
* Modify at your own risk.
15+
*/
16+
17+
package com.google.api.services.firestore.v1.model;
18+
19+
/**
20+
* The configuration options for using Google default encryption.
21+
*
22+
* <p> This is the Java data model class that specifies how to parse/serialize into the JSON that is
23+
* transmitted over HTTP when working with the Cloud Firestore API. For a detailed explanation see:
24+
* <a href="https://developers.google.com/api-client-library/java/google-http-java-client/json">https://developers.google.com/api-client-library/java/google-http-java-client/json</a>
25+
* </p>
26+
*
27+
* @author Google, Inc.
28+
*/
29+
@SuppressWarnings("javadoc")
30+
public final class GoogleFirestoreAdminV1GoogleDefaultEncryptionOptions extends com.google.api.client.json.GenericJson {
31+
32+
@Override
33+
public GoogleFirestoreAdminV1GoogleDefaultEncryptionOptions set(String fieldName, Object value) {
34+
return (GoogleFirestoreAdminV1GoogleDefaultEncryptionOptions) super.set(fieldName, value);
35+
}
36+
37+
@Override
38+
public GoogleFirestoreAdminV1GoogleDefaultEncryptionOptions clone() {
39+
return (GoogleFirestoreAdminV1GoogleDefaultEncryptionOptions) super.clone();
40+
}
41+
42+
}

clients/google-api-services-firestore/v1/2.0.0/com/google/api/services/firestore/v1/model/GoogleFirestoreAdminV1RestoreDatabaseRequest.java

Lines changed: 15 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,13 @@ public final class GoogleFirestoreAdminV1RestoreDatabaseRequest extends com.goog
5050
private java.lang.String databaseId;
5151

5252
/**
53-
* Use Customer Managed Encryption Keys (CMEK) for encryption. Only keys in the same location as
54-
* the restored database are allowed to be used for encryption. For Firestore's nam5 multi-region,
55-
* this corresponds to Cloud KMS multi-region us. For Firestore's eur3 multi-region, this
56-
* corresponds to Cloud KMS multi-region europe. See https://cloud.google.com/kms/docs/locations.
57-
* The expected format is
58-
* `projects/{project_id}/locations/{kms_location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}`.
53+
* Optional. Encryption configuration for the restored database. If this field is not specified,
54+
* the restored database will use the same encryption configuration as the backup, namely
55+
* use_source_encryption.
5956
* The value may be {@code null}.
6057
*/
6158
@com.google.api.client.util.Key
62-
private java.lang.String kmsKeyName;
63-
64-
/**
65-
* The restored database will use the same encryption configuration as the backup. This is the
66-
* default option when no `encryption_config` is specified.
67-
* The value may be {@code null}.
68-
*/
69-
@com.google.api.client.util.Key
70-
private Empty useBackupEncryption;
71-
72-
/**
73-
* Use Google default encryption.
74-
* The value may be {@code null}.
75-
*/
76-
@com.google.api.client.util.Key
77-
private Empty useGoogleDefaultEncryption;
59+
private GoogleFirestoreAdminV1EncryptionConfig encryptionConfig;
7860

7961
/**
8062
* Backup to restore from. Must be from the same project as the parent. The restored database will
@@ -123,65 +105,23 @@ public GoogleFirestoreAdminV1RestoreDatabaseRequest setDatabaseId(java.lang.Stri
123105
}
124106

125107
/**
126-
* Use Customer Managed Encryption Keys (CMEK) for encryption. Only keys in the same location as
127-
* the restored database are allowed to be used for encryption. For Firestore's nam5 multi-region,
128-
* this corresponds to Cloud KMS multi-region us. For Firestore's eur3 multi-region, this
129-
* corresponds to Cloud KMS multi-region europe. See https://cloud.google.com/kms/docs/locations.
130-
* The expected format is
131-
* `projects/{project_id}/locations/{kms_location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}`.
132-
* @return value or {@code null} for none
133-
*/
134-
public java.lang.String getKmsKeyName() {
135-
return kmsKeyName;
136-
}
137-
138-
/**
139-
* Use Customer Managed Encryption Keys (CMEK) for encryption. Only keys in the same location as
140-
* the restored database are allowed to be used for encryption. For Firestore's nam5 multi-region,
141-
* this corresponds to Cloud KMS multi-region us. For Firestore's eur3 multi-region, this
142-
* corresponds to Cloud KMS multi-region europe. See https://cloud.google.com/kms/docs/locations.
143-
* The expected format is
144-
* `projects/{project_id}/locations/{kms_location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}`.
145-
* @param kmsKeyName kmsKeyName or {@code null} for none
146-
*/
147-
public GoogleFirestoreAdminV1RestoreDatabaseRequest setKmsKeyName(java.lang.String kmsKeyName) {
148-
this.kmsKeyName = kmsKeyName;
149-
return this;
150-
}
151-
152-
/**
153-
* The restored database will use the same encryption configuration as the backup. This is the
154-
* default option when no `encryption_config` is specified.
155-
* @return value or {@code null} for none
156-
*/
157-
public Empty getUseBackupEncryption() {
158-
return useBackupEncryption;
159-
}
160-
161-
/**
162-
* The restored database will use the same encryption configuration as the backup. This is the
163-
* default option when no `encryption_config` is specified.
164-
* @param useBackupEncryption useBackupEncryption or {@code null} for none
165-
*/
166-
public GoogleFirestoreAdminV1RestoreDatabaseRequest setUseBackupEncryption(Empty useBackupEncryption) {
167-
this.useBackupEncryption = useBackupEncryption;
168-
return this;
169-
}
170-
171-
/**
172-
* Use Google default encryption.
108+
* Optional. Encryption configuration for the restored database. If this field is not specified,
109+
* the restored database will use the same encryption configuration as the backup, namely
110+
* use_source_encryption.
173111
* @return value or {@code null} for none
174112
*/
175-
public Empty getUseGoogleDefaultEncryption() {
176-
return useGoogleDefaultEncryption;
113+
public GoogleFirestoreAdminV1EncryptionConfig getEncryptionConfig() {
114+
return encryptionConfig;
177115
}
178116

179117
/**
180-
* Use Google default encryption.
181-
* @param useGoogleDefaultEncryption useGoogleDefaultEncryption or {@code null} for none
118+
* Optional. Encryption configuration for the restored database. If this field is not specified,
119+
* the restored database will use the same encryption configuration as the backup, namely
120+
* use_source_encryption.
121+
* @param encryptionConfig encryptionConfig or {@code null} for none
182122
*/
183-
public GoogleFirestoreAdminV1RestoreDatabaseRequest setUseGoogleDefaultEncryption(Empty useGoogleDefaultEncryption) {
184-
this.useGoogleDefaultEncryption = useGoogleDefaultEncryption;
123+
public GoogleFirestoreAdminV1RestoreDatabaseRequest setEncryptionConfig(GoogleFirestoreAdminV1EncryptionConfig encryptionConfig) {
124+
this.encryptionConfig = encryptionConfig;
185125
return this;
186126
}
187127

0 commit comments

Comments
 (0)