Skip to content

Commit

Permalink
deps: bump libraries-bom from 26.11.0 to 26.12.0 (#1695)
Browse files Browse the repository at this point in the history
* deps: bump libraries-bom from 26.11.0 to 26.12.0

Bumps [libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.11.0 to 26.12.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/CHANGELOG.md)
- [Commits](googleapis/java-cloud-bom@v26.11.0...v26.12.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: update starter modules in spring-cloud-previews

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Cloud Java Bot <cloud-java-bot@google.com>
  • Loading branch information
dependabot[bot] and cloud-java-bot committed Apr 5, 2023
1 parent b51661f commit 4f5598c
Show file tree
Hide file tree
Showing 8 changed files with 318 additions and 88 deletions.
2 changes: 1 addition & 1 deletion spring-cloud-gcp-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</distributionManagement>

<properties>
<gcp-libraries-bom.version>26.11.0</gcp-libraries-bom.version>
<gcp-libraries-bom.version>26.12.0</gcp-libraries-bom.version>
<cloud-sql-socket-factory.version>1.11.0</cloud-sql-socket-factory.version>
<guava.version>31.1-jre</guava.version>
<r2dbc-postgres-driver.version>1.0.1.RELEASE</r2dbc-postgres-driver.version>
Expand Down
174 changes: 87 additions & 87 deletions spring-cloud-previews/README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,16 @@ public CloudDeploySettings cloudDeploySettings(
clientSettingsBuilder.approveRolloutSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.approveRolloutSettings().setRetrySettings(approveRolloutRetrySettings);

RetrySettings advanceRolloutRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.advanceRolloutSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.advanceRolloutSettings().setRetrySettings(advanceRolloutRetrySettings);

RetrySettings cancelRolloutRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.cancelRolloutSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.cancelRolloutSettings().setRetrySettings(cancelRolloutRetrySettings);

RetrySettings listRolloutsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listRolloutsSettings().getRetrySettings(), serviceRetry);
Expand All @@ -211,6 +221,11 @@ public CloudDeploySettings cloudDeploySettings(
clientSettingsBuilder.getRolloutSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getRolloutSettings().setRetrySettings(getRolloutRetrySettings);

RetrySettings ignoreJobRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.ignoreJobSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.ignoreJobSettings().setRetrySettings(ignoreJobRetrySettings);

RetrySettings retryJobRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.retryJobSettings().getRetrySettings(), serviceRetry);
Expand All @@ -226,6 +241,13 @@ public CloudDeploySettings cloudDeploySettings(
clientSettingsBuilder.getJobRunSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getJobRunSettings().setRetrySettings(getJobRunRetrySettings);

RetrySettings terminateJobRunRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.terminateJobRunSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder
.terminateJobRunSettings()
.setRetrySettings(terminateJobRunRetrySettings);

RetrySettings getConfigRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getConfigSettings().getRetrySettings(), serviceRetry);
Expand Down Expand Up @@ -352,6 +374,27 @@ public CloudDeploySettings cloudDeploySettings(
LOGGER.trace("Configured method-level retry settings for approveRollout from properties.");
}
}
Retry advanceRolloutRetry = clientProperties.getAdvanceRolloutRetry();
if (advanceRolloutRetry != null) {
RetrySettings advanceRolloutRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.advanceRolloutSettings().getRetrySettings(),
advanceRolloutRetry);
clientSettingsBuilder.advanceRolloutSettings().setRetrySettings(advanceRolloutRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for advanceRollout from properties.");
}
}
Retry cancelRolloutRetry = clientProperties.getCancelRolloutRetry();
if (cancelRolloutRetry != null) {
RetrySettings cancelRolloutRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.cancelRolloutSettings().getRetrySettings(), cancelRolloutRetry);
clientSettingsBuilder.cancelRolloutSettings().setRetrySettings(cancelRolloutRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for cancelRollout from properties.");
}
}
Retry listRolloutsRetry = clientProperties.getListRolloutsRetry();
if (listRolloutsRetry != null) {
RetrySettings listRolloutsRetrySettings =
Expand All @@ -372,6 +415,16 @@ public CloudDeploySettings cloudDeploySettings(
LOGGER.trace("Configured method-level retry settings for getRollout from properties.");
}
}
Retry ignoreJobRetry = clientProperties.getIgnoreJobRetry();
if (ignoreJobRetry != null) {
RetrySettings ignoreJobRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.ignoreJobSettings().getRetrySettings(), ignoreJobRetry);
clientSettingsBuilder.ignoreJobSettings().setRetrySettings(ignoreJobRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for ignoreJob from properties.");
}
}
Retry retryJobRetry = clientProperties.getRetryJobRetry();
if (retryJobRetry != null) {
RetrySettings retryJobRetrySettings =
Expand Down Expand Up @@ -402,6 +455,19 @@ public CloudDeploySettings cloudDeploySettings(
LOGGER.trace("Configured method-level retry settings for getJobRun from properties.");
}
}
Retry terminateJobRunRetry = clientProperties.getTerminateJobRunRetry();
if (terminateJobRunRetry != null) {
RetrySettings terminateJobRunRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.terminateJobRunSettings().getRetrySettings(),
terminateJobRunRetry);
clientSettingsBuilder
.terminateJobRunSettings()
.setRetrySettings(terminateJobRunRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for terminateJobRun from properties.");
}
}
Retry getConfigRetry = clientProperties.getGetConfigRetry();
if (getConfigRetry != null) {
RetrySettings getConfigRetrySettings =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,16 @@ public class CloudDeploySpringProperties implements CredentialsSupplier {
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry approveRolloutRetry;
/**
* Allow override of retry settings at method-level for advanceRollout. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry advanceRolloutRetry;
/**
* Allow override of retry settings at method-level for cancelRollout. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry cancelRolloutRetry;
/**
* Allow override of retry settings at method-level for listRollouts. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
Expand All @@ -92,6 +102,11 @@ public class CloudDeploySpringProperties implements CredentialsSupplier {
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getRolloutRetry;
/**
* Allow override of retry settings at method-level for ignoreJob. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry ignoreJobRetry;
/**
* Allow override of retry settings at method-level for retryJob. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
Expand All @@ -107,6 +122,11 @@ public class CloudDeploySpringProperties implements CredentialsSupplier {
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getJobRunRetry;
/**
* Allow override of retry settings at method-level for terminateJobRun. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry terminateJobRunRetry;
/**
* Allow override of retry settings at method-level for getConfig. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
Expand Down Expand Up @@ -239,6 +259,22 @@ public void setApproveRolloutRetry(Retry approveRolloutRetry) {
this.approveRolloutRetry = approveRolloutRetry;
}

public Retry getAdvanceRolloutRetry() {
return this.advanceRolloutRetry;
}

public void setAdvanceRolloutRetry(Retry advanceRolloutRetry) {
this.advanceRolloutRetry = advanceRolloutRetry;
}

public Retry getCancelRolloutRetry() {
return this.cancelRolloutRetry;
}

public void setCancelRolloutRetry(Retry cancelRolloutRetry) {
this.cancelRolloutRetry = cancelRolloutRetry;
}

public Retry getListRolloutsRetry() {
return this.listRolloutsRetry;
}
Expand All @@ -255,6 +291,14 @@ public void setGetRolloutRetry(Retry getRolloutRetry) {
this.getRolloutRetry = getRolloutRetry;
}

public Retry getIgnoreJobRetry() {
return this.ignoreJobRetry;
}

public void setIgnoreJobRetry(Retry ignoreJobRetry) {
this.ignoreJobRetry = ignoreJobRetry;
}

public Retry getRetryJobRetry() {
return this.retryJobRetry;
}
Expand All @@ -279,6 +323,14 @@ public void setGetJobRunRetry(Retry getJobRunRetry) {
this.getJobRunRetry = getJobRunRetry;
}

public Retry getTerminateJobRunRetry() {
return this.terminateJobRunRetry;
}

public void setTerminateJobRunRetry(Retry terminateJobRunRetry) {
this.terminateJobRunRetry = terminateJobRunRetry;
}

public Retry getGetConfigRetry() {
return this.getConfigRetry;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,16 @@ public CloudFilestoreManagerSettings cloudFilestoreManagerSettings(
clientSettingsBuilder.getInstanceSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getInstanceSettings().setRetrySettings(getInstanceRetrySettings);

RetrySettings listSnapshotsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listSnapshotsSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.listSnapshotsSettings().setRetrySettings(listSnapshotsRetrySettings);

RetrySettings getSnapshotRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getSnapshotSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getSnapshotSettings().setRetrySettings(getSnapshotRetrySettings);

RetrySettings listBackupsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listBackupsSettings().getRetrySettings(), serviceRetry);
Expand Down Expand Up @@ -203,6 +213,26 @@ public CloudFilestoreManagerSettings cloudFilestoreManagerSettings(
LOGGER.trace("Configured method-level retry settings for getInstance from properties.");
}
}
Retry listSnapshotsRetry = clientProperties.getListSnapshotsRetry();
if (listSnapshotsRetry != null) {
RetrySettings listSnapshotsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listSnapshotsSettings().getRetrySettings(), listSnapshotsRetry);
clientSettingsBuilder.listSnapshotsSettings().setRetrySettings(listSnapshotsRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for listSnapshots from properties.");
}
}
Retry getSnapshotRetry = clientProperties.getGetSnapshotRetry();
if (getSnapshotRetry != null) {
RetrySettings getSnapshotRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getSnapshotSettings().getRetrySettings(), getSnapshotRetry);
clientSettingsBuilder.getSnapshotSettings().setRetrySettings(getSnapshotRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for getSnapshot from properties.");
}
}
Retry listBackupsRetry = clientProperties.getListBackupsRetry();
if (listBackupsRetry != null) {
RetrySettings listBackupsRetrySettings =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ public class CloudFilestoreManagerSpringProperties implements CredentialsSupplie
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getInstanceRetry;
/**
* Allow override of retry settings at method-level for listSnapshots. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry listSnapshotsRetry;
/**
* Allow override of retry settings at method-level for getSnapshot. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getSnapshotRetry;
/**
* Allow override of retry settings at method-level for listBackups. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
Expand Down Expand Up @@ -116,6 +126,22 @@ public void setGetInstanceRetry(Retry getInstanceRetry) {
this.getInstanceRetry = getInstanceRetry;
}

public Retry getListSnapshotsRetry() {
return this.listSnapshotsRetry;
}

public void setListSnapshotsRetry(Retry listSnapshotsRetry) {
this.listSnapshotsRetry = listSnapshotsRetry;
}

public Retry getGetSnapshotRetry() {
return this.getSnapshotRetry;
}

public void setGetSnapshotRetry(Retry getSnapshotRetry) {
this.getSnapshotRetry = getSnapshotRetry;
}

public Retry getListBackupsRetry() {
return this.listBackupsRetry;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,16 @@ public SpeechSettings speechSettings(
clientSettingsBuilder.getPhraseSetSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getPhraseSetSettings().setRetrySettings(getPhraseSetRetrySettings);

RetrySettings listLocationsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings);

RetrySettings getLocationRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getLocationSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings);

if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured service-level retry settings from properties.");
}
Expand Down Expand Up @@ -304,6 +314,26 @@ public SpeechSettings speechSettings(
LOGGER.trace("Configured method-level retry settings for getPhraseSet from properties.");
}
}
Retry listLocationsRetry = clientProperties.getListLocationsRetry();
if (listLocationsRetry != null) {
RetrySettings listLocationsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listLocationsSettings().getRetrySettings(), listLocationsRetry);
clientSettingsBuilder.listLocationsSettings().setRetrySettings(listLocationsRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for listLocations from properties.");
}
}
Retry getLocationRetry = clientProperties.getGetLocationRetry();
if (getLocationRetry != null) {
RetrySettings getLocationRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getLocationSettings().getRetrySettings(), getLocationRetry);
clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for getLocation from properties.");
}
}
return clientSettingsBuilder.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,16 @@ public class SpeechSpringProperties implements CredentialsSupplier {
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getPhraseSetRetry;
/**
* Allow override of retry settings at method-level for listLocations. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry listLocationsRetry;
/**
* Allow override of retry settings at method-level for getLocation. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getLocationRetry;

@Override
public Credentials getCredentials() {
Expand Down Expand Up @@ -196,4 +206,20 @@ public Retry getGetPhraseSetRetry() {
public void setGetPhraseSetRetry(Retry getPhraseSetRetry) {
this.getPhraseSetRetry = getPhraseSetRetry;
}

public Retry getListLocationsRetry() {
return this.listLocationsRetry;
}

public void setListLocationsRetry(Retry listLocationsRetry) {
this.listLocationsRetry = listLocationsRetry;
}

public Retry getGetLocationRetry() {
return this.getLocationRetry;
}

public void setGetLocationRetry(Retry getLocationRetry) {
this.getLocationRetry = getLocationRetry;
}
}

0 comments on commit 4f5598c

Please sign in to comment.