Skip to content

Commit a270a7d

Browse files
renovate-botjinseopkim0cloud-java-bot
authored
fix(deps): update dependency com.google.cloud:libraries-bom to v26.51.0 (GoogleCloudPlatform#3350)
* fix(deps): update dependency com.google.cloud:libraries-bom to v26.51.0 * add additional mock * remove redundant null-checker (and avoid ImpossibleNullComparison) * add additional mocks * fix(deps): update dependency com.google.cloud:libraries-bom to v26.51.0 * chore: update starter modules in spring-cloud-previews --------- Co-authored-by: Jin Seop Kim <[email protected]> Co-authored-by: Cloud Java Bot <[email protected]>
1 parent 03b7416 commit a270a7d

File tree

21 files changed

+1883
-111
lines changed

21 files changed

+1883
-111
lines changed

‎spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ void should_inject_child_context() {
6666
assertThat(producerSpan.kind()).isEqualTo(PRODUCER);
6767
assertChildOf(producerSpan, parent);
6868
assertThat(instrumentedMessage.getAttributesMap())
69-
.isNotNull()
7069
.containsEntry("b3", producerSpan.traceId() + "-" + producerSpan.id() + "-1");
7170
}
7271

‎spring-cloud-gcp-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</distributionManagement>
3535

3636
<properties>
37-
<gcp-libraries-bom.version>26.49.0</gcp-libraries-bom.version>
37+
<gcp-libraries-bom.version>26.51.0</gcp-libraries-bom.version>
3838
<cloud-sql-socket-factory.version>1.21.0</cloud-sql-socket-factory.version>
3939
<r2dbc-postgres-driver.version>1.0.7.RELEASE</r2dbc-postgres-driver.version>
4040
<cloud-spanner-r2dbc.version>1.3.0</cloud-spanner-r2dbc.version>

‎spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import static org.assertj.core.api.Assertions.assertThat;
2020
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2121
import static org.mockito.ArgumentMatchers.any;
22+
import static org.mockito.ArgumentMatchers.anyBoolean;
2223
import static org.mockito.Mockito.mock;
2324
import static org.mockito.Mockito.when;
2425

@@ -46,6 +47,7 @@ public void setUp() throws IOException {
4647
factory.setCredentialsProvider(NoCredentialsProvider.create());
4748
TransportChannelProvider mockChannelProvider = mock(TransportChannelProvider.class);
4849
TransportChannel mockTransportChannel = mock(TransportChannel.class);
50+
when(mockChannelProvider.withUseS2A(anyBoolean())).thenReturn(mockChannelProvider);
4951
when(mockChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel);
5052
ApiCallContext mockContext = mock(ApiCallContext.class);
5153
when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockContext);

‎spring-cloud-previews/README.md

Lines changed: 109 additions & 109 deletions
Large diffs are not rendered by default.

‎spring-cloud-previews/google-cloud-artifact-registry-spring-starter/src/main/java/com/google/devtools/artifactregistry/v1/spring/ArtifactRegistrySpringAutoConfiguration.java

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,11 @@ public ArtifactRegistrySettings artifactRegistrySettings(
252252
clientSettingsBuilder.getVersionSettings().getRetrySettings(), serviceRetry);
253253
clientSettingsBuilder.getVersionSettings().setRetrySettings(getVersionRetrySettings);
254254

255+
RetrySettings updateVersionRetrySettings =
256+
RetryUtil.updateRetrySettings(
257+
clientSettingsBuilder.updateVersionSettings().getRetrySettings(), serviceRetry);
258+
clientSettingsBuilder.updateVersionSettings().setRetrySettings(updateVersionRetrySettings);
259+
255260
RetrySettings listFilesRetrySettings =
256261
RetryUtil.updateRetrySettings(
257262
clientSettingsBuilder.listFilesSettings().getRetrySettings(), serviceRetry);
@@ -262,6 +267,11 @@ public ArtifactRegistrySettings artifactRegistrySettings(
262267
clientSettingsBuilder.getFileSettings().getRetrySettings(), serviceRetry);
263268
clientSettingsBuilder.getFileSettings().setRetrySettings(getFileRetrySettings);
264269

270+
RetrySettings updateFileRetrySettings =
271+
RetryUtil.updateRetrySettings(
272+
clientSettingsBuilder.updateFileSettings().getRetrySettings(), serviceRetry);
273+
clientSettingsBuilder.updateFileSettings().setRetrySettings(updateFileRetrySettings);
274+
265275
RetrySettings listTagsRetrySettings =
266276
RetryUtil.updateRetrySettings(
267277
clientSettingsBuilder.listTagsSettings().getRetrySettings(), serviceRetry);
@@ -287,6 +297,31 @@ public ArtifactRegistrySettings artifactRegistrySettings(
287297
clientSettingsBuilder.deleteTagSettings().getRetrySettings(), serviceRetry);
288298
clientSettingsBuilder.deleteTagSettings().setRetrySettings(deleteTagRetrySettings);
289299

300+
RetrySettings createRuleRetrySettings =
301+
RetryUtil.updateRetrySettings(
302+
clientSettingsBuilder.createRuleSettings().getRetrySettings(), serviceRetry);
303+
clientSettingsBuilder.createRuleSettings().setRetrySettings(createRuleRetrySettings);
304+
305+
RetrySettings listRulesRetrySettings =
306+
RetryUtil.updateRetrySettings(
307+
clientSettingsBuilder.listRulesSettings().getRetrySettings(), serviceRetry);
308+
clientSettingsBuilder.listRulesSettings().setRetrySettings(listRulesRetrySettings);
309+
310+
RetrySettings getRuleRetrySettings =
311+
RetryUtil.updateRetrySettings(
312+
clientSettingsBuilder.getRuleSettings().getRetrySettings(), serviceRetry);
313+
clientSettingsBuilder.getRuleSettings().setRetrySettings(getRuleRetrySettings);
314+
315+
RetrySettings updateRuleRetrySettings =
316+
RetryUtil.updateRetrySettings(
317+
clientSettingsBuilder.updateRuleSettings().getRetrySettings(), serviceRetry);
318+
clientSettingsBuilder.updateRuleSettings().setRetrySettings(updateRuleRetrySettings);
319+
320+
RetrySettings deleteRuleRetrySettings =
321+
RetryUtil.updateRetrySettings(
322+
clientSettingsBuilder.deleteRuleSettings().getRetrySettings(), serviceRetry);
323+
clientSettingsBuilder.deleteRuleSettings().setRetrySettings(deleteRuleRetrySettings);
324+
290325
RetrySettings setIamPolicyRetrySettings =
291326
RetryUtil.updateRetrySettings(
292327
clientSettingsBuilder.setIamPolicySettings().getRetrySettings(), serviceRetry);
@@ -331,6 +366,23 @@ public ArtifactRegistrySettings artifactRegistrySettings(
331366
.updateVPCSCConfigSettings()
332367
.setRetrySettings(updateVPCSCConfigRetrySettings);
333368

369+
RetrySettings updatePackageRetrySettings =
370+
RetryUtil.updateRetrySettings(
371+
clientSettingsBuilder.updatePackageSettings().getRetrySettings(), serviceRetry);
372+
clientSettingsBuilder.updatePackageSettings().setRetrySettings(updatePackageRetrySettings);
373+
374+
RetrySettings listAttachmentsRetrySettings =
375+
RetryUtil.updateRetrySettings(
376+
clientSettingsBuilder.listAttachmentsSettings().getRetrySettings(), serviceRetry);
377+
clientSettingsBuilder
378+
.listAttachmentsSettings()
379+
.setRetrySettings(listAttachmentsRetrySettings);
380+
381+
RetrySettings getAttachmentRetrySettings =
382+
RetryUtil.updateRetrySettings(
383+
clientSettingsBuilder.getAttachmentSettings().getRetrySettings(), serviceRetry);
384+
clientSettingsBuilder.getAttachmentSettings().setRetrySettings(getAttachmentRetrySettings);
385+
334386
RetrySettings listLocationsRetrySettings =
335387
RetryUtil.updateRetrySettings(
336388
clientSettingsBuilder.listLocationsSettings().getRetrySettings(), serviceRetry);
@@ -527,6 +579,16 @@ public ArtifactRegistrySettings artifactRegistrySettings(
527579
LOGGER.trace("Configured method-level retry settings for getVersion from properties.");
528580
}
529581
}
582+
Retry updateVersionRetry = clientProperties.getUpdateVersionRetry();
583+
if (updateVersionRetry != null) {
584+
RetrySettings updateVersionRetrySettings =
585+
RetryUtil.updateRetrySettings(
586+
clientSettingsBuilder.updateVersionSettings().getRetrySettings(), updateVersionRetry);
587+
clientSettingsBuilder.updateVersionSettings().setRetrySettings(updateVersionRetrySettings);
588+
if (LOGGER.isTraceEnabled()) {
589+
LOGGER.trace("Configured method-level retry settings for updateVersion from properties.");
590+
}
591+
}
530592
Retry listFilesRetry = clientProperties.getListFilesRetry();
531593
if (listFilesRetry != null) {
532594
RetrySettings listFilesRetrySettings =
@@ -547,6 +609,16 @@ public ArtifactRegistrySettings artifactRegistrySettings(
547609
LOGGER.trace("Configured method-level retry settings for getFile from properties.");
548610
}
549611
}
612+
Retry updateFileRetry = clientProperties.getUpdateFileRetry();
613+
if (updateFileRetry != null) {
614+
RetrySettings updateFileRetrySettings =
615+
RetryUtil.updateRetrySettings(
616+
clientSettingsBuilder.updateFileSettings().getRetrySettings(), updateFileRetry);
617+
clientSettingsBuilder.updateFileSettings().setRetrySettings(updateFileRetrySettings);
618+
if (LOGGER.isTraceEnabled()) {
619+
LOGGER.trace("Configured method-level retry settings for updateFile from properties.");
620+
}
621+
}
550622
Retry listTagsRetry = clientProperties.getListTagsRetry();
551623
if (listTagsRetry != null) {
552624
RetrySettings listTagsRetrySettings =
@@ -597,6 +669,56 @@ public ArtifactRegistrySettings artifactRegistrySettings(
597669
LOGGER.trace("Configured method-level retry settings for deleteTag from properties.");
598670
}
599671
}
672+
Retry createRuleRetry = clientProperties.getCreateRuleRetry();
673+
if (createRuleRetry != null) {
674+
RetrySettings createRuleRetrySettings =
675+
RetryUtil.updateRetrySettings(
676+
clientSettingsBuilder.createRuleSettings().getRetrySettings(), createRuleRetry);
677+
clientSettingsBuilder.createRuleSettings().setRetrySettings(createRuleRetrySettings);
678+
if (LOGGER.isTraceEnabled()) {
679+
LOGGER.trace("Configured method-level retry settings for createRule from properties.");
680+
}
681+
}
682+
Retry listRulesRetry = clientProperties.getListRulesRetry();
683+
if (listRulesRetry != null) {
684+
RetrySettings listRulesRetrySettings =
685+
RetryUtil.updateRetrySettings(
686+
clientSettingsBuilder.listRulesSettings().getRetrySettings(), listRulesRetry);
687+
clientSettingsBuilder.listRulesSettings().setRetrySettings(listRulesRetrySettings);
688+
if (LOGGER.isTraceEnabled()) {
689+
LOGGER.trace("Configured method-level retry settings for listRules from properties.");
690+
}
691+
}
692+
Retry getRuleRetry = clientProperties.getGetRuleRetry();
693+
if (getRuleRetry != null) {
694+
RetrySettings getRuleRetrySettings =
695+
RetryUtil.updateRetrySettings(
696+
clientSettingsBuilder.getRuleSettings().getRetrySettings(), getRuleRetry);
697+
clientSettingsBuilder.getRuleSettings().setRetrySettings(getRuleRetrySettings);
698+
if (LOGGER.isTraceEnabled()) {
699+
LOGGER.trace("Configured method-level retry settings for getRule from properties.");
700+
}
701+
}
702+
Retry updateRuleRetry = clientProperties.getUpdateRuleRetry();
703+
if (updateRuleRetry != null) {
704+
RetrySettings updateRuleRetrySettings =
705+
RetryUtil.updateRetrySettings(
706+
clientSettingsBuilder.updateRuleSettings().getRetrySettings(), updateRuleRetry);
707+
clientSettingsBuilder.updateRuleSettings().setRetrySettings(updateRuleRetrySettings);
708+
if (LOGGER.isTraceEnabled()) {
709+
LOGGER.trace("Configured method-level retry settings for updateRule from properties.");
710+
}
711+
}
712+
Retry deleteRuleRetry = clientProperties.getDeleteRuleRetry();
713+
if (deleteRuleRetry != null) {
714+
RetrySettings deleteRuleRetrySettings =
715+
RetryUtil.updateRetrySettings(
716+
clientSettingsBuilder.deleteRuleSettings().getRetrySettings(), deleteRuleRetry);
717+
clientSettingsBuilder.deleteRuleSettings().setRetrySettings(deleteRuleRetrySettings);
718+
if (LOGGER.isTraceEnabled()) {
719+
LOGGER.trace("Configured method-level retry settings for deleteRule from properties.");
720+
}
721+
}
600722
Retry setIamPolicyRetry = clientProperties.getSetIamPolicyRetry();
601723
if (setIamPolicyRetry != null) {
602724
RetrySettings setIamPolicyRetrySettings =
@@ -684,6 +806,39 @@ public ArtifactRegistrySettings artifactRegistrySettings(
684806
"Configured method-level retry settings for updateVPCSCConfig from properties.");
685807
}
686808
}
809+
Retry updatePackageRetry = clientProperties.getUpdatePackageRetry();
810+
if (updatePackageRetry != null) {
811+
RetrySettings updatePackageRetrySettings =
812+
RetryUtil.updateRetrySettings(
813+
clientSettingsBuilder.updatePackageSettings().getRetrySettings(), updatePackageRetry);
814+
clientSettingsBuilder.updatePackageSettings().setRetrySettings(updatePackageRetrySettings);
815+
if (LOGGER.isTraceEnabled()) {
816+
LOGGER.trace("Configured method-level retry settings for updatePackage from properties.");
817+
}
818+
}
819+
Retry listAttachmentsRetry = clientProperties.getListAttachmentsRetry();
820+
if (listAttachmentsRetry != null) {
821+
RetrySettings listAttachmentsRetrySettings =
822+
RetryUtil.updateRetrySettings(
823+
clientSettingsBuilder.listAttachmentsSettings().getRetrySettings(),
824+
listAttachmentsRetry);
825+
clientSettingsBuilder
826+
.listAttachmentsSettings()
827+
.setRetrySettings(listAttachmentsRetrySettings);
828+
if (LOGGER.isTraceEnabled()) {
829+
LOGGER.trace("Configured method-level retry settings for listAttachments from properties.");
830+
}
831+
}
832+
Retry getAttachmentRetry = clientProperties.getGetAttachmentRetry();
833+
if (getAttachmentRetry != null) {
834+
RetrySettings getAttachmentRetrySettings =
835+
RetryUtil.updateRetrySettings(
836+
clientSettingsBuilder.getAttachmentSettings().getRetrySettings(), getAttachmentRetry);
837+
clientSettingsBuilder.getAttachmentSettings().setRetrySettings(getAttachmentRetrySettings);
838+
if (LOGGER.isTraceEnabled()) {
839+
LOGGER.trace("Configured method-level retry settings for getAttachment from properties.");
840+
}
841+
}
687842
Retry listLocationsRetry = clientProperties.getListLocationsRetry();
688843
if (listLocationsRetry != null) {
689844
RetrySettings listLocationsRetrySettings =

0 commit comments

Comments
 (0)