Skip to content

Commit

Permalink
fix(deps): update dependency com.google.cloud:libraries-bom to v26.39…
Browse files Browse the repository at this point in the history
….0 (#2866)

* fix(deps): update dependency com.google.cloud:libraries-bom to v26.39.0

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

---------

Co-authored-by: Cloud Java Bot <cloud-java-bot@google.com>
  • Loading branch information
renovate-bot and cloud-java-bot committed May 15, 2024
1 parent a7e827e commit c6d734b
Show file tree
Hide file tree
Showing 15 changed files with 1,743 additions and 94 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.38.0</gcp-libraries-bom.version>
<gcp-libraries-bom.version>26.39.0</gcp-libraries-bom.version>
<cloud-sql-socket-factory.version>1.18.0</cloud-sql-socket-factory.version>
<r2dbc-postgres-driver.version>1.0.5.RELEASE</r2dbc-postgres-driver.version>
<cloud-spanner-r2dbc.version>1.3.0</cloud-spanner-r2dbc.version>
Expand Down
178 changes: 89 additions & 89 deletions spring-cloud-previews/README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
/*
* Copyright 2024 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.cloud.compute.v1.spring;

import com.google.api.core.BetaApi;
import com.google.api.gax.core.CredentialsProvider;
import com.google.api.gax.core.ExecutorProvider;
import com.google.api.gax.retrying.RetrySettings;
import com.google.api.gax.rpc.HeaderProvider;
import com.google.api.gax.rpc.TransportChannelProvider;
import com.google.cloud.compute.v1.InstanceGroupManagerResizeRequestsClient;
import com.google.cloud.compute.v1.InstanceGroupManagerResizeRequestsSettings;
import com.google.cloud.spring.autoconfigure.core.GcpContextAutoConfiguration;
import com.google.cloud.spring.core.DefaultCredentialsProvider;
import com.google.cloud.spring.core.Retry;
import com.google.cloud.spring.core.util.RetryUtil;
import java.io.IOException;
import java.util.Collections;
import javax.annotation.Generated;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;

// AUTO-GENERATED DOCUMENTATION AND CLASS.
/**
* Auto-configuration for {@link InstanceGroupManagerResizeRequestsClient}.
*
* <p>Provides auto-configuration for Spring Boot
*
* <p>The default instance has everything set to sensible defaults:
*
* <ul>
* <li>The default transport provider is used.
* <li>Credentials are acquired automatically through Application Default Credentials.
* <li>Retries are configured for idempotent methods but not for non-idempotent methods.
* </ul>
*/
@Generated("by google-cloud-spring-generator")
@BetaApi("Autogenerated Spring autoconfiguration is not yet stable")
@AutoConfiguration
@AutoConfigureAfter(GcpContextAutoConfiguration.class)
@ConditionalOnClass(InstanceGroupManagerResizeRequestsClient.class)
@ConditionalOnProperty(
value = "com.google.cloud.compute.v1.instance-group-manager-resize-requests.enabled",
matchIfMissing = true)
@EnableConfigurationProperties(InstanceGroupManagerResizeRequestsSpringProperties.class)
public class InstanceGroupManagerResizeRequestsSpringAutoConfiguration {
private final InstanceGroupManagerResizeRequestsSpringProperties clientProperties;
private final CredentialsProvider credentialsProvider;
private static final Log LOGGER =
LogFactory.getLog(InstanceGroupManagerResizeRequestsSpringAutoConfiguration.class);

protected InstanceGroupManagerResizeRequestsSpringAutoConfiguration(
InstanceGroupManagerResizeRequestsSpringProperties clientProperties,
CredentialsProvider credentialsProvider)
throws IOException {
this.clientProperties = clientProperties;
if (this.clientProperties.getCredentials().hasKey()) {
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(
"Using credentials from InstanceGroupManagerResizeRequests-specific configuration");
}
this.credentialsProvider =
((CredentialsProvider) new DefaultCredentialsProvider(this.clientProperties));
} else {
this.credentialsProvider = credentialsProvider;
}
}

/**
* Provides a default transport channel provider bean, corresponding to the client library's
* default transport channel provider. If the library supports both GRPC and REST transport, and
* the useRest property is configured, the HTTP/JSON transport provider will be used instead of
* GRPC.
*
* @return a default transport channel provider.
*/
@Bean
@ConditionalOnMissingBean(
name = "defaultInstanceGroupManagerResizeRequestsTransportChannelProvider")
public TransportChannelProvider
defaultInstanceGroupManagerResizeRequestsTransportChannelProvider() {
return InstanceGroupManagerResizeRequestsSettings.defaultTransportChannelProvider();
}

/**
* Provides a InstanceGroupManagerResizeRequestsSettings bean configured to use a
* DefaultCredentialsProvider and the client library's default transport channel provider
* (defaultInstanceGroupManagerResizeRequestsTransportChannelProvider()). It also configures the
* quota project ID and executor thread count, if provided through properties.
*
* <p>Retry settings are also configured from service-level and method-level properties specified
* in InstanceGroupManagerResizeRequestsSpringProperties. Method-level properties will take
* precedence over service-level properties if available, and client library defaults will be used
* if neither are specified.
*
* @param defaultTransportChannelProvider TransportChannelProvider to use in the settings.
* @return a {@link InstanceGroupManagerResizeRequestsSettings} bean configured with {@link
* TransportChannelProvider} bean.
*/
@Bean
@ConditionalOnMissingBean
public InstanceGroupManagerResizeRequestsSettings instanceGroupManagerResizeRequestsSettings(
@Qualifier("defaultInstanceGroupManagerResizeRequestsTransportChannelProvider")
TransportChannelProvider defaultTransportChannelProvider)
throws IOException {
InstanceGroupManagerResizeRequestsSettings.Builder clientSettingsBuilder =
InstanceGroupManagerResizeRequestsSettings.newBuilder();
clientSettingsBuilder
.setCredentialsProvider(this.credentialsProvider)
.setTransportChannelProvider(defaultTransportChannelProvider)
.setHeaderProvider(this.userAgentHeaderProvider());
if (this.clientProperties.getQuotaProjectId() != null) {
clientSettingsBuilder.setQuotaProjectId(this.clientProperties.getQuotaProjectId());
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(
"Quota project id set to "
+ this.clientProperties.getQuotaProjectId()
+ ", this overrides project id from credentials.");
}
}
if (this.clientProperties.getExecutorThreadCount() != null) {
ExecutorProvider executorProvider =
InstanceGroupManagerResizeRequestsSettings.defaultExecutorProviderBuilder()
.setExecutorThreadCount(this.clientProperties.getExecutorThreadCount())
.build();
clientSettingsBuilder.setBackgroundExecutorProvider(executorProvider);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace(
"Background executor thread count is "
+ this.clientProperties.getExecutorThreadCount());
}
}
Retry serviceRetry = clientProperties.getRetry();
if (serviceRetry != null) {
RetrySettings getRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.getSettings().setRetrySettings(getRetrySettings);

RetrySettings listRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listSettings().getRetrySettings(), serviceRetry);
clientSettingsBuilder.listSettings().setRetrySettings(listRetrySettings);

if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured service-level retry settings from properties.");
}
}
Retry getRetry = clientProperties.getGetRetry();
if (getRetry != null) {
RetrySettings getRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.getSettings().getRetrySettings(), getRetry);
clientSettingsBuilder.getSettings().setRetrySettings(getRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for get from properties.");
}
}
Retry listRetry = clientProperties.getListRetry();
if (listRetry != null) {
RetrySettings listRetrySettings =
RetryUtil.updateRetrySettings(
clientSettingsBuilder.listSettings().getRetrySettings(), listRetry);
clientSettingsBuilder.listSettings().setRetrySettings(listRetrySettings);
if (LOGGER.isTraceEnabled()) {
LOGGER.trace("Configured method-level retry settings for list from properties.");
}
}
return clientSettingsBuilder.build();
}

/**
* Provides a InstanceGroupManagerResizeRequestsClient bean configured with
* InstanceGroupManagerResizeRequestsSettings.
*
* @param instanceGroupManagerResizeRequestsSettings settings to configure an instance of client
* bean.
* @return a {@link InstanceGroupManagerResizeRequestsClient} bean configured with {@link
* InstanceGroupManagerResizeRequestsSettings}
*/
@Bean
@ConditionalOnMissingBean
public InstanceGroupManagerResizeRequestsClient instanceGroupManagerResizeRequestsClient(
InstanceGroupManagerResizeRequestsSettings instanceGroupManagerResizeRequestsSettings)
throws IOException {
return InstanceGroupManagerResizeRequestsClient.create(
instanceGroupManagerResizeRequestsSettings);
}

private HeaderProvider userAgentHeaderProvider() {
String springLibrary = "spring-autogen-instance-group-manager-resize-requests";
String version = this.getClass().getPackage().getImplementationVersion();
return () -> Collections.singletonMap("user-agent", springLibrary + "/" + version);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* Copyright 2024 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.cloud.compute.v1.spring;

import com.google.api.core.BetaApi;
import com.google.cloud.spring.core.Credentials;
import com.google.cloud.spring.core.CredentialsSupplier;
import com.google.cloud.spring.core.Retry;
import javax.annotation.Generated;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;

// AUTO-GENERATED DOCUMENTATION AND CLASS.
/** Provides default property values for InstanceGroupManagerResizeRequests client bean */
@Generated("by google-cloud-spring-generator")
@BetaApi("Autogenerated Spring autoconfiguration is not yet stable")
@ConfigurationProperties("com.google.cloud.compute.v1.instance-group-manager-resize-requests")
public class InstanceGroupManagerResizeRequestsSpringProperties implements CredentialsSupplier {
/** OAuth2 credentials to authenticate and authorize calls to Google Cloud Client Libraries. */
@NestedConfigurationProperty
private final Credentials credentials =
new Credentials(
"https://www.googleapis.com/auth/compute",
"https://www.googleapis.com/auth/cloud-platform");
/** Quota project to use for billing. */
private String quotaProjectId;
/** Number of threads used for executors. */
private Integer executorThreadCount;
/** Allow override of retry settings at service level, applying to all of its RPC methods. */
@NestedConfigurationProperty private Retry retry;
/**
* Allow override of retry settings at method-level for get. If defined, this takes precedence
* over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry getRetry;
/**
* Allow override of retry settings at method-level for list. If defined, this takes precedence
* over service-level retry configurations for that RPC method.
*/
@NestedConfigurationProperty private Retry listRetry;

@Override
public Credentials getCredentials() {
return this.credentials;
}

public String getQuotaProjectId() {
return this.quotaProjectId;
}

public void setQuotaProjectId(String quotaProjectId) {
this.quotaProjectId = quotaProjectId;
}

public Integer getExecutorThreadCount() {
return this.executorThreadCount;
}

public void setExecutorThreadCount(Integer executorThreadCount) {
this.executorThreadCount = executorThreadCount;
}

public Retry getRetry() {
return this.retry;
}

public void setRetry(Retry retry) {
this.retry = retry;
}

public Retry getGetRetry() {
return this.getRetry;
}

public void setGetRetry(Retry getRetry) {
this.getRetry = getRetry;
}

public Retry getListRetry() {
return this.listRetry;
}

public void setListRetry(Retry listRetry) {
this.listRetry = listRetry;
}
}

0 comments on commit c6d734b

Please sign in to comment.