feat!: Spring Cloud 2023 and Spring Boot 3.2.0 (#2438)

* BREAKING CHANGE: Spring Cloud 2023 and Spring Boot 3.2.0 * deps: spring-cloud-build 4.1.0 * fix: don't base AutoConfiguration enable check on bean that is now auto-created by Spring Boot 3.2 (See https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.2-Release-Notes#observability-improvements) * fix: use @DisabledInAotMode for incompatible features * fix: use @DisabledInAotMode for incompatible features * fix: add trace-class-initialization for AotDetector * fix: disable incompatible native tests
GoogleCloudPlatform · Dec 13, 2023 · ee4a9d6 · ee4a9d6
1 parent e7e7a83
commit ee4a9d6
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 15 deletions.
diff --git a/.github/workflows/NativeTests.yaml b/.github/workflows/NativeTests.yaml
@@ -27,9 +27,9 @@ jobs:
         it:
           - bigquery-sample
           - core
-          - data-firestore
+          #- data-firestore ## https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2455
           - data-firestore-sample
-          - datastore
+          #- datastore ## https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2455
           - datastore-basic-sample
           - kms
           - kms-sample
@@ -38,7 +38,7 @@ jobs:
           - pubsub-sample
           - pubsub-bus-sample
           - pubsub-integration-sample
-          - pubsub-stream-sample
+          #- pubsub-stream-sample ## https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2456
           - secretmanager
           - secretmanager-sample
           - spanner

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.0.5</version>
+		<version>4.1.0</version>
 		<relativePath/>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -36,8 +36,8 @@
 	<properties>
 		<project.parent.version>${project.version}</project.parent.version>
 		<!-- Dependency versions -->
-		<spring-cloud-dependencies.version>2022.0.4</spring-cloud-dependencies.version>
-		<spring-boot-dependencies.version>3.1.5</spring-boot-dependencies.version>
+		<spring-cloud-dependencies.version>2023.0.0</spring-cloud-dependencies.version>
+		<spring-boot-dependencies.version>3.2.0</spring-boot-dependencies.version>
 		<spring-cloud-gcp-dependencies.version>${project.parent.version}</spring-cloud-gcp-dependencies.version>
 		<zipkin-gcp.version>1.0.4</zipkin-gcp.version>
 		<java-cfenv.version>2.5.0</java-cfenv.version>

diff --git a/.../com/google/cloud/spring/autoconfigure/trace/pubsub/TracePubSubAutoConfigurationTest.java b/.../com/google/cloud/spring/autoconfigure/trace/pubsub/TracePubSubAutoConfigurationTest.java
@@ -86,13 +86,13 @@ void test() {
 
   @Test
   void testPubSubTracingDisabledByDefault() {
-    this.contextRunner.run(
-        context -> {
-          assertThat(context.getBeansOfType(TracePubSubBeanPostProcessor.class)).isEmpty();
-          assertThat(context.getBeansOfType(PubSubTracing.class)).isEmpty();
-          assertThat(context.getBeansOfType(MessagingTracing.class)).isEmpty();
-          assertThat(context.getBeansOfType(ObservedAspect.class)).isEmpty();
-        });
+    this.contextRunner
+        .run(
+            context -> {
+              assertThat(context.getBeansOfType(TracePubSubBeanPostProcessor.class)).isEmpty();
+              assertThat(context.getBeansOfType(PubSubTracing.class)).isEmpty();
+              assertThat(context.getBeansOfType(MessagingTracing.class)).isEmpty();
+            });
   }
 
   @Test

diff --git a/...test/java/com/google/cloud/spring/data/datastore/core/DatastoreTemplateAuditingTests.java b/...test/java/com/google/cloud/spring/data/datastore/core/DatastoreTemplateAuditingTests.java
@@ -44,11 +44,13 @@
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /** Tests the auditing features of the template. */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
+@DisabledInAotMode
 class DatastoreTemplateAuditingTests {
 
   private static final Instant LONG_AGO = Instant.parse("2000-01-01T00:00:00.00Z");

diff --git a/...t/java/com/google/cloud/spring/data/datastore/core/DatastoreTransactionTemplateTests.java b/...t/java/com/google/cloud/spring/data/datastore/core/DatastoreTransactionTemplateTests.java
@@ -45,6 +45,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.annotation.Id;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Isolation;
@@ -57,6 +58,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
+@DisabledInAotMode
 class DatastoreTransactionTemplateTests {
 
   private final Key key = Key.newBuilder("a", "b", "c").build();

diff --git a/...re/src/test/java/com/google/cloud/spring/data/datastore/it/DatastoreIntegrationTests.java b/...re/src/test/java/com/google/cloud/spring/data/datastore/it/DatastoreIntegrationTests.java
@@ -97,6 +97,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.util.AopTestUtils;
 import org.springframework.transaction.TransactionSystemException;
@@ -106,6 +107,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {DatastoreIntegrationTestConfiguration.class})
 @ImportRuntimeHints({TestRuntimeHints.class})
+@DisabledInAotMode
 class DatastoreIntegrationTests extends AbstractDatastoreIntegrationTests {
 
   // This value is multiplied against recorded actual times needed to wait for eventual
@@ -712,6 +714,7 @@ void referenceTest() {
 
   @Test
   @DisabledInNativeImage
+  @DisabledInAotMode
   void lazyReferenceCollectionTest() {
     ReferenceLazyEntity parent = saveEntitiesGraph();
 
@@ -728,6 +731,7 @@ void lazyReferenceCollectionTest() {
 
   @Test
   @DisabledInNativeImage
+  @DisabledInAotMode
   void lazyReferenceTest() throws InterruptedException {
     LazyEntity lazyParentEntity = new LazyEntity(new LazyEntity(new LazyEntity()));
     this.datastoreTemplate.save(lazyParentEntity);
@@ -744,6 +748,7 @@ void lazyReferenceTest() throws InterruptedException {
 
   @Test
   @DisabledInNativeImage
+  @DisabledInAotMode
   void singularLazyPropertyTest() {
     LazyEntity lazyParentEntity = new LazyEntity(new LazyEntity(new LazyEntity()));
     this.datastoreTemplate.save(lazyParentEntity);
@@ -755,6 +760,7 @@ void singularLazyPropertyTest() {
 
   @Test
   @DisabledInNativeImage
+  @DisabledInAotMode
   void lazyReferenceTransactionTest() {
     ReferenceLazyEntity parent = saveEntitiesGraph();
 

diff --git a/...t/java/com/google/cloud/spring/data/datastore/it/DatastoreProjectionIntegrationTests.java b/...t/java/com/google/cloud/spring/data/datastore/it/DatastoreProjectionIntegrationTests.java
@@ -46,10 +46,12 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Slice;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /** Projection tests separated from DatastoreIntegrationTests.java that needs mockito */
 @DisabledInNativeImage
+@DisabledInAotMode
 @EnabledIfSystemProperty(named = "it.datastore", matches = "true")
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {DatastoreIntegrationTestConfiguration.class})

diff --git a/...est/java/com/google/cloud/spring/data/datastore/it/ParallelDatastoreIntegrationTests.java b/...est/java/com/google/cloud/spring/data/datastore/it/ParallelDatastoreIntegrationTests.java
@@ -28,12 +28,14 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /** Tests performing many operations at the same time using single instances of the repository. */
 @EnabledIfSystemProperty(named = "it.datastore", matches = "true")
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {DatastoreIntegrationTestConfiguration.class})
+@DisabledInAotMode
 class ParallelDatastoreIntegrationTests extends AbstractDatastoreIntegrationTests {
 
   private static final int PARALLEL_OPERATIONS = 10;

diff --git a/...pring/data/datastore/it/subclasses/descendants/SubclassesDescendantsIntegrationTests.java b/...pring/data/datastore/it/subclasses/descendants/SubclassesDescendantsIntegrationTests.java
@@ -29,15 +29,18 @@
 import java.util.List;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledInNativeImage;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @EnabledIfSystemProperty(named = "it.datastore", matches = "true")
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {DatastoreIntegrationTestConfiguration.class})
+@DisabledInAotMode
 class SubclassesDescendantsIntegrationTests extends AbstractDatastoreIntegrationTests {
 
   @Autowired SubclassesDescendantsEntityArepository entityArepository;

diff --git a/.../spring/data/datastore/it/subclasses/references/SubclassesReferencesIntegrationTests.java b/.../spring/data/datastore/it/subclasses/references/SubclassesReferencesIntegrationTests.java
@@ -32,11 +32,13 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @EnabledIfSystemProperty(named = "it.datastore", matches = "true")
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {DatastoreIntegrationTestConfiguration.class})
+@DisabledInAotMode
 class SubclassesReferencesIntegrationTests extends AbstractDatastoreIntegrationTests {
 
   @Autowired SubclassesReferencesEntityArepository entityArepository;

diff --git a/...google/cloud/spring/data/firestore/it/FirestoreRepositoryTransactionIntegrationTests.java b/...google/cloud/spring/data/firestore/it/FirestoreRepositoryTransactionIntegrationTests.java
@@ -33,6 +33,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.reactive.TransactionalOperator;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -42,6 +43,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = FirestoreTransactionIntegrationTestsConfiguration.class)
 @DisabledInNativeImage
+@DisabledInAotMode
 class FirestoreRepositoryTransactionIntegrationTests {
   // tag::autowire[]
   @Autowired UserRepository userRepository;

diff --git a/.../java/com/google/cloud/spring/data/firestore/it/FirestoreTransactionIntegrationTests.java b/.../java/com/google/cloud/spring/data/firestore/it/FirestoreTransactionIntegrationTests.java
@@ -39,6 +39,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.reactive.TransactionalOperator;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -50,6 +51,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = FirestoreTransactionIntegrationTestsConfiguration.class)
 @DisabledInNativeImage
+@DisabledInAotMode
 class FirestoreTransactionIntegrationTests {
 
   @Autowired FirestoreTemplate firestoreTemplate;

diff --git a/...src/test/java/com/google/cloud/spring/data/spanner/core/SpannerTemplateAuditingTests.java b/...src/test/java/com/google/cloud/spring/data/spanner/core/SpannerTemplateAuditingTests.java
@@ -41,11 +41,13 @@
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /** Tests the auditing features of the template. */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
+@DisabledInAotMode
 class SpannerTemplateAuditingTests {
 
   private static final List<Mutation> UPSERT_MUTATION =

diff --git a/...ava/com/google/cloud/spring/data/spanner/core/SpannerTemplateTransactionManagerTests.java b/...ava/com/google/cloud/spring/data/spanner/core/SpannerTemplateTransactionManagerTests.java
@@ -52,13 +52,15 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
 /** Tests for Spanner Template when using transactional annotation. */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
+@DisabledInAotMode
 class SpannerTemplateTransactionManagerTests {
   private static final List<Mutation> INSERT_MUTATION =
       Arrays.asList(Mutation.newInsertBuilder("custom_test_table").build());

diff --git a/spring-cloud-gcp-samples/pom.xml b/spring-cloud-gcp-samples/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.5</version>
+		<version>3.2.0</version>
 		<relativePath/>
 	</parent>
 

diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/pom.xml b/spring-cloud-gcp-samples/spring-cloud-gcp-pubsub-bus-config-sample/pom.xml
@@ -14,7 +14,7 @@
     <name>Spring Framework on Google Cloud Code Sample - Pub/Sub Bus Configuration Management</name>
 
     <properties>
-        <spring-cloud-config.version>4.0.4</spring-cloud-config.version>
+        <spring-cloud-config.version>4.1.0</spring-cloud-config.version>
     </properties>
 
     <!-- The Spring Framework on Google Cloud BOM will manage spring-cloud-gcp version numbers for you. -->

diff --git a/.../com/google/cloud/spring/storage/integration/inbound/GcsInboundFileSynchronizerTests.java b/.../com/google/cloud/spring/storage/integration/inbound/GcsInboundFileSynchronizerTests.java
@@ -47,12 +47,14 @@
 import org.springframework.integration.file.filters.AcceptOnceFileListFilter;
 import org.springframework.messaging.Message;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /** Tests for inbound file synchronizer. */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
+@DisabledInAotMode
 class GcsInboundFileSynchronizerTests {
 
   @Autowired private Storage gcs;

diff --git a/...a/com/google/cloud/spring/storage/integration/inbound/GcsStreamingMessageSourceTests.java b/...a/com/google/cloud/spring/storage/integration/inbound/GcsStreamingMessageSourceTests.java
@@ -46,11 +46,13 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.PollableChannel;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /** Tests for the streaming message source. */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
+@DisabledInAotMode
 class GcsStreamingMessageSourceTests {
 
   @Autowired private PollableChannel unsortedChannel;

diff --git a/...est/java/com/google/cloud/spring/storage/integration/outbound/GcsMessageHandlerTests.java b/...est/java/com/google/cloud/spring/storage/integration/outbound/GcsMessageHandlerTests.java
@@ -49,11 +49,13 @@
 import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.support.GenericMessage;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /** Tests for the message handler. */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
+@DisabledInAotMode
 class GcsMessageHandlerTests {
 
   private static Storage GCS;