Skip to content

Commit 738c6b6

Browse files
fix: manual bring back config for shopping-merchant-notifications (#11714)
Bring back the configuration for v1beta from [original commit](https://github.com/googleapis/google-cloud-java/pull/10748/files#diff-70450badb57c93e27292190b5470ead474f3b2071e682e3d8274ec45e9510410). It was accidentally deleted. --------- Co-authored-by: cloud-java-bot <[email protected]>
1 parent 456914c commit 738c6b6

File tree

68 files changed

+451
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+451
-211
lines changed

generation_config.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2282,7 +2282,21 @@ libraries:
22822282
GAPICs:
22832283
- proto_path: google/shopping/merchant/inventories/v1
22842284
- proto_path: google/shopping/merchant/inventories/v1beta
2285-
2285+
- api_shortname: shopping-merchant-notifications
2286+
name_pretty: Merchant Notifications API
2287+
product_documentation: https://developers.google.com/merchant/api
2288+
api_description: Programmatically manage your Merchant Center accounts.
2289+
client_documentation:
2290+
https://cloud.google.com/java/docs/reference/google-shopping-merchant-notifications/latest/overview
2291+
release_level: preview
2292+
distribution_name: com.google.shopping:google-shopping-merchant-notifications
2293+
api_id: shopping-merchant-notifications.googleapis.com
2294+
library_type: GAPIC_AUTO
2295+
group_id: com.google.shopping
2296+
cloud_api: false
2297+
GAPICs:
2298+
- proto_path: google/shopping/merchant/notifications/v1beta
2299+
requires_billing: true
22862300
- api_shortname: shopping-merchant-lfp
22872301
name_pretty: Merchant LFP API
22882302
product_documentation: https://developers.google.com/merchant/api

java-shopping-merchant-notifications/README.md

Lines changed: 3 additions & 4 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.38.0</version>
26+
<version>26.65.0</version>
2727
<type>pom</type>
2828
<scope>import</scope>
2929
</dependency>
@@ -35,11 +35,11 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
3535
<groupId>com.google.shopping</groupId>
3636
<artifactId>google-shopping-merchant-notifications</artifactId>
3737
</dependency>
38+
</dependencies>
3839
```
3940

4041
If you are using Maven without the BOM, add this to your dependencies:
4142

42-
<!-- {x-version-update-start:google-shopping-merchant-notifications:released} -->
4343

4444
```xml
4545
<dependency>
@@ -60,7 +60,6 @@ If you are using SBT, add this to your dependencies:
6060
```Scala
6161
libraryDependencies += "com.google.shopping" % "google-shopping-merchant-notifications" % "0.29.0"
6262
```
63-
<!-- {x-version-update-end} -->
6463

6564
## Authentication
6665

@@ -201,7 +200,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
201200
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
202201
[stability-image]: https://img.shields.io/badge/stability-preview-yellow
203202
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.shopping/google-shopping-merchant-notifications.svg
204-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.shopping/google-shopping-merchant-notifications/0.0.0
203+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.shopping/google-shopping-merchant-notifications/0.29.0
205204
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
206205
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
207206
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

java-shopping-merchant-notifications/google-shopping-merchant-notifications/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<dependency>
6565
<groupId>com.google.api.grpc</groupId>
6666
<artifactId>grpc-google-common-protos</artifactId>
67+
<scope>test</scope>
6768
</dependency>
6869
<dependency>
6970
<groupId>com.google.api.grpc</groupId>
@@ -72,6 +73,7 @@
7273
<dependency>
7374
<groupId>com.google.api.grpc</groupId>
7475
<artifactId>grpc-google-iam-v1</artifactId>
76+
<scope>test</scope>
7577
</dependency>
7678
<dependency>
7779
<groupId>org.threeten</groupId>

java-shopping-merchant-notifications/google-shopping-merchant-notifications/src/main/java/com/google/shopping/merchant/notifications/v1beta/NotificationsApiServiceClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 Google LLC
2+
* Copyright 2025 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

java-shopping-merchant-notifications/google-shopping-merchant-notifications/src/main/java/com/google/shopping/merchant/notifications/v1beta/NotificationsApiServiceSettings.java

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 Google LLC
2+
* Copyright 2025 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -51,7 +51,9 @@
5151
* <p>The builder of this class is recursive, so contained classes are themselves builders. When
5252
* build() is called, the tree of builders is called to create the complete settings object.
5353
*
54-
* <p>For example, to set the total timeout of getNotificationSubscription to 30 seconds:
54+
* <p>For example, to set the
55+
* [RetrySettings](https://cloud.google.com/java/docs/reference/gax/latest/com.google.api.gax.retrying.RetrySettings)
56+
* of getNotificationSubscription:
5557
*
5658
* <pre>{@code
5759
* // This snippet has been automatically generated and should be regarded as a code template only.
@@ -68,11 +70,22 @@
6870
* .getNotificationSubscriptionSettings()
6971
* .getRetrySettings()
7072
* .toBuilder()
71-
* .setTotalTimeout(Duration.ofSeconds(30))
73+
* .setInitialRetryDelayDuration(Duration.ofSeconds(1))
74+
* .setInitialRpcTimeoutDuration(Duration.ofSeconds(5))
75+
* .setMaxAttempts(5)
76+
* .setMaxRetryDelayDuration(Duration.ofSeconds(30))
77+
* .setMaxRpcTimeoutDuration(Duration.ofSeconds(60))
78+
* .setRetryDelayMultiplier(1.3)
79+
* .setRpcTimeoutMultiplier(1.5)
80+
* .setTotalTimeoutDuration(Duration.ofSeconds(300))
7281
* .build());
7382
* NotificationsApiServiceSettings notificationsApiServiceSettings =
7483
* notificationsApiServiceSettingsBuilder.build();
7584
* }</pre>
85+
*
86+
* Please refer to the [Client Side Retry
87+
* Guide](https://github.com/googleapis/google-cloud-java/blob/main/docs/client_retries.md) for
88+
* additional support in setting retries.
7689
*/
7790
@BetaApi
7891
@Generated("by gapic-generator-java")

java-shopping-merchant-notifications/google-shopping-merchant-notifications/src/main/java/com/google/shopping/merchant/notifications/v1beta/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 Google LLC
2+
* Copyright 2025 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

java-shopping-merchant-notifications/google-shopping-merchant-notifications/src/main/java/com/google/shopping/merchant/notifications/v1beta/stub/GrpcNotificationsApiServiceCallableFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 Google LLC
2+
* Copyright 2025 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

java-shopping-merchant-notifications/google-shopping-merchant-notifications/src/main/java/com/google/shopping/merchant/notifications/v1beta/stub/GrpcNotificationsApiServiceStub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 Google LLC
2+
* Copyright 2025 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

java-shopping-merchant-notifications/google-shopping-merchant-notifications/src/main/java/com/google/shopping/merchant/notifications/v1beta/stub/HttpJsonNotificationsApiServiceCallableFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 Google LLC
2+
* Copyright 2025 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

java-shopping-merchant-notifications/google-shopping-merchant-notifications/src/main/java/com/google/shopping/merchant/notifications/v1beta/stub/HttpJsonNotificationsApiServiceStub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 Google LLC
2+
* Copyright 2025 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)