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

….0 (#3421) * fix(deps): update dependency com.google.cloud:libraries-bom to v26.52.0 * fix unit test --------- Co-authored-by: Joe Wang <joewa@google.com>
GoogleCloudPlatform · Dec 19, 2024 · 5c74e41 · 5c74e41
1 parent b67caa9
commit 5c74e41
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/spring-cloud-gcp-dependencies/pom.xml b/spring-cloud-gcp-dependencies/pom.xml
@@ -34,7 +34,7 @@
 	</distributionManagement>
 
 	<properties>
-		<gcp-libraries-bom.version>26.51.0</gcp-libraries-bom.version>
+		<gcp-libraries-bom.version>26.52.0</gcp-libraries-bom.version>
 		<cloud-sql-socket-factory.version>1.21.0</cloud-sql-socket-factory.version>
 		<r2dbc-postgres-driver.version>1.0.7.RELEASE</r2dbc-postgres-driver.version>
 		<cloud-spanner-r2dbc.version>1.3.0</cloud-spanner-r2dbc.version>

diff --git a/...ub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java b/...ub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java
@@ -19,7 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -47,7 +46,6 @@ public void setUp() throws IOException {
     factory.setCredentialsProvider(NoCredentialsProvider.create());
     TransportChannelProvider mockChannelProvider = mock(TransportChannelProvider.class);
     TransportChannel mockTransportChannel = mock(TransportChannel.class);
-    when(mockChannelProvider.withUseS2A(anyBoolean())).thenReturn(mockChannelProvider);
     when(mockChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel);
     ApiCallContext mockContext = mock(ApiCallContext.class);
     when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockContext);

diff --git a/...b/src/test/java/com/google/cloud/spring/pubsub/support/DefaultSubscriberFactoryTests.java b/...b/src/test/java/com/google/cloud/spring/pubsub/support/DefaultSubscriberFactoryTests.java
@@ -384,9 +384,9 @@ void testCreateSubscriber_validateSetProperties() {
     assertThat(expectedSubscriber.getFlowControlSettings().getLimitExceededBehavior())
         .isEqualTo(FlowController.LimitExceededBehavior.Ignore);
     assertThat(expectedSubscriber)
-        .hasFieldOrPropertyWithValue("maxAckExtensionPeriod", Duration.ofSeconds(2L))
-        .hasFieldOrPropertyWithValue("minDurationPerAckExtension", Duration.ofSeconds(3L))
-        .hasFieldOrPropertyWithValue("maxDurationPerAckExtension", Duration.ofSeconds(4L))
+        .hasFieldOrPropertyWithValue("maxAckExtensionPeriod", java.time.Duration.ofSeconds(2L))
+        .hasFieldOrPropertyWithValue("minDurationPerAckExtension", java.time.Duration.ofSeconds(3L))
+        .hasFieldOrPropertyWithValue("maxDurationPerAckExtension", java.time.Duration.ofSeconds(4L))
         .hasFieldOrPropertyWithValue("numPullers", 2)
         .hasFieldOrPropertyWithValue("subStubSettings.endpoint", "test.endpoint")
         .hasFieldOrPropertyWithValue("subStubSettings.universeDomain", "example.com");

diff --git a/...ter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java b/...ter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java
@@ -18,7 +18,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.when;
 
 import com.google.api.gax.core.CredentialsProvider;
@@ -198,8 +197,6 @@ void testExecutorThreadCountFromProperties() {
   void testCustomTransportChannelProviderUsedWhenProvided() throws IOException {
     when(mockTransportChannelProvider.getTransportName()).thenReturn("grpc");
     when(mockTransportChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel);
-    when(mockTransportChannelProvider.withUseS2A(anyBoolean()))
-        .thenReturn(mockTransportChannelProvider);
     when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockApiCallContext);
     when(mockApiCallContext.withCredentials(any())).thenReturn(mockApiCallContext);
     when(mockApiCallContext.withTransportChannel(any())).thenReturn(mockApiCallContext);