Skip to content

Commit 998399d

Browse files
chore: update libraries bom 4.x (#3426)
* chore: update libraries-bom * rm method * trigger ci * Update DefaultSubscriberFactoryTests.java * fix unit test * reformat --------- Co-authored-by: Diego Marquez <diegomarquezp@google.com>
1 parent d50a28f commit 998399d

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

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.51.0</gcp-libraries-bom.version>
37+
<gcp-libraries-bom.version>26.52.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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
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;
2322
import static org.mockito.Mockito.mock;
2423
import static org.mockito.Mockito.when;
2524

@@ -47,7 +46,6 @@ public void setUp() throws IOException {
4746
factory.setCredentialsProvider(NoCredentialsProvider.create());
4847
TransportChannelProvider mockChannelProvider = mock(TransportChannelProvider.class);
4948
TransportChannel mockTransportChannel = mock(TransportChannel.class);
50-
when(mockChannelProvider.withUseS2A(anyBoolean())).thenReturn(mockChannelProvider);
5149
when(mockChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel);
5250
ApiCallContext mockContext = mock(ApiCallContext.class);
5351
when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockContext);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,9 @@ void testCreateSubscriber_validateSetProperties() {
381381
assertThat(expectedSubscriber.getFlowControlSettings().getLimitExceededBehavior())
382382
.isEqualTo(FlowController.LimitExceededBehavior.Ignore);
383383
assertThat(expectedSubscriber)
384-
.hasFieldOrPropertyWithValue("maxAckExtensionPeriod", Duration.ofSeconds(2L))
385-
.hasFieldOrPropertyWithValue("minDurationPerAckExtension", Duration.ofSeconds(3L))
386-
.hasFieldOrPropertyWithValue("maxDurationPerAckExtension", Duration.ofSeconds(4L))
384+
.hasFieldOrPropertyWithValue("maxAckExtensionPeriod", java.time.Duration.ofSeconds(2L))
385+
.hasFieldOrPropertyWithValue("minDurationPerAckExtension", java.time.Duration.ofSeconds(3L))
386+
.hasFieldOrPropertyWithValue("maxDurationPerAckExtension", java.time.Duration.ofSeconds(4L))
387387
.hasFieldOrPropertyWithValue("numPullers", 2)
388388
.hasFieldOrPropertyWithValue("subStubSettings.endpoint", "test.endpoint");
389389
}

spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,6 @@ void testExecutorThreadCountFromProperties() {
197197
void testCustomTransportChannelProviderUsedWhenProvided() throws IOException {
198198
when(mockTransportChannelProvider.getTransportName()).thenReturn("grpc");
199199
when(mockTransportChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel);
200-
when(mockTransportChannelProvider.withUseS2A(anyBoolean()))
201-
.thenReturn(mockTransportChannelProvider);
202200
when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockApiCallContext);
203201
when(mockApiCallContext.withCredentials(any())).thenReturn(mockApiCallContext);
204202
when(mockApiCallContext.withTransportChannel(any())).thenReturn(mockApiCallContext);

0 commit comments

Comments
 (0)