Skip to content

Commit 491c157

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: [cloudcommerceconsumerprocurement] permit duplicate display names (#9615)
* feat: permit duplicate display names feat: include a gRPC retry policy chore: update proto comments PiperOrigin-RevId: 545774653 Source-Link: googleapis/googleapis@507145d Source-Link: https://github.com/googleapis/googleapis-gen/commit/39f1ae267c4a3cd3a0cf5d25d7cdfc865aa7b02d Copy-Tag: eyJwIjoiamF2YS1jbG91ZGNvbW1lcmNlY29uc3VtZXJwcm9jdXJlbWVudC8uT3dsQm90LnlhbWwiLCJoIjoiMzlmMWFlMjY3YzRhM2NkM2EwY2Y1ZDI1ZDdjZGZjODY1YWE3YjAyZCJ9 * 🦉 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>
1 parent 9cb69a8 commit 491c157

File tree

24 files changed

+610
-376
lines changed

24 files changed

+610
-376
lines changed

‎java-cloudcommerceconsumerprocurement/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
2323
<dependency>
2424
<groupId>com.google.cloud</groupId>
2525
<artifactId>libraries-bom</artifactId>
26-
<version>26.16.0</version>
26+
<version>26.18.0</version>
2727
<type>pom</type>
2828
<scope>import</scope>
2929
</dependency>
@@ -201,7 +201,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
201201
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
202202
[stability-image]: https://img.shields.io/badge/stability-preview-yellow
203203
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-cloudcommerceconsumerprocurement.svg
204-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-cloudcommerceconsumerprocurement/0.17.0
204+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-cloudcommerceconsumerprocurement/0.18.0
205205
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
206206
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
207207
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎java-cloudcommerceconsumerprocurement/google-cloud-cloudcommerceconsumerprocurement/src/main/java/com/google/cloud/commerce/consumer/procurement/v1alpha1/ConsumerProcurementServiceClient.java

Lines changed: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
5959
* try (ConsumerProcurementServiceClient consumerProcurementServiceClient =
6060
* ConsumerProcurementServiceClient.create()) {
61-
* GetOrderRequest request = GetOrderRequest.newBuilder().setName("name3373707").build();
62-
* Order response = consumerProcurementServiceClient.getOrder(request);
61+
* String name = "name3373707";
62+
* Order response = consumerProcurementServiceClient.getOrder(name);
6363
* }
6464
* }</pre>
6565
*
@@ -219,6 +219,9 @@ public final OperationsClient getHttpJsonOperationsClient() {
219219
/**
220220
* Creates a new [Order][google.cloud.commerce.consumer.procurement.v1alpha1.Order].
221221
*
222+
* <p>This API only supports GCP spend-based committed use discounts specified by GCP
223+
* documentation.
224+
*
222225
* <p>The returned long-running operation is in-progress until the backend completes the creation
223226
* of the resource. Once completed, the order is in
224227
* [OrderState.ORDER_STATE_ACTIVE][google.cloud.commerce.consumer.procurement.v1alpha1.OrderState.ORDER_STATE_ACTIVE].
@@ -257,6 +260,9 @@ public final OperationFuture<Order, PlaceOrderMetadata> placeOrderAsync(
257260
/**
258261
* Creates a new [Order][google.cloud.commerce.consumer.procurement.v1alpha1.Order].
259262
*
263+
* <p>This API only supports GCP spend-based committed use discounts specified by GCP
264+
* documentation.
265+
*
260266
* <p>The returned long-running operation is in-progress until the backend completes the creation
261267
* of the resource. Once completed, the order is in
262268
* [OrderState.ORDER_STATE_ACTIVE][google.cloud.commerce.consumer.procurement.v1alpha1.OrderState.ORDER_STATE_ACTIVE].
@@ -295,6 +301,9 @@ public final OperationFuture<Order, PlaceOrderMetadata> placeOrderAsync(
295301
/**
296302
* Creates a new [Order][google.cloud.commerce.consumer.procurement.v1alpha1.Order].
297303
*
304+
* <p>This API only supports GCP spend-based committed use discounts specified by GCP
305+
* documentation.
306+
*
298307
* <p>The returned long-running operation is in-progress until the backend completes the creation
299308
* of the resource. Once completed, the order is in
300309
* [OrderState.ORDER_STATE_ACTIVE][google.cloud.commerce.consumer.procurement.v1alpha1.OrderState.ORDER_STATE_ACTIVE].
@@ -328,6 +337,34 @@ public final UnaryCallable<PlaceOrderRequest, Operation> placeOrderCallable() {
328337
return stub.placeOrderCallable();
329338
}
330339

340+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
341+
/**
342+
* Returns the requested [Order][google.cloud.commerce.consumer.procurement.v1alpha1.Order]
343+
* resource.
344+
*
345+
* <p>Sample code:
346+
*
347+
* <pre>{@code
348+
* // This snippet has been automatically generated and should be regarded as a code template only.
349+
* // It will require modifications to work:
350+
* // - It may require correct/in-range values for request initialization.
351+
* // - It may require specifying regional endpoints when creating the service client as shown in
352+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
353+
* try (ConsumerProcurementServiceClient consumerProcurementServiceClient =
354+
* ConsumerProcurementServiceClient.create()) {
355+
* String name = "name3373707";
356+
* Order response = consumerProcurementServiceClient.getOrder(name);
357+
* }
358+
* }</pre>
359+
*
360+
* @param name Required. The name of the order to retrieve.
361+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
362+
*/
363+
public final Order getOrder(String name) {
364+
GetOrderRequest request = GetOrderRequest.newBuilder().setName(name).build();
365+
return getOrder(request);
366+
}
367+
331368
// AUTO-GENERATED DOCUMENTATION AND METHOD.
332369
/**
333370
* Returns the requested [Order][google.cloud.commerce.consumer.procurement.v1alpha1.Order]
@@ -382,6 +419,37 @@ public final UnaryCallable<GetOrderRequest, Order> getOrderCallable() {
382419
return stub.getOrderCallable();
383420
}
384421

422+
// AUTO-GENERATED DOCUMENTATION AND METHOD.
423+
/**
424+
* Lists [Order][google.cloud.commerce.consumer.procurement.v1alpha1.Order] resources that the
425+
* user has access to, within the scope of the parent resource.
426+
*
427+
* <p>Sample code:
428+
*
429+
* <pre>{@code
430+
* // This snippet has been automatically generated and should be regarded as a code template only.
431+
* // It will require modifications to work:
432+
* // - It may require correct/in-range values for request initialization.
433+
* // - It may require specifying regional endpoints when creating the service client as shown in
434+
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
435+
* try (ConsumerProcurementServiceClient consumerProcurementServiceClient =
436+
* ConsumerProcurementServiceClient.create()) {
437+
* String parent = "parent-995424086";
438+
* for (Order element : consumerProcurementServiceClient.listOrders(parent).iterateAll()) {
439+
* // doThingsWith(element);
440+
* }
441+
* }
442+
* }</pre>
443+
*
444+
* @param parent Required. The parent resource to query for orders. This field has the form
445+
* `billingAccounts/{billing-account-id}`.
446+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
447+
*/
448+
public final ListOrdersPagedResponse listOrders(String parent) {
449+
ListOrdersRequest request = ListOrdersRequest.newBuilder().setParent(parent).build();
450+
return listOrders(request);
451+
}
452+
385453
// AUTO-GENERATED DOCUMENTATION AND METHOD.
386454
/**
387455
* Lists [Order][google.cloud.commerce.consumer.procurement.v1alpha1.Order] resources that the

‎java-cloudcommerceconsumerprocurement/google-cloud-cloudcommerceconsumerprocurement/src/main/java/com/google/cloud/commerce/consumer/procurement/v1alpha1/gapic_metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"libraryClient": "ConsumerProcurementServiceClient",
1212
"rpcs": {
1313
"GetOrder": {
14-
"methods": ["getOrder", "getOrderCallable"]
14+
"methods": ["getOrder", "getOrder", "getOrderCallable"]
1515
},
1616
"ListOrders": {
17-
"methods": ["listOrders", "listOrdersPagedCallable", "listOrdersCallable"]
17+
"methods": ["listOrders", "listOrders", "listOrdersPagedCallable", "listOrdersCallable"]
1818
},
1919
"PlaceOrder": {
2020
"methods": ["placeOrderAsync", "placeOrderOperationCallable", "placeOrderCallable"]

‎java-cloudcommerceconsumerprocurement/google-cloud-cloudcommerceconsumerprocurement/src/main/java/com/google/cloud/commerce/consumer/procurement/v1alpha1/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
4040
* try (ConsumerProcurementServiceClient consumerProcurementServiceClient =
4141
* ConsumerProcurementServiceClient.create()) {
42-
* GetOrderRequest request = GetOrderRequest.newBuilder().setName("name3373707").build();
43-
* Order response = consumerProcurementServiceClient.getOrder(request);
42+
* String name = "name3373707";
43+
* Order response = consumerProcurementServiceClient.getOrder(name);
4444
* }
4545
* }</pre>
4646
*/

‎java-cloudcommerceconsumerprocurement/google-cloud-cloudcommerceconsumerprocurement/src/main/java/com/google/cloud/commerce/consumer/procurement/v1alpha1/stub/HttpJsonConsumerProcurementServiceStub.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@ protected HttpJsonConsumerProcurementServiceStub(
242242
"google.longrunning.Operations.GetOperation",
243243
HttpRule.newBuilder()
244244
.setGet("/v1alpha1/{name=billingAccounts/*/orders/*/operations/*}")
245+
.addAdditionalBindings(
246+
HttpRule.newBuilder()
247+
.setGet(
248+
"/v1alpha1/{name=billingAccounts/*/orders/*/orderAttributions/*/operations/*}")
249+
.build())
245250
.build())
246251
.build());
247252

‎java-cloudcommerceconsumerprocurement/google-cloud-cloudcommerceconsumerprocurement/src/test/java/com/google/cloud/commerce/consumer/procurement/v1alpha1/ConsumerProcurementServiceClientHttpJsonTest.java

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,9 @@ public void getOrderTest() throws Exception {
161161
.build();
162162
mockService.addResponse(expectedResponse);
163163

164-
GetOrderRequest request =
165-
GetOrderRequest.newBuilder()
166-
.setName("billingAccounts/billingAccount-9614/orders/order-9614")
167-
.build();
164+
String name = "billingAccounts/billingAccount-9614/orders/order-9614";
168165

169-
Order actualResponse = client.getOrder(request);
166+
Order actualResponse = client.getOrder(name);
170167
Assert.assertEquals(expectedResponse, actualResponse);
171168

172169
List<String> actualRequests = mockService.getRequestPaths();
@@ -192,11 +189,8 @@ public void getOrderExceptionTest() throws Exception {
192189
mockService.addException(exception);
193190

194191
try {
195-
GetOrderRequest request =
196-
GetOrderRequest.newBuilder()
197-
.setName("billingAccounts/billingAccount-9614/orders/order-9614")
198-
.build();
199-
client.getOrder(request);
192+
String name = "billingAccounts/billingAccount-9614/orders/order-9614";
193+
client.getOrder(name);
200194
Assert.fail("No exception raised");
201195
} catch (InvalidArgumentException e) {
202196
// Expected exception.
@@ -213,15 +207,9 @@ public void listOrdersTest() throws Exception {
213207
.build();
214208
mockService.addResponse(expectedResponse);
215209

216-
ListOrdersRequest request =
217-
ListOrdersRequest.newBuilder()
218-
.setParent("billingAccounts/billingAccount-7950")
219-
.setPageSize(883849137)
220-
.setPageToken("pageToken873572522")
221-
.setFilter("filter-1274492040")
222-
.build();
210+
String parent = "billingAccounts/billingAccount-7950";
223211

224-
ListOrdersPagedResponse pagedListResponse = client.listOrders(request);
212+
ListOrdersPagedResponse pagedListResponse = client.listOrders(parent);
225213

226214
List<Order> resources = Lists.newArrayList(pagedListResponse.iterateAll());
227215

@@ -251,14 +239,8 @@ public void listOrdersExceptionTest() throws Exception {
251239
mockService.addException(exception);
252240

253241
try {
254-
ListOrdersRequest request =
255-
ListOrdersRequest.newBuilder()
256-
.setParent("billingAccounts/billingAccount-7950")
257-
.setPageSize(883849137)
258-
.setPageToken("pageToken873572522")
259-
.setFilter("filter-1274492040")
260-
.build();
261-
client.listOrders(request);
242+
String parent = "billingAccounts/billingAccount-7950";
243+
client.listOrders(parent);
262244
Assert.fail("No exception raised");
263245
} catch (InvalidArgumentException e) {
264246
// Expected exception.

‎java-cloudcommerceconsumerprocurement/google-cloud-cloudcommerceconsumerprocurement/src/test/java/com/google/cloud/commerce/consumer/procurement/v1alpha1/ConsumerProcurementServiceClientTest.java

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -166,16 +166,16 @@ public void getOrderTest() throws Exception {
166166
.build();
167167
mockConsumerProcurementService.addResponse(expectedResponse);
168168

169-
GetOrderRequest request = GetOrderRequest.newBuilder().setName("name3373707").build();
169+
String name = "name3373707";
170170

171-
Order actualResponse = client.getOrder(request);
171+
Order actualResponse = client.getOrder(name);
172172
Assert.assertEquals(expectedResponse, actualResponse);
173173

174174
List<AbstractMessage> actualRequests = mockConsumerProcurementService.getRequests();
175175
Assert.assertEquals(1, actualRequests.size());
176176
GetOrderRequest actualRequest = ((GetOrderRequest) actualRequests.get(0));
177177

178-
Assert.assertEquals(request.getName(), actualRequest.getName());
178+
Assert.assertEquals(name, actualRequest.getName());
179179
Assert.assertTrue(
180180
channelProvider.isHeaderSent(
181181
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -188,8 +188,8 @@ public void getOrderExceptionTest() throws Exception {
188188
mockConsumerProcurementService.addException(exception);
189189

190190
try {
191-
GetOrderRequest request = GetOrderRequest.newBuilder().setName("name3373707").build();
192-
client.getOrder(request);
191+
String name = "name3373707";
192+
client.getOrder(name);
193193
Assert.fail("No exception raised");
194194
} catch (InvalidArgumentException e) {
195195
// Expected exception.
@@ -206,15 +206,9 @@ public void listOrdersTest() throws Exception {
206206
.build();
207207
mockConsumerProcurementService.addResponse(expectedResponse);
208208

209-
ListOrdersRequest request =
210-
ListOrdersRequest.newBuilder()
211-
.setParent("parent-995424086")
212-
.setPageSize(883849137)
213-
.setPageToken("pageToken873572522")
214-
.setFilter("filter-1274492040")
215-
.build();
209+
String parent = "parent-995424086";
216210

217-
ListOrdersPagedResponse pagedListResponse = client.listOrders(request);
211+
ListOrdersPagedResponse pagedListResponse = client.listOrders(parent);
218212

219213
List<Order> resources = Lists.newArrayList(pagedListResponse.iterateAll());
220214

@@ -225,10 +219,7 @@ public void listOrdersTest() throws Exception {
225219
Assert.assertEquals(1, actualRequests.size());
226220
ListOrdersRequest actualRequest = ((ListOrdersRequest) actualRequests.get(0));
227221

228-
Assert.assertEquals(request.getParent(), actualRequest.getParent());
229-
Assert.assertEquals(request.getPageSize(), actualRequest.getPageSize());
230-
Assert.assertEquals(request.getPageToken(), actualRequest.getPageToken());
231-
Assert.assertEquals(request.getFilter(), actualRequest.getFilter());
222+
Assert.assertEquals(parent, actualRequest.getParent());
232223
Assert.assertTrue(
233224
channelProvider.isHeaderSent(
234225
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -241,14 +232,8 @@ public void listOrdersExceptionTest() throws Exception {
241232
mockConsumerProcurementService.addException(exception);
242233

243234
try {
244-
ListOrdersRequest request =
245-
ListOrdersRequest.newBuilder()
246-
.setParent("parent-995424086")
247-
.setPageSize(883849137)
248-
.setPageToken("pageToken873572522")
249-
.setFilter("filter-1274492040")
250-
.build();
251-
client.listOrders(request);
235+
String parent = "parent-995424086";
236+
client.listOrders(parent);
252237
Assert.fail("No exception raised");
253238
} catch (InvalidArgumentException e) {
254239
// Expected exception.

0 commit comments

Comments
 (0)