Skip to content

Commit 6159d7e

Browse files
gcf-owl-bot[bot]gauravpurohit06
gcf-owl-bot[bot]
and
gauravpurohit06
authored
fix: Correcting the proto field Id for field data_boost_enabled (googleapis#2328)
* fix: Add service_yaml_parameters to `java_gapic_library` targets PiperOrigin-RevId: 515423972 Source-Link: googleapis/googleapis@b5b4571 Source-Link: https://github.com/googleapis/googleapis-gen/commit/806347af5bd3f5d1e9c6d85ccf489d5dbc5ef667 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiODA2MzQ3YWY1YmQzZjVkMWU5YzZkODVjY2Y0ODlkNWRiYzVlZjY2NyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore(deps): Update gapic-generator-java to 2.15.3 PiperOrigin-RevId: 516900470 Source-Link: googleapis/googleapis@42ba7e6 Source-Link: https://github.com/googleapis/googleapis-gen/commit/21abfad42a1f2edae64130bbf897283221cd66d7 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjFhYmZhZDQyYTFmMmVkYWU2NDEzMGJiZjg5NzI4MzIyMWNkNjZkNyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix!: Correcting the proto field Id for field data_boost_enabled PiperOrigin-RevId: 517156905 Source-Link: googleapis/googleapis@f30cd5e Source-Link: https://github.com/googleapis/googleapis-gen/commit/6a3b040daef7db3fc3b879ad08f5480aa037818a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNmEzYjA0MGRhZWY3ZGIzZmMzYjg3OWFkMDhmNTQ4MGFhMDM3ODE4YSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: gauravpurohit <gauravpurohit@google.com>
1 parent 5eac2be commit 6159d7e

File tree

10 files changed

+167
-40
lines changed

10 files changed

+167
-40
lines changed

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/HttpJsonDatabaseAdminStub.java‎

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import static com.google.cloud.spanner.admin.database.v1.DatabaseAdminClient.ListDatabaseRolesPagedResponse;
2323
import static com.google.cloud.spanner.admin.database.v1.DatabaseAdminClient.ListDatabasesPagedResponse;
2424

25+
import com.google.api.HttpRule;
2526
import com.google.api.core.BetaApi;
2627
import com.google.api.core.InternalApi;
2728
import com.google.api.gax.core.BackgroundResource;
@@ -37,6 +38,7 @@
3738
import com.google.api.gax.rpc.ClientContext;
3839
import com.google.api.gax.rpc.OperationCallable;
3940
import com.google.api.gax.rpc.UnaryCallable;
41+
import com.google.common.collect.ImmutableMap;
4042
import com.google.iam.v1.GetIamPolicyRequest;
4143
import com.google.iam.v1.Policy;
4244
import com.google.iam.v1.SetIamPolicyRequest;
@@ -909,7 +911,84 @@ protected HttpJsonDatabaseAdminStub(
909911
throws IOException {
910912
this.callableFactory = callableFactory;
911913
this.httpJsonOperationsStub =
912-
HttpJsonOperationsStub.create(clientContext, callableFactory, typeRegistry);
914+
HttpJsonOperationsStub.create(
915+
clientContext,
916+
callableFactory,
917+
typeRegistry,
918+
ImmutableMap.<String, HttpRule>builder()
919+
.put(
920+
"google.longrunning.Operations.CancelOperation",
921+
HttpRule.newBuilder()
922+
.setPost(
923+
"/v1/{name=projects/*/instances/*/databases/*/operations/*}:cancel")
924+
.addAdditionalBindings(
925+
HttpRule.newBuilder()
926+
.setPost("/v1/{name=projects/*/instances/*/operations/*}:cancel")
927+
.build())
928+
.addAdditionalBindings(
929+
HttpRule.newBuilder()
930+
.setPost(
931+
"/v1/{name=projects/*/instances/*/backups/*/operations/*}:cancel")
932+
.build())
933+
.addAdditionalBindings(
934+
HttpRule.newBuilder()
935+
.setPost(
936+
"/v1/{name=projects/*/instanceConfigs/*/operations/*}:cancel")
937+
.build())
938+
.build())
939+
.put(
940+
"google.longrunning.Operations.DeleteOperation",
941+
HttpRule.newBuilder()
942+
.setDelete("/v1/{name=projects/*/instances/*/databases/*/operations/*}")
943+
.addAdditionalBindings(
944+
HttpRule.newBuilder()
945+
.setDelete("/v1/{name=projects/*/instances/*/operations/*}")
946+
.build())
947+
.addAdditionalBindings(
948+
HttpRule.newBuilder()
949+
.setDelete(
950+
"/v1/{name=projects/*/instances/*/backups/*/operations/*}")
951+
.build())
952+
.addAdditionalBindings(
953+
HttpRule.newBuilder()
954+
.setDelete("/v1/{name=projects/*/instanceConfigs/*/operations/*}")
955+
.build())
956+
.build())
957+
.put(
958+
"google.longrunning.Operations.GetOperation",
959+
HttpRule.newBuilder()
960+
.setGet("/v1/{name=projects/*/instances/*/databases/*/operations/*}")
961+
.addAdditionalBindings(
962+
HttpRule.newBuilder()
963+
.setGet("/v1/{name=projects/*/instances/*/operations/*}")
964+
.build())
965+
.addAdditionalBindings(
966+
HttpRule.newBuilder()
967+
.setGet("/v1/{name=projects/*/instances/*/backups/*/operations/*}")
968+
.build())
969+
.addAdditionalBindings(
970+
HttpRule.newBuilder()
971+
.setGet("/v1/{name=projects/*/instanceConfigs/*/operations/*}")
972+
.build())
973+
.build())
974+
.put(
975+
"google.longrunning.Operations.ListOperations",
976+
HttpRule.newBuilder()
977+
.setGet("/v1/{name=projects/*/instances/*/databases/*/operations}")
978+
.addAdditionalBindings(
979+
HttpRule.newBuilder()
980+
.setGet("/v1/{name=projects/*/instances/*/operations}")
981+
.build())
982+
.addAdditionalBindings(
983+
HttpRule.newBuilder()
984+
.setGet("/v1/{name=projects/*/instances/*/backups/*/operations}")
985+
.build())
986+
.addAdditionalBindings(
987+
HttpRule.newBuilder()
988+
.setGet("/v1/{name=projects/*/instanceConfigs/*/operations}")
989+
.build())
990+
.build())
991+
.build());
913992

914993
HttpJsonCallSettings<ListDatabasesRequest, ListDatabasesResponse>
915994
listDatabasesTransportSettings =

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/package-info.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
/**
18-
* The interfaces provided are listed below, along with usage samples.
18+
* A client to Cloud Spanner Instance Admin API
19+
*
20+
* <p>The interfaces provided are listed below, along with usage samples.
1921
*
2022
* <p>======================= InstanceAdminClient =======================
2123
*

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/HttpJsonInstanceAdminStub.java‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.google.cloud.spanner.admin.instance.v1.InstanceAdminClient.ListInstanceConfigsPagedResponse;
2121
import static com.google.cloud.spanner.admin.instance.v1.InstanceAdminClient.ListInstancesPagedResponse;
2222

23+
import com.google.api.HttpRule;
2324
import com.google.api.core.BetaApi;
2425
import com.google.api.core.InternalApi;
2526
import com.google.api.gax.core.BackgroundResource;
@@ -35,6 +36,7 @@
3536
import com.google.api.gax.rpc.ClientContext;
3637
import com.google.api.gax.rpc.OperationCallable;
3738
import com.google.api.gax.rpc.UnaryCallable;
39+
import com.google.common.collect.ImmutableMap;
3840
import com.google.iam.v1.GetIamPolicyRequest;
3941
import com.google.iam.v1.Policy;
4042
import com.google.iam.v1.SetIamPolicyRequest;
@@ -703,7 +705,49 @@ protected HttpJsonInstanceAdminStub(
703705
throws IOException {
704706
this.callableFactory = callableFactory;
705707
this.httpJsonOperationsStub =
706-
HttpJsonOperationsStub.create(clientContext, callableFactory, typeRegistry);
708+
HttpJsonOperationsStub.create(
709+
clientContext,
710+
callableFactory,
711+
typeRegistry,
712+
ImmutableMap.<String, HttpRule>builder()
713+
.put(
714+
"google.longrunning.Operations.CancelOperation",
715+
HttpRule.newBuilder()
716+
.setPost(
717+
"/v1/{name=projects/*/instances/*/databases/*/operations/*}:cancel")
718+
.addAdditionalBindings(
719+
HttpRule.newBuilder()
720+
.setPost("/v1/{name=projects/*/instances/*/operations/*}:cancel")
721+
.build())
722+
.build())
723+
.put(
724+
"google.longrunning.Operations.DeleteOperation",
725+
HttpRule.newBuilder()
726+
.setDelete("/v1/{name=projects/*/instances/*/databases/*/operations/*}")
727+
.addAdditionalBindings(
728+
HttpRule.newBuilder()
729+
.setDelete("/v1/{name=projects/*/instances/*/operations/*}")
730+
.build())
731+
.build())
732+
.put(
733+
"google.longrunning.Operations.GetOperation",
734+
HttpRule.newBuilder()
735+
.setGet("/v1/{name=projects/*/instances/*/databases/*/operations/*}")
736+
.addAdditionalBindings(
737+
HttpRule.newBuilder()
738+
.setGet("/v1/{name=projects/*/instances/*/operations/*}")
739+
.build())
740+
.build())
741+
.put(
742+
"google.longrunning.Operations.ListOperations",
743+
HttpRule.newBuilder()
744+
.setGet("/v1/{name=projects/*/instances/*/databases/*/operations}")
745+
.addAdditionalBindings(
746+
HttpRule.newBuilder()
747+
.setGet("/v1/{name=projects/*/instances/*/operations}")
748+
.build())
749+
.build())
750+
.build());
707751

708752
HttpJsonCallSettings<ListInstanceConfigsRequest, ListInstanceConfigsResponse>
709753
listInstanceConfigsTransportSettings =

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/package-info.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
*/
1616

1717
/**
18-
* The interfaces provided are listed below, along with usage samples.
18+
* A client to Cloud Spanner API
19+
*
20+
* <p>The interfaces provided are listed below, along with usage samples.
1921
*
2022
* <p>======================= SpannerClient =======================
2123
*

‎proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,19 +1972,19 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
19721972
: requestOptions_;
19731973
}
19741974

1975-
public static final int DATA_BOOST_ENABLED_FIELD_NUMBER = 15;
1975+
public static final int DATA_BOOST_ENABLED_FIELD_NUMBER = 16;
19761976
private boolean dataBoostEnabled_ = false;
19771977
/**
19781978
*
19791979
*
19801980
* <pre>
1981-
* If this is for a partitioned read and this field is set to `true`, the
1981+
* If this is for a partitioned query and this field is set to `true`, the
19821982
* request will be executed via Spanner independent compute resources.
19831983
* If the field is set to `true` but the request does not set
19841984
* `partition_token`, the API will return an `INVALID_ARGUMENT` error.
19851985
* </pre>
19861986
*
1987-
* <code>bool data_boost_enabled = 15;</code>
1987+
* <code>bool data_boost_enabled = 16;</code>
19881988
*
19891989
* @return The dataBoostEnabled.
19901990
*/
@@ -2040,7 +2040,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
20402040
output.writeMessage(11, getRequestOptions());
20412041
}
20422042
if (dataBoostEnabled_ != false) {
2043-
output.writeBool(15, dataBoostEnabled_);
2043+
output.writeBool(16, dataBoostEnabled_);
20442044
}
20452045
getUnknownFields().writeTo(output);
20462046
}
@@ -2092,7 +2092,7 @@ public int getSerializedSize() {
20922092
size += com.google.protobuf.CodedOutputStream.computeMessageSize(11, getRequestOptions());
20932093
}
20942094
if (dataBoostEnabled_ != false) {
2095-
size += com.google.protobuf.CodedOutputStream.computeBoolSize(15, dataBoostEnabled_);
2095+
size += com.google.protobuf.CodedOutputStream.computeBoolSize(16, dataBoostEnabled_);
20962096
}
20972097
size += getUnknownFields().getSerializedSize();
20982098
memoizedSize = size;
@@ -2627,12 +2627,12 @@ public Builder mergeFrom(
26272627
bitField0_ |= 0x00000400;
26282628
break;
26292629
} // case 90
2630-
case 120:
2630+
case 128:
26312631
{
26322632
dataBoostEnabled_ = input.readBool();
26332633
bitField0_ |= 0x00000800;
26342634
break;
2635-
} // case 120
2635+
} // case 128
26362636
default:
26372637
{
26382638
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -4258,13 +4258,13 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
42584258
*
42594259
*
42604260
* <pre>
4261-
* If this is for a partitioned read and this field is set to `true`, the
4261+
* If this is for a partitioned query and this field is set to `true`, the
42624262
* request will be executed via Spanner independent compute resources.
42634263
* If the field is set to `true` but the request does not set
42644264
* `partition_token`, the API will return an `INVALID_ARGUMENT` error.
42654265
* </pre>
42664266
*
4267-
* <code>bool data_boost_enabled = 15;</code>
4267+
* <code>bool data_boost_enabled = 16;</code>
42684268
*
42694269
* @return The dataBoostEnabled.
42704270
*/
@@ -4276,13 +4276,13 @@ public boolean getDataBoostEnabled() {
42764276
*
42774277
*
42784278
* <pre>
4279-
* If this is for a partitioned read and this field is set to `true`, the
4279+
* If this is for a partitioned query and this field is set to `true`, the
42804280
* request will be executed via Spanner independent compute resources.
42814281
* If the field is set to `true` but the request does not set
42824282
* `partition_token`, the API will return an `INVALID_ARGUMENT` error.
42834283
* </pre>
42844284
*
4285-
* <code>bool data_boost_enabled = 15;</code>
4285+
* <code>bool data_boost_enabled = 16;</code>
42864286
*
42874287
* @param value The dataBoostEnabled to set.
42884288
* @return This builder for chaining.
@@ -4298,13 +4298,13 @@ public Builder setDataBoostEnabled(boolean value) {
42984298
*
42994299
*
43004300
* <pre>
4301-
* If this is for a partitioned read and this field is set to `true`, the
4301+
* If this is for a partitioned query and this field is set to `true`, the
43024302
* request will be executed via Spanner independent compute resources.
43034303
* If the field is set to `true` but the request does not set
43044304
* `partition_token`, the API will return an `INVALID_ARGUMENT` error.
43054305
* </pre>
43064306
*
4307-
* <code>bool data_boost_enabled = 15;</code>
4307+
* <code>bool data_boost_enabled = 16;</code>
43084308
*
43094309
* @return This builder for chaining.
43104310
*/

‎proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequestOrBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,13 +434,13 @@ com.google.spanner.v1.Type getParamTypesOrDefault(
434434
*
435435
*
436436
* <pre>
437-
* If this is for a partitioned read and this field is set to `true`, the
437+
* If this is for a partitioned query and this field is set to `true`, the
438438
* request will be executed via Spanner independent compute resources.
439439
* If the field is set to `true` but the request does not set
440440
* `partition_token`, the API will return an `INVALID_ARGUMENT` error.
441441
* </pre>
442442
*
443-
* <code>bool data_boost_enabled = 15;</code>
443+
* <code>bool data_boost_enabled = 16;</code>
444444
*
445445
* @return The dataBoostEnabled.
446446
*/

0 commit comments

Comments
 (0)