From 51da6e76fc9cfcf2fa73bec48f5517c4e1076c9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jan 2024 04:27:33 +0000 Subject: [PATCH 01/10] 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](https://github.com/googleapis/java-cloud-bom/compare/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] --- spring-cloud-gcp-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-gcp-dependencies/pom.xml b/spring-cloud-gcp-dependencies/pom.xml index 26d1bb912f..89518b01ac 100644 --- a/spring-cloud-gcp-dependencies/pom.xml +++ b/spring-cloud-gcp-dependencies/pom.xml @@ -34,7 +34,7 @@ - 26.30.0 + 26.31.0 1.14.1 1.0.4.RELEASE 1.3.0 From 316d4d8a513d926c47d04257d83a78b505209303 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 30 Jan 2024 14:00:19 -0500 Subject: [PATCH 02/10] chore: Add mock for withEndpointContext --- .../spring/pubsub/support/DefaultPublisherFactoryTests.java | 1 + .../spring/pubsub/support/DefaultSubscriberFactoryTests.java | 1 + 2 files changed, 2 insertions(+) diff --git a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java index bdbab069fa..1fc4e7df42 100644 --- a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java +++ b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java @@ -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); } diff --git a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultSubscriberFactoryTests.java b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultSubscriberFactoryTests.java index 4c339c8182..786c25791d 100644 --- a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultSubscriberFactoryTests.java +++ b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultSubscriberFactoryTests.java @@ -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 = From 139ed0db4f7d3840c9391fd10fba7338ec3b0ca2 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 30 Jan 2024 14:00:52 -0500 Subject: [PATCH 03/10] chore: Add EntitySpannerWriter map entries --- .../convert/ConverterAwareMappingSpannerEntityWriter.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java b/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java index fc08b52651..53f4c61f67 100644 --- a/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java +++ b/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java @@ -41,6 +41,9 @@ import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Predicate; + +import com.google.protobuf.AbstractMessage; +import com.google.protobuf.ProtocolMessageEnum; import org.springframework.data.mapping.PersistentPropertyAccessor; import org.springframework.util.Assert; @@ -106,6 +109,8 @@ private static Map, BiConsumer, Iterable>> createIterabl map.put(boolean[].class, (BiFunction) ValueBinder::toBoolArray); map.put(long[].class, (BiFunction) ValueBinder::toInt64Array); map.put(Struct.class, (BiFunction) ValueBinder::to); + map.put(ProtocolMessageEnum.class, (BiFunction) ValueBinder::to); + map.put(AbstractMessage.class, (BiFunction) ValueBinder::to); singleItemTypeValueBinderMethodMap = Collections.unmodifiableMap(map); } From 13fe1f62932b3ec1e96d514aa45ea143f5bf80cc Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Tue, 30 Jan 2024 15:41:25 -0500 Subject: [PATCH 04/10] chore: Fix checkstyle issues --- .../convert/ConverterAwareMappingSpannerEntityWriter.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java b/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java index 53f4c61f67..f893ea46a0 100644 --- a/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java +++ b/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java @@ -29,6 +29,8 @@ import com.google.cloud.spring.data.spanner.core.mapping.SpannerMappingContext; import com.google.cloud.spring.data.spanner.core.mapping.SpannerPersistentEntity; import com.google.cloud.spring.data.spanner.core.mapping.SpannerPersistentProperty; +import com.google.protobuf.AbstractMessage; +import com.google.protobuf.ProtocolMessageEnum; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -41,9 +43,6 @@ import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Predicate; - -import com.google.protobuf.AbstractMessage; -import com.google.protobuf.ProtocolMessageEnum; import org.springframework.data.mapping.PersistentPropertyAccessor; import org.springframework.util.Assert; From 9c861bf60325b22b3f41d2462395a126bfccf4a6 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Wed, 31 Jan 2024 17:43:42 -0500 Subject: [PATCH 05/10] chore: Fix broken tests --- spring-cloud-gcp-data-spanner/pom.xml | 5 ++++ ...rAwareMappingSpannerEntityWriterTests.java | 25 +++++++++++++++++++ .../spanner/core/convert/TestEntities.java | 14 +++++++++++ .../LanguageAutoConfigurationTests.java | 1 + 4 files changed, 45 insertions(+) diff --git a/spring-cloud-gcp-data-spanner/pom.xml b/spring-cloud-gcp-data-spanner/pom.xml index cc157f8ac9..2182cbafd1 100644 --- a/spring-cloud-gcp-data-spanner/pom.xml +++ b/spring-cloud-gcp-data-spanner/pom.xml @@ -47,5 +47,10 @@ org.springframework spring-tx + + com.google.api.grpc + proto-google-iam-v1 + test + diff --git a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriterTests.java b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriterTests.java index 9ee849d8d6..d0abb0205e 100644 --- a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriterTests.java +++ b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriterTests.java @@ -50,6 +50,8 @@ import com.google.cloud.spring.data.spanner.core.mapping.SpannerMappingContext; import com.google.cloud.spring.data.spanner.test.domain.CommitTimestamps; import com.google.gson.Gson; +import com.google.iam.v1.AuditLogConfig; +import com.google.iam.v1.Policy; import com.google.spanner.v1.TypeCode; import java.math.BigDecimal; import java.time.Instant; @@ -477,6 +479,29 @@ void testCommitTimestampsType() { .allMatch(Value::isCommitTimestamp); } + @Test + public void writeProtocolMessageEnumTest() { + Policy abstractMessage = Policy.newBuilder().build(); + AuditLogConfig protocolMessageEnum = AuditLogConfig.newBuilder().build(); + TestEntities.TestEntityProtobuf testEntity = new TestEntities.TestEntityProtobuf( + "id42", + abstractMessage, + protocolMessageEnum); + + Mutation.WriteBuilder writeBuilder = mock(Mutation.WriteBuilder.class); + ValueBinder valueBinder = mock(ValueBinder.class); + + when(writeBuilder.set("id")).thenReturn(valueBinder); + when(writeBuilder.set("abstractMessage")).thenReturn(valueBinder); + when(writeBuilder.set("protocolMessageEnum")).thenReturn(valueBinder); + + this.spannerEntityWriter.write(testEntity, writeBuilder::set); + + verify(valueBinder).to(testEntity.id); + verify(valueBinder).to(abstractMessage); + verify(valueBinder).to(protocolMessageEnum); + } + /** A test type that cannot be converted. */ static class UserSetUnconvertableColumnType { @PrimaryKey diff --git a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/TestEntities.java b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/TestEntities.java index 9354479923..cfa466cbf6 100644 --- a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/TestEntities.java +++ b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/TestEntities.java @@ -280,4 +280,18 @@ static class Params { this.p2 = p2; } } + + static class TestEntityProtobuf { + @PrimaryKey String id; + + com.google.iam.v1.Policy abstractMessage; + + com.google.iam.v1.AuditLogConfig protocolMessageEnum; + + TestEntityProtobuf(String id, com.google.iam.v1.Policy abstractMessage, com.google.iam.v1.AuditLogConfig protocolMessageEnum) { + this.id = id; + this.abstractMessage = abstractMessage; + this.protocolMessageEnum = protocolMessageEnum; + } + } } diff --git a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java index 517ead400e..2c6d3a6ab2 100644 --- a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java +++ b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java @@ -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( From f0dc7ac4a537b8dbf3c03a6a854d64c99c6e068f Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Fri, 2 Feb 2024 14:19:51 -0500 Subject: [PATCH 06/10] Revert "chore: Fix broken tests" This reverts commit 9c861bf60325b22b3f41d2462395a126bfccf4a6. --- spring-cloud-gcp-data-spanner/pom.xml | 5 ---- ...rAwareMappingSpannerEntityWriterTests.java | 25 ------------------- .../spanner/core/convert/TestEntities.java | 14 ----------- .../LanguageAutoConfigurationTests.java | 1 - 4 files changed, 45 deletions(-) diff --git a/spring-cloud-gcp-data-spanner/pom.xml b/spring-cloud-gcp-data-spanner/pom.xml index 2182cbafd1..cc157f8ac9 100644 --- a/spring-cloud-gcp-data-spanner/pom.xml +++ b/spring-cloud-gcp-data-spanner/pom.xml @@ -47,10 +47,5 @@ org.springframework spring-tx - - com.google.api.grpc - proto-google-iam-v1 - test - diff --git a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriterTests.java b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriterTests.java index d0abb0205e..9ee849d8d6 100644 --- a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriterTests.java +++ b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriterTests.java @@ -50,8 +50,6 @@ import com.google.cloud.spring.data.spanner.core.mapping.SpannerMappingContext; import com.google.cloud.spring.data.spanner.test.domain.CommitTimestamps; import com.google.gson.Gson; -import com.google.iam.v1.AuditLogConfig; -import com.google.iam.v1.Policy; import com.google.spanner.v1.TypeCode; import java.math.BigDecimal; import java.time.Instant; @@ -479,29 +477,6 @@ void testCommitTimestampsType() { .allMatch(Value::isCommitTimestamp); } - @Test - public void writeProtocolMessageEnumTest() { - Policy abstractMessage = Policy.newBuilder().build(); - AuditLogConfig protocolMessageEnum = AuditLogConfig.newBuilder().build(); - TestEntities.TestEntityProtobuf testEntity = new TestEntities.TestEntityProtobuf( - "id42", - abstractMessage, - protocolMessageEnum); - - Mutation.WriteBuilder writeBuilder = mock(Mutation.WriteBuilder.class); - ValueBinder valueBinder = mock(ValueBinder.class); - - when(writeBuilder.set("id")).thenReturn(valueBinder); - when(writeBuilder.set("abstractMessage")).thenReturn(valueBinder); - when(writeBuilder.set("protocolMessageEnum")).thenReturn(valueBinder); - - this.spannerEntityWriter.write(testEntity, writeBuilder::set); - - verify(valueBinder).to(testEntity.id); - verify(valueBinder).to(abstractMessage); - verify(valueBinder).to(protocolMessageEnum); - } - /** A test type that cannot be converted. */ static class UserSetUnconvertableColumnType { @PrimaryKey diff --git a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/TestEntities.java b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/TestEntities.java index cfa466cbf6..9354479923 100644 --- a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/TestEntities.java +++ b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/TestEntities.java @@ -280,18 +280,4 @@ static class Params { this.p2 = p2; } } - - static class TestEntityProtobuf { - @PrimaryKey String id; - - com.google.iam.v1.Policy abstractMessage; - - com.google.iam.v1.AuditLogConfig protocolMessageEnum; - - TestEntityProtobuf(String id, com.google.iam.v1.Policy abstractMessage, com.google.iam.v1.AuditLogConfig protocolMessageEnum) { - this.id = id; - this.abstractMessage = abstractMessage; - this.protocolMessageEnum = protocolMessageEnum; - } - } } diff --git a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java index 2c6d3a6ab2..517ead400e 100644 --- a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java +++ b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java @@ -195,7 +195,6 @@ 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( From a9e2b17843dd51a75d36d25700dc6ae182885a19 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Fri, 2 Feb 2024 14:52:24 -0500 Subject: [PATCH 07/10] chore: Revert the additional spapner type addition --- .../convert/ConverterAwareMappingSpannerEntityWriter.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java b/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java index f893ea46a0..fc08b52651 100644 --- a/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java +++ b/spring-cloud-gcp-data-spanner/src/main/java/com/google/cloud/spring/data/spanner/core/convert/ConverterAwareMappingSpannerEntityWriter.java @@ -29,8 +29,6 @@ import com.google.cloud.spring.data.spanner.core.mapping.SpannerMappingContext; import com.google.cloud.spring.data.spanner.core.mapping.SpannerPersistentEntity; import com.google.cloud.spring.data.spanner.core.mapping.SpannerPersistentProperty; -import com.google.protobuf.AbstractMessage; -import com.google.protobuf.ProtocolMessageEnum; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -108,8 +106,6 @@ private static Map, BiConsumer, Iterable>> createIterabl map.put(boolean[].class, (BiFunction) ValueBinder::toBoolArray); map.put(long[].class, (BiFunction) ValueBinder::toInt64Array); map.put(Struct.class, (BiFunction) ValueBinder::to); - map.put(ProtocolMessageEnum.class, (BiFunction) ValueBinder::to); - map.put(AbstractMessage.class, (BiFunction) ValueBinder::to); singleItemTypeValueBinderMethodMap = Collections.unmodifiableMap(map); } From da3301634c7d86bab812c5a2c7df5407b7f20669 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Fri, 2 Feb 2024 15:34:00 -0500 Subject: [PATCH 08/10] chore: Ignore new spanner types --- .../core/convert/SpannerWriteMethodCoverageTests.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java index 958c60b04f..01f2052150 100644 --- a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java +++ b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java @@ -24,6 +24,8 @@ 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. */ @@ -33,6 +35,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(); From c0181d63f5aa2cd702c0898bab10b5badea2ad65 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Fri, 2 Feb 2024 15:40:12 -0500 Subject: [PATCH 09/10] chore: Fix checkstyle issues --- .../spanner/core/convert/SpannerWriteMethodCoverageTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java index 01f2052150..ae0c4513db 100644 --- a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java +++ b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java @@ -25,7 +25,6 @@ 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. */ From 812be9cb9fd842551a10b747a79790cad5e3bbee Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Fri, 2 Feb 2024 16:22:53 -0500 Subject: [PATCH 10/10] chore: Fix language test --- .../cloud/language/v2/spring/LanguageAutoConfigurationTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java index 517ead400e..2c6d3a6ab2 100644 --- a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java +++ b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java @@ -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(