Skip to content

Commit d6f044b

Browse files
1 parent 423a752 commit d6f044b

File tree

12 files changed

+401
-132
lines changed

12 files changed

+401
-132
lines changed

clients/google-api-services-spanner/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-spanner</artifactId>
25-
<version>v1-rev20250516-2.0.0</version>
25+
<version>v1-rev20250523-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-spanner:v1-rev20250516-2.0.0'
38+
implementation 'com.google.apis:google-api-services-spanner:v1-rev20250523-2.0.0'
3939
}
4040
```
4141

clients/google-api-services-spanner/v1/2.0.0/com/google/api/services/spanner/v1/Spanner.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7089,15 +7089,15 @@ public Databases databases() {
70897089
public class Databases {
70907090

70917091
/**
7092-
* Adds split points to specified tables, indexes of a database.
7092+
* Adds split points to specified tables and indexes of a database.
70937093
*
70947094
* Create a request for the method "databases.addSplitPoints".
70957095
*
70967096
* This request holds the parameters needed by the spanner server. After setting any optional
70977097
* parameters, call the {@link AddSplitPoints#execute()} method to invoke the remote operation.
70987098
*
7099-
* @param database Required. The database on whose tables/indexes split points are to be added. Values are of the form
7100-
* `projects//instances//databases/`.
7099+
* @param database Required. The database on whose tables or indexes the split points are to be added. Values are of
7100+
* the form `projects//instances//databases/`.
71017101
* @param content the {@link com.google.api.services.spanner.v1.model.AddSplitPointsRequest}
71027102
* @return the request
71037103
*/
@@ -7115,7 +7115,7 @@ public class AddSplitPoints extends SpannerRequest<com.google.api.services.spann
71157115
java.util.regex.Pattern.compile("^projects/[^/]+/instances/[^/]+/databases/[^/]+$");
71167116

71177117
/**
7118-
* Adds split points to specified tables, indexes of a database.
7118+
* Adds split points to specified tables and indexes of a database.
71197119
*
71207120
* Create a request for the method "databases.addSplitPoints".
71217121
*
@@ -7125,8 +7125,8 @@ public class AddSplitPoints extends SpannerRequest<com.google.api.services.spann
71257125
* ientRequest)} must be called to initialize this instance immediately after invoking the
71267126
* constructor. </p>
71277127
*
7128-
* @param database Required. The database on whose tables/indexes split points are to be added. Values are of the form
7129-
* `projects//instances//databases/`.
7128+
* @param database Required. The database on whose tables or indexes the split points are to be added. Values are of
7129+
* the form `projects//instances//databases/`.
71307130
* @param content the {@link com.google.api.services.spanner.v1.model.AddSplitPointsRequest}
71317131
* @since 1.13
71327132
*/
@@ -7196,22 +7196,22 @@ public AddSplitPoints setUploadProtocol(java.lang.String uploadProtocol) {
71967196
}
71977197

71987198
/**
7199-
* Required. The database on whose tables/indexes split points are to be added. Values are
7200-
* of the form `projects//instances//databases/`.
7199+
* Required. The database on whose tables or indexes the split points are to be added.
7200+
* Values are of the form `projects//instances//databases/`.
72017201
*/
72027202
@com.google.api.client.util.Key
72037203
private java.lang.String database;
72047204

7205-
/** Required. The database on whose tables/indexes split points are to be added. Values are of the form
7206-
`projects//instances//databases/`.
7205+
/** Required. The database on whose tables or indexes the split points are to be added. Values are of
7206+
the form `projects//instances//databases/`.
72077207
*/
72087208
public java.lang.String getDatabase() {
72097209
return database;
72107210
}
72117211

72127212
/**
7213-
* Required. The database on whose tables/indexes split points are to be added. Values are
7214-
* of the form `projects//instances//databases/`.
7213+
* Required. The database on whose tables or indexes the split points are to be added.
7214+
* Values are of the form `projects//instances//databases/`.
72157215
*/
72167216
public AddSplitPoints setDatabase(java.lang.String database) {
72177217
if (!getSuppressPatternChecks()) {

clients/google-api-services-spanner/v1/2.0.0/com/google/api/services/spanner/v1/model/AddSplitPointsRequest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public final class AddSplitPointsRequest extends com.google.api.client.json.Gene
3232
/**
3333
* Optional. A user-supplied tag associated with the split points. For example,
3434
* "initial_data_load", "special_event_1". Defaults to "CloudAddSplitPointsAPI" if not specified.
35-
* The length of the tag must not exceed 50 characters,else will be trimmed. Only valid UTF8
35+
* The length of the tag must not exceed 50 characters, or else it is trimmed. Only valid UTF8
3636
* characters are allowed.
3737
* The value may be {@code null}.
3838
*/
@@ -49,7 +49,7 @@ public final class AddSplitPointsRequest extends com.google.api.client.json.Gene
4949
/**
5050
* Optional. A user-supplied tag associated with the split points. For example,
5151
* "initial_data_load", "special_event_1". Defaults to "CloudAddSplitPointsAPI" if not specified.
52-
* The length of the tag must not exceed 50 characters,else will be trimmed. Only valid UTF8
52+
* The length of the tag must not exceed 50 characters, or else it is trimmed. Only valid UTF8
5353
* characters are allowed.
5454
* @return value or {@code null} for none
5555
*/
@@ -60,7 +60,7 @@ public java.lang.String getInitiator() {
6060
/**
6161
* Optional. A user-supplied tag associated with the split points. For example,
6262
* "initial_data_load", "special_event_1". Defaults to "CloudAddSplitPointsAPI" if not specified.
63-
* The length of the tag must not exceed 50 characters,else will be trimmed. Only valid UTF8
63+
* The length of the tag must not exceed 50 characters, or else it is trimmed. Only valid UTF8
6464
* characters are allowed.
6565
* @param initiator initiator or {@code null} for none
6666
*/
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
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.spanner.v1.model;
18+
19+
/**
20+
* The configuration for each database in the target instance configuration.
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 Spanner 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 DatabaseMoveConfig extends com.google.api.client.json.GenericJson {
31+
32+
/**
33+
* Required. The unique identifier of the database resource in the Instance. For example if the
34+
* database uri is projects/foo/instances/bar/databases/baz, the id to supply here is baz.
35+
* The value may be {@code null}.
36+
*/
37+
@com.google.api.client.util.Key
38+
private java.lang.String databaseId;
39+
40+
/**
41+
* Optional. Encryption configuration to be used for the database in target configuration. Should
42+
* be specified for every database which currently uses CMEK encryption. If a database currently
43+
* uses GOOGLE_MANAGED encryption and a target encryption config is not specified, it defaults to
44+
* GOOGLE_MANAGED. If a database currently uses Google-managed encryption and a target encryption
45+
* config is specified, the request is rejected. If a database currently uses CMEK encryption, a
46+
* target encryption config must be specified. You cannot move a CMEK database to a Google-managed
47+
* encryption database by MoveInstance.
48+
* The value may be {@code null}.
49+
*/
50+
@com.google.api.client.util.Key
51+
private InstanceEncryptionConfig encryptionConfig;
52+
53+
/**
54+
* Required. The unique identifier of the database resource in the Instance. For example if the
55+
* database uri is projects/foo/instances/bar/databases/baz, the id to supply here is baz.
56+
* @return value or {@code null} for none
57+
*/
58+
public java.lang.String getDatabaseId() {
59+
return databaseId;
60+
}
61+
62+
/**
63+
* Required. The unique identifier of the database resource in the Instance. For example if the
64+
* database uri is projects/foo/instances/bar/databases/baz, the id to supply here is baz.
65+
* @param databaseId databaseId or {@code null} for none
66+
*/
67+
public DatabaseMoveConfig setDatabaseId(java.lang.String databaseId) {
68+
this.databaseId = databaseId;
69+
return this;
70+
}
71+
72+
/**
73+
* Optional. Encryption configuration to be used for the database in target configuration. Should
74+
* be specified for every database which currently uses CMEK encryption. If a database currently
75+
* uses GOOGLE_MANAGED encryption and a target encryption config is not specified, it defaults to
76+
* GOOGLE_MANAGED. If a database currently uses Google-managed encryption and a target encryption
77+
* config is specified, the request is rejected. If a database currently uses CMEK encryption, a
78+
* target encryption config must be specified. You cannot move a CMEK database to a Google-managed
79+
* encryption database by MoveInstance.
80+
* @return value or {@code null} for none
81+
*/
82+
public InstanceEncryptionConfig getEncryptionConfig() {
83+
return encryptionConfig;
84+
}
85+
86+
/**
87+
* Optional. Encryption configuration to be used for the database in target configuration. Should
88+
* be specified for every database which currently uses CMEK encryption. If a database currently
89+
* uses GOOGLE_MANAGED encryption and a target encryption config is not specified, it defaults to
90+
* GOOGLE_MANAGED. If a database currently uses Google-managed encryption and a target encryption
91+
* config is specified, the request is rejected. If a database currently uses CMEK encryption, a
92+
* target encryption config must be specified. You cannot move a CMEK database to a Google-managed
93+
* encryption database by MoveInstance.
94+
* @param encryptionConfig encryptionConfig or {@code null} for none
95+
*/
96+
public DatabaseMoveConfig setEncryptionConfig(InstanceEncryptionConfig encryptionConfig) {
97+
this.encryptionConfig = encryptionConfig;
98+
return this;
99+
}
100+
101+
@Override
102+
public DatabaseMoveConfig set(String fieldName, Object value) {
103+
return (DatabaseMoveConfig) super.set(fieldName, value);
104+
}
105+
106+
@Override
107+
public DatabaseMoveConfig clone() {
108+
return (DatabaseMoveConfig) super.clone();
109+
}
110+
111+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
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.spanner.v1.model;
18+
19+
/**
20+
* Encryption configuration for a Cloud Spanner database.
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 Spanner 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 InstanceEncryptionConfig extends com.google.api.client.json.GenericJson {
31+
32+
/**
33+
* Optional. This field is maintained for backwards compatibility. For new callers, we recommend
34+
* using `kms_key_names` to specify the KMS key. `kms_key_name` should only be used if the
35+
* location of the KMS key matches the database instance’s configuration (location) exactly. E.g.
36+
* The KMS location is in us-central1 or nam3 and the database instance is also in us-central1 or
37+
* nam3. The Cloud KMS key to be used for encrypting and decrypting the database. Values are of
38+
* the form `projects//locations//keyRings//cryptoKeys/`.
39+
* The value may be {@code null}.
40+
*/
41+
@com.google.api.client.util.Key
42+
private java.lang.String kmsKeyName;
43+
44+
/**
45+
* Optional. Specifies the KMS configuration for one or more keys used to encrypt the database.
46+
* Values are of the form `projects//locations//keyRings//cryptoKeys/`. The keys referenced by
47+
* `kms_key_names` must fully cover all regions of the database's instance configuration. Some
48+
* examples: * For regional (single-region) instance configurations, specify a regional location
49+
* KMS key. * For multi-region instance configurations of type `GOOGLE_MANAGED`, either specify a
50+
* multi-region location KMS key or multiple regional location KMS keys that cover all regions in
51+
* the instance configuration. * For an instance configuration of type `USER_MANAGED`, specify
52+
* only regional location KMS keys to cover each region in the instance configuration. Multi-
53+
* region location KMS keys aren't supported for `USER_MANAGED` type instance configurations.
54+
* The value may be {@code null}.
55+
*/
56+
@com.google.api.client.util.Key
57+
private java.util.List<java.lang.String> kmsKeyNames;
58+
59+
/**
60+
* Optional. This field is maintained for backwards compatibility. For new callers, we recommend
61+
* using `kms_key_names` to specify the KMS key. `kms_key_name` should only be used if the
62+
* location of the KMS key matches the database instance’s configuration (location) exactly. E.g.
63+
* The KMS location is in us-central1 or nam3 and the database instance is also in us-central1 or
64+
* nam3. The Cloud KMS key to be used for encrypting and decrypting the database. Values are of
65+
* the form `projects//locations//keyRings//cryptoKeys/`.
66+
* @return value or {@code null} for none
67+
*/
68+
public java.lang.String getKmsKeyName() {
69+
return kmsKeyName;
70+
}
71+
72+
/**
73+
* Optional. This field is maintained for backwards compatibility. For new callers, we recommend
74+
* using `kms_key_names` to specify the KMS key. `kms_key_name` should only be used if the
75+
* location of the KMS key matches the database instance’s configuration (location) exactly. E.g.
76+
* The KMS location is in us-central1 or nam3 and the database instance is also in us-central1 or
77+
* nam3. The Cloud KMS key to be used for encrypting and decrypting the database. Values are of
78+
* the form `projects//locations//keyRings//cryptoKeys/`.
79+
* @param kmsKeyName kmsKeyName or {@code null} for none
80+
*/
81+
public InstanceEncryptionConfig setKmsKeyName(java.lang.String kmsKeyName) {
82+
this.kmsKeyName = kmsKeyName;
83+
return this;
84+
}
85+
86+
/**
87+
* Optional. Specifies the KMS configuration for one or more keys used to encrypt the database.
88+
* Values are of the form `projects//locations//keyRings//cryptoKeys/`. The keys referenced by
89+
* `kms_key_names` must fully cover all regions of the database's instance configuration. Some
90+
* examples: * For regional (single-region) instance configurations, specify a regional location
91+
* KMS key. * For multi-region instance configurations of type `GOOGLE_MANAGED`, either specify a
92+
* multi-region location KMS key or multiple regional location KMS keys that cover all regions in
93+
* the instance configuration. * For an instance configuration of type `USER_MANAGED`, specify
94+
* only regional location KMS keys to cover each region in the instance configuration. Multi-
95+
* region location KMS keys aren't supported for `USER_MANAGED` type instance configurations.
96+
* @return value or {@code null} for none
97+
*/
98+
public java.util.List<java.lang.String> getKmsKeyNames() {
99+
return kmsKeyNames;
100+
}
101+
102+
/**
103+
* Optional. Specifies the KMS configuration for one or more keys used to encrypt the database.
104+
* Values are of the form `projects//locations//keyRings//cryptoKeys/`. The keys referenced by
105+
* `kms_key_names` must fully cover all regions of the database's instance configuration. Some
106+
* examples: * For regional (single-region) instance configurations, specify a regional location
107+
* KMS key. * For multi-region instance configurations of type `GOOGLE_MANAGED`, either specify a
108+
* multi-region location KMS key or multiple regional location KMS keys that cover all regions in
109+
* the instance configuration. * For an instance configuration of type `USER_MANAGED`, specify
110+
* only regional location KMS keys to cover each region in the instance configuration. Multi-
111+
* region location KMS keys aren't supported for `USER_MANAGED` type instance configurations.
112+
* @param kmsKeyNames kmsKeyNames or {@code null} for none
113+
*/
114+
public InstanceEncryptionConfig setKmsKeyNames(java.util.List<java.lang.String> kmsKeyNames) {
115+
this.kmsKeyNames = kmsKeyNames;
116+
return this;
117+
}
118+
119+
@Override
120+
public InstanceEncryptionConfig set(String fieldName, Object value) {
121+
return (InstanceEncryptionConfig) super.set(fieldName, value);
122+
}
123+
124+
@Override
125+
public InstanceEncryptionConfig clone() {
126+
return (InstanceEncryptionConfig) super.clone();
127+
}
128+
129+
}

clients/google-api-services-spanner/v1/2.0.0/com/google/api/services/spanner/v1/model/MoveInstanceRequest.java

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,19 @@ public final class MoveInstanceRequest extends com.google.api.client.json.Generi
3737
@com.google.api.client.util.Key
3838
private java.lang.String targetConfig;
3939

40+
/**
41+
* Optional. The configuration for each database in the target instance configuration.
42+
* The value may be {@code null}.
43+
*/
44+
@com.google.api.client.util.Key
45+
private java.util.List<DatabaseMoveConfig> targetDatabaseMoveConfigs;
46+
47+
static {
48+
// hack to force ProGuard to consider DatabaseMoveConfig used, since otherwise it would be stripped out
49+
// see https://github.com/google/google-api-java-client/issues/543
50+
com.google.api.client.util.Data.nullOf(DatabaseMoveConfig.class);
51+
}
52+
4053
/**
4154
* Required. The target instance configuration where to move the instance. Values are of the form
4255
* `projects//instanceConfigs/`.
@@ -56,6 +69,23 @@ public MoveInstanceRequest setTargetConfig(java.lang.String targetConfig) {
5669
return this;
5770
}
5871

72+
/**
73+
* Optional. The configuration for each database in the target instance configuration.
74+
* @return value or {@code null} for none
75+
*/
76+
public java.util.List<DatabaseMoveConfig> getTargetDatabaseMoveConfigs() {
77+
return targetDatabaseMoveConfigs;
78+
}
79+
80+
/**
81+
* Optional. The configuration for each database in the target instance configuration.
82+
* @param targetDatabaseMoveConfigs targetDatabaseMoveConfigs or {@code null} for none
83+
*/
84+
public MoveInstanceRequest setTargetDatabaseMoveConfigs(java.util.List<DatabaseMoveConfig> targetDatabaseMoveConfigs) {
85+
this.targetDatabaseMoveConfigs = targetDatabaseMoveConfigs;
86+
return this;
87+
}
88+
5989
@Override
6090
public MoveInstanceRequest set(String fieldName, Object value) {
6191
return (MoveInstanceRequest) super.set(fieldName, value);

0 commit comments

Comments
 (0)