-
Notifications
You must be signed in to change notification settings - Fork 316
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: update starter modules in spring-cloud-previews (#2054)
Co-authored-by: Cloud Java Bot <cloud-java-bot@google.com>
- Loading branch information
1 parent
b36e847
commit 1cc72c4
Showing
7 changed files
with
435 additions
and
88 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
211 changes: 211 additions & 0 deletions
211
...om/google/cloud/compute/v1/spring/InterconnectRemoteLocationsSpringAutoConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,211 @@ | ||
| /* | ||
| * Copyright 2023 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.InterconnectRemoteLocationsClient; | ||
| import com.google.cloud.compute.v1.InterconnectRemoteLocationsSettings; | ||
| 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 InterconnectRemoteLocationsClient}. | ||
| * | ||
| * <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(InterconnectRemoteLocationsClient.class) | ||
| @ConditionalOnProperty( | ||
| value = "com.google.cloud.compute.v1.interconnect-remote-locations.enabled", | ||
| matchIfMissing = true) | ||
| @EnableConfigurationProperties(InterconnectRemoteLocationsSpringProperties.class) | ||
| public class InterconnectRemoteLocationsSpringAutoConfiguration { | ||
| private final InterconnectRemoteLocationsSpringProperties clientProperties; | ||
| private final CredentialsProvider credentialsProvider; | ||
| private static final Log LOGGER = | ||
| LogFactory.getLog(InterconnectRemoteLocationsSpringAutoConfiguration.class); | ||
|
|
||
| protected InterconnectRemoteLocationsSpringAutoConfiguration( | ||
| InterconnectRemoteLocationsSpringProperties clientProperties, | ||
| CredentialsProvider credentialsProvider) | ||
| throws IOException { | ||
| this.clientProperties = clientProperties; | ||
| if (this.clientProperties.getCredentials().hasKey()) { | ||
| if (LOGGER.isTraceEnabled()) { | ||
| LOGGER.trace("Using credentials from InterconnectRemoteLocations-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 = "defaultInterconnectRemoteLocationsTransportChannelProvider") | ||
| public TransportChannelProvider defaultInterconnectRemoteLocationsTransportChannelProvider() { | ||
| return InterconnectRemoteLocationsSettings.defaultTransportChannelProvider(); | ||
| } | ||
|
|
||
| /** | ||
| * Provides a InterconnectRemoteLocationsSettings bean configured to use a | ||
| * DefaultCredentialsProvider and the client library's default transport channel provider | ||
| * (defaultInterconnectRemoteLocationsTransportChannelProvider()). 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 InterconnectRemoteLocationsSpringProperties. 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 InterconnectRemoteLocationsSettings} bean configured with {@link | ||
| * TransportChannelProvider} bean. | ||
| */ | ||
| @Bean | ||
| @ConditionalOnMissingBean | ||
| public InterconnectRemoteLocationsSettings interconnectRemoteLocationsSettings( | ||
| @Qualifier("defaultInterconnectRemoteLocationsTransportChannelProvider") | ||
| TransportChannelProvider defaultTransportChannelProvider) | ||
| throws IOException { | ||
| InterconnectRemoteLocationsSettings.Builder clientSettingsBuilder = | ||
| InterconnectRemoteLocationsSettings.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 = | ||
| InterconnectRemoteLocationsSettings.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 InterconnectRemoteLocationsClient bean configured with | ||
| * InterconnectRemoteLocationsSettings. | ||
| * | ||
| * @param interconnectRemoteLocationsSettings settings to configure an instance of client bean. | ||
| * @return a {@link InterconnectRemoteLocationsClient} bean configured with {@link | ||
| * InterconnectRemoteLocationsSettings} | ||
| */ | ||
| @Bean | ||
| @ConditionalOnMissingBean | ||
| public InterconnectRemoteLocationsClient interconnectRemoteLocationsClient( | ||
| InterconnectRemoteLocationsSettings interconnectRemoteLocationsSettings) throws IOException { | ||
| return InterconnectRemoteLocationsClient.create(interconnectRemoteLocationsSettings); | ||
| } | ||
|
|
||
| private HeaderProvider userAgentHeaderProvider() { | ||
| String springLibrary = "spring-autogen-interconnect-remote-locations"; | ||
| String version = this.getClass().getPackage().getImplementationVersion(); | ||
| return () -> Collections.singletonMap("user-agent", springLibrary + "/" + version); | ||
| } | ||
| } |
101 changes: 101 additions & 0 deletions
101
.../java/com/google/cloud/compute/v1/spring/InterconnectRemoteLocationsSpringProperties.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * Copyright 2023 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 InterconnectRemoteLocations client bean */ | ||
| @Generated("by google-cloud-spring-generator") | ||
| @BetaApi("Autogenerated Spring autoconfiguration is not yet stable") | ||
| @ConfigurationProperties("com.google.cloud.compute.v1.interconnect-remote-locations") | ||
| public class InterconnectRemoteLocationsSpringProperties 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.readonly", | ||
| "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; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters