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

deps: manual bump gapic-generator-java-bom.version from 2.22.0 to 2.23.1 #2044

Merged
merged 1 commit into from
Jul 24, 2023
Merged

deps: manual bump gapic-generator-java-bom.version from 2.22.0 to 2.23.1 #2044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-cloud-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<description>Spring Code Generator for Google Cloud</description>

<properties>
<gapic-generator-java-bom.version>2.22.0</gapic-generator-java-bom.version>
<gapic-generator-java-bom.version>2.23.1</gapic-generator-java-bom.version>
<!-- [gapic-test]: protobuf.version for compiling protos used in unit testing
this should be consistent with version in gapic-generator-java-bom -->
<protobuf.version>3.23.2</protobuf.version>
Expand Down
51 changes: 51 additions & 0 deletions ...r/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,23 @@ public ComplianceSettings complianceSettings(
clientSettingsBuilder.getLocationSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings);

RetrySettings setIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);

RetrySettings getIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);

RetrySettings testIamPermissionsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder
.testIamPermissionsSettings()
.setRetrySettings(testIamPermissionsRetrySettings);

if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured service-level retry settings from properties.");
}
Expand Down Expand Up @@ -388,6 +405,40 @@ public ComplianceSettings complianceSettings(
LOGGER.trace("Configured method-level retry settings for getLocation from properties.");
}
}
Retry setIamPolicyRetry = clientProperties.getSetIamPolicyRetry();
if (setIamPolicyRetry != null) {
RetrySettings setIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), setIamPolicyRetry);
clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for setIamPolicy from properties.");
}
}
Retry getIamPolicyRetry = clientProperties.getGetIamPolicyRetry();
if (getIamPolicyRetry != null) {
RetrySettings getIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), getIamPolicyRetry);
clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for getIamPolicy from properties.");
}
}
Retry testIamPermissionsRetry = clientProperties.getTestIamPermissionsRetry();
if (testIamPermissionsRetry != null) {
RetrySettings testIamPermissionsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(),
testIamPermissionsRetry);
clientSettingsBuilder
.testIamPermissionsSettings()
.setRetrySettings(testIamPermissionsRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(
"Configured method-level retry settings for testIamPermissions from properties.");
}
}
return clientSettingsBuilder.build();
}

Expand Down
39 changes: 39 additions & 0 deletions ...-starter/src/main/java/com/google/showcase/v1beta1/spring/ComplianceSpringProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,21 @@ public class ComplianceSpringProperties implements CredentialsSupplier {
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getLocationRetry;
/**
* Allow override of retry settings at method-level for setIamPolicy. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry setIamPolicyRetry;
/**
* Allow override of retry settings at method-level for getIamPolicy. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getIamPolicyRetry;
/**
* Allow override of retry settings at method-level for testIamPermissions. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry testIamPermissionsRetry;

@Override
public Credentials getCredentials() {
Expand Down Expand Up @@ -233,4 +248,28 @@ public Retry getGetLocationRetry() {
public void setGetLocationRetry(Retry getLocationRetry) {
this.getLocationRetry = getLocationRetry;
}

public Retry getSetIamPolicyRetry() {
return this.setIamPolicyRetry;
}

public void setSetIamPolicyRetry(Retry setIamPolicyRetry) {
this.setIamPolicyRetry = setIamPolicyRetry;
}

public Retry getGetIamPolicyRetry() {
return this.getIamPolicyRetry;
}

public void setGetIamPolicyRetry(Retry getIamPolicyRetry) {
this.getIamPolicyRetry = getIamPolicyRetry;
}

public Retry getTestIamPermissionsRetry() {
return this.testIamPermissionsRetry;
}

public void setTestIamPermissionsRetry(Retry testIamPermissionsRetry) {
this.testIamPermissionsRetry = testIamPermissionsRetry;
}
}
51 changes: 51 additions & 0 deletions ...starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,23 @@ public EchoSettings echoSettings(
clientSettingsBuilder.getLocationSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings);

RetrySettings setIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);

RetrySettings getIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);

RetrySettings testIamPermissionsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder
.testIamPermissionsSettings()
.setRetrySettings(testIamPermissionsRetrySettings);

if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured service-level retry settings from properties.");
}
Expand Down Expand Up @@ -276,6 +293,40 @@ public EchoSettings echoSettings(
LOGGER.trace("Configured method-level retry settings for getLocation from properties.");
}
}
Retry setIamPolicyRetry = clientProperties.getSetIamPolicyRetry();
if (setIamPolicyRetry != null) {
RetrySettings setIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), setIamPolicyRetry);
clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for setIamPolicy from properties.");
}
}
Retry getIamPolicyRetry = clientProperties.getGetIamPolicyRetry();
if (getIamPolicyRetry != null) {
RetrySettings getIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), getIamPolicyRetry);
clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for getIamPolicy from properties.");
}
}
Retry testIamPermissionsRetry = clientProperties.getTestIamPermissionsRetry();
if (testIamPermissionsRetry != null) {
RetrySettings testIamPermissionsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(),
testIamPermissionsRetry);
clientSettingsBuilder
.testIamPermissionsSettings()
.setRetrySettings(testIamPermissionsRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(
"Configured method-level retry settings for testIamPermissions from properties.");
}
}
return clientSettingsBuilder.build();
}

Expand Down
39 changes: 39 additions & 0 deletions ...spring-starter/src/main/java/com/google/showcase/v1beta1/spring/EchoSpringProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,21 @@ public class EchoSpringProperties implements CredentialsSupplier {
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getLocationRetry;
/**
* Allow override of retry settings at method-level for setIamPolicy. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry setIamPolicyRetry;
/**
* Allow override of retry settings at method-level for getIamPolicy. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getIamPolicyRetry;
/**
* Allow override of retry settings at method-level for testIamPermissions. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry testIamPermissionsRetry;

@Override
public Credentials getCredentials() {
Expand Down Expand Up @@ -168,4 +183,28 @@ public Retry getGetLocationRetry() {
public void setGetLocationRetry(Retry getLocationRetry) {
this.getLocationRetry = getLocationRetry;
}

public Retry getSetIamPolicyRetry() {
return this.setIamPolicyRetry;
}

public void setSetIamPolicyRetry(Retry setIamPolicyRetry) {
this.setIamPolicyRetry = setIamPolicyRetry;
}

public Retry getGetIamPolicyRetry() {
return this.getIamPolicyRetry;
}

public void setGetIamPolicyRetry(Retry getIamPolicyRetry) {
this.getIamPolicyRetry = getIamPolicyRetry;
}

public Retry getTestIamPermissionsRetry() {
return this.testIamPermissionsRetry;
}

public void setTestIamPermissionsRetry(Retry testIamPermissionsRetry) {
this.testIamPermissionsRetry = testIamPermissionsRetry;
}
}
51 changes: 51 additions & 0 deletions ...ter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,23 @@ public IdentitySettings identitySettings(
clientSettingsBuilder.getLocationSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getLocationSettings().setRetrySettings(getLocationRetrySettings);

RetrySettings setIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);

RetrySettings getIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);

RetrySettings testIamPermissionsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder
.testIamPermissionsSettings()
.setRetrySettings(testIamPermissionsRetrySettings);

if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured service-level retry settings from properties.");
}
Expand Down Expand Up @@ -265,6 +282,40 @@ public IdentitySettings identitySettings(
LOGGER.trace("Configured method-level retry settings for getLocation from properties.");
}
}
Retry setIamPolicyRetry = clientProperties.getSetIamPolicyRetry();
if (setIamPolicyRetry != null) {
RetrySettings setIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), setIamPolicyRetry);
clientSettingsBuilder.setIamPolicySettings().setRetrySettings(setIamPolicyRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for setIamPolicy from properties.");
}
}
Retry getIamPolicyRetry = clientProperties.getGetIamPolicyRetry();
if (getIamPolicyRetry != null) {
RetrySettings getIamPolicyRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getIamPolicySettings().getRetrySettings(), getIamPolicyRetry);
clientSettingsBuilder.getIamPolicySettings().setRetrySettings(getIamPolicyRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for getIamPolicy from properties.");
}
}
Retry testIamPermissionsRetry = clientProperties.getTestIamPermissionsRetry();
if (testIamPermissionsRetry != null) {
RetrySettings testIamPermissionsRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.testIamPermissionsSettings().getRetrySettings(),
testIamPermissionsRetry);
clientSettingsBuilder
.testIamPermissionsSettings()
.setRetrySettings(testIamPermissionsRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(
"Configured method-level retry settings for testIamPermissions from properties.");
}
}
return clientSettingsBuilder.build();
}

Expand Down
39 changes: 39 additions & 0 deletions ...ng-starter/src/main/java/com/google/showcase/v1beta1/spring/IdentitySpringProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,21 @@ public class IdentitySpringProperties implements CredentialsSupplier {
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getLocationRetry;
/**
* Allow override of retry settings at method-level for setIamPolicy. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry setIamPolicyRetry;
/**
* Allow override of retry settings at method-level for getIamPolicy. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getIamPolicyRetry;
/**
* Allow override of retry settings at method-level for testIamPermissions. If defined, this takes
* precedence over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry testIamPermissionsRetry;

@Override
public Credentials getCredentials() {
Expand Down Expand Up @@ -168,4 +183,28 @@ public Retry getGetLocationRetry() {
public void setGetLocationRetry(Retry getLocationRetry) {
this.getLocationRetry = getLocationRetry;
}

public Retry getSetIamPolicyRetry() {
return this.setIamPolicyRetry;
}

public void setSetIamPolicyRetry(Retry setIamPolicyRetry) {
this.setIamPolicyRetry = setIamPolicyRetry;
}

public Retry getGetIamPolicyRetry() {
return this.getIamPolicyRetry;
}

public void setGetIamPolicyRetry(Retry getIamPolicyRetry) {
this.getIamPolicyRetry = getIamPolicyRetry;
}

public Retry getTestIamPermissionsRetry() {
return this.testIamPermissionsRetry;
}

public void setTestIamPermissionsRetry(Retry testIamPermissionsRetry) {
this.testIamPermissionsRetry = testIamPermissionsRetry;
}
}
Loading