Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

deps: bump com.google.cloud:libraries-bom from 26.27.0 to 26.28.0 #2414

Merged
merged 4 commits into from
Dec 11, 2023
Merged

deps: bump com.google.cloud:libraries-bom from 26.27.0 to 26.28.0 #2414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7912b71
deps: bump com.google.cloud:libraries-bom from 26.27.0 to 26.28.0
dependabot[bot] Dec 8, 2023
2025776
chore: update starter modules in spring-cloud-previews
cloud-java-bot Dec 8, 2023
3d4a00a
empty commit
mpeddada1 Dec 8, 2023
26cab4a
Merge branch 'main' of github.com:GoogleCloudPlatform/spring-cloud-gc…
mpeddada1 Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-cloud-gcp-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</distributionManagement>

<properties>
<gcp-libraries-bom.version>26.27.0</gcp-libraries-bom.version>
<gcp-libraries-bom.version>26.28.0</gcp-libraries-bom.version>
<cloud-sql-socket-factory.version>1.14.1</cloud-sql-socket-factory.version>
<r2dbc-postgres-driver.version>1.0.2.RELEASE</r2dbc-postgres-driver.version>
<cloud-spanner-r2dbc.version>1.3.0</cloud-spanner-r2dbc.version>
Expand Down
174 changes: 87 additions & 87 deletions spring-cloud-previews/README.md
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions ...ain/java/com/google/cloud/aiplatform/v1/spring/DatasetServiceSpringAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,20 @@ public DatasetServiceSettings datasetServiceSettings(
clientSettingsBuilder.listDatasetsSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.listDatasetsSettings().setRetrySettings(listDatasetsRetrySettings);

RetrySettings getDatasetVersionRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getDatasetVersionSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder
.getDatasetVersionSettings()
.setRetrySettings(getDatasetVersionRetrySettings);

RetrySettings listDatasetVersionsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listDatasetVersionsSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder
.listDatasetVersionsSettings()
.setRetrySettings(listDatasetVersionsRetrySettings);

RetrySettings listDataItemsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listDataItemsSettings().getRetrySettings(), serviceRetry);
Expand Down Expand Up @@ -257,6 +271,34 @@ public DatasetServiceSettings datasetServiceSettings(
LOGGER.trace("Configured method-level retry settings for listDatasets from properties.");
}
}
Retry getDatasetVersionRetry = clientProperties.getGetDatasetVersionRetry();
if (getDatasetVersionRetry != null) {
RetrySettings getDatasetVersionRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getDatasetVersionSettings().getRetrySettings(),
getDatasetVersionRetry);
clientSettingsBuilder
.getDatasetVersionSettings()
.setRetrySettings(getDatasetVersionRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(
"Configured method-level retry settings for getDatasetVersion from properties.");
}
}
Retry listDatasetVersionsRetry = clientProperties.getListDatasetVersionsRetry();
if (listDatasetVersionsRetry != null) {
RetrySettings listDatasetVersionsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listDatasetVersionsSettings().getRetrySettings(),
listDatasetVersionsRetry);
clientSettingsBuilder
.listDatasetVersionsSettings()
.setRetrySettings(listDatasetVersionsRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(
"Configured method-level retry settings for listDatasetVersions from properties.");
}
}
Retry listDataItemsRetry = clientProperties.getListDataItemsRetry();
if (listDataItemsRetry != null) {
RetrySettings listDataItemsRetrySettings =
Expand Down
26 changes: 26 additions & 0 deletions ...r/src/main/java/com/google/cloud/aiplatform/v1/spring/DatasetServiceSpringProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ public class DatasetServiceSpringProperties implements CredentialsSupplier {
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry listDatasetsRetry;
/**
* Allow override of retry settings at method-level for getDatasetVersion. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getDatasetVersionRetry;
/**
* Allow override of retry settings at method-level for listDatasetVersions. If defined, this
* takes precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry listDatasetVersionsRetry;
/**
* Allow override of retry settings at method-level for listDataItems. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
Expand Down Expand Up @@ -159,6 +169,22 @@ public void setListDatasetsRetry(Retry listDatasetsRetry) {
this.listDatasetsRetry = listDatasetsRetry;
}

public Retry getGetDatasetVersionRetry() {
return this.getDatasetVersionRetry;
}

public void setGetDatasetVersionRetry(Retry getDatasetVersionRetry) {
this.getDatasetVersionRetry = getDatasetVersionRetry;
}

public Retry getListDatasetVersionsRetry() {
return this.listDatasetVersionsRetry;
}

public void setListDatasetVersionsRetry(Retry listDatasetVersionsRetry) {
this.listDatasetVersionsRetry = listDatasetVersionsRetry;
}

public Retry getListDataItemsRetry() {
return this.listDataItemsRetry;
}
Expand Down