Skip to content

Commit

Permalink
deps: bump com.google.cloud:libraries-bom from 26.30.0 to 26.31.0 (#2565
Browse files Browse the repository at this point in the history
)

* deps: bump com.google.cloud:libraries-bom from 26.30.0 to 26.31.0

Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.30.0 to 26.31.0.
- [Release notes](https://github.com/googleapis/java-cloud-bom/releases)
- [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json)
- [Commits](googleapis/java-cloud-bom@v26.30.0...v26.31.0)

---
updated-dependencies:
- dependency-name: com.google.cloud:libraries-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: Add mock for withEndpointContext

* chore: Add EntitySpannerWriter map entries

* chore: Fix checkstyle issues

* chore: Fix broken tests

* Revert "chore: Fix broken tests"

This reverts commit 9c861bf.

* chore: Revert the additional spapner type addition

* chore: Ignore new spanner types

* chore: Fix checkstyle issues

* chore: Fix language test

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lawrence Qiu <lawrenceqiu@google.com>
  • Loading branch information
dependabot[bot] and lqiu96 committed Feb 5, 2024
1 parent ab0f4df commit 6efd6d0
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.util.Arrays;
import org.junit.jupiter.api.Test;

/** Tests to check for new mapping methods that appear in the Spanner client lib. */
Expand All @@ -33,6 +34,14 @@ class SpannerWriteMethodCoverageTests {
@Test
void allKnownMappingTypesTest() throws NoSuchFieldException {
for (Method method : ValueBinder.class.getMethods()) {
// TODO: https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2574
// Until this is implemented, ignore the new column types by ignoring the methods
// that have the new column types as a parameter
if (Arrays.stream(method.getParameterTypes()).map(Class::getName)
.anyMatch(x -> x.contains("ProtocolMessageEnum")
|| x.contains("AbstractMessage"))) {
continue;
}

String methodName = method.getName();

Expand Down
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.30.0</gcp-libraries-bom.version>
<gcp-libraries-bom.version>26.31.0</gcp-libraries-bom.version>
<cloud-sql-socket-factory.version>1.14.1</cloud-sql-socket-factory.version>
<r2dbc-postgres-driver.version>1.0.4.RELEASE</r2dbc-postgres-driver.version>
<cloud-spanner-r2dbc.version>1.3.0</cloud-spanner-r2dbc.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public void setUp() throws IOException {
ApiCallContext mockContext = mock(ApiCallContext.class);
when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockContext);
when(mockContext.withTransportChannel(any())).thenReturn(mockContext);
when(mockContext.withEndpointContext(any())).thenReturn(mockContext);
factory.setChannelProvider(mockChannelProvider);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,7 @@ void createSubscriberStubSucceeds() {
when(this.mockTransportChannel.getEmptyCallContext()).thenReturn(this.mockApiCallContext);
when(this.mockApiCallContext.withCredentials(any())).thenReturn(this.mockApiCallContext);
when(this.mockApiCallContext.withTransportChannel(any())).thenReturn(this.mockApiCallContext);
when(this.mockApiCallContext.withEndpointContext(any())).thenReturn(this.mockApiCallContext);

GcpProjectIdProvider projectIdProvider = () -> "project";
DefaultSubscriberFactory factory =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ void testCustomTransportChannelProviderUsedWhenProvided() throws IOException {
when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockApiCallContext);
when(mockApiCallContext.withCredentials(any())).thenReturn(mockApiCallContext);
when(mockApiCallContext.withTransportChannel(any())).thenReturn(mockApiCallContext);
when(mockApiCallContext.withEndpointContext(any())).thenReturn(mockApiCallContext);

contextRunner
.withBean(
Expand Down

0 comments on commit 6efd6d0

Please sign in to comment.