Changes for Boot 4.0.0-RC1

ryanjbaxter · ryanjbaxter · commit 06273d1778a5 · 2025-10-27T20:19:03.000-04:00
Also fixes #284
diff --git a/spring-cloud-bus-tests/pom.xml b/spring-cloud-bus-tests/pom.xml
@@ -50,17 +50,22 @@
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>junit-jupiter</artifactId>
+			<artifactId>testcontainers-junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
-			<artifactId>rabbitmq</artifactId>
+			<artifactId>testcontainers-rabbitmq</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-restclient</artifactId>
+			<artifactId>spring-boot-resttestclient</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-webtestclient</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/spring-cloud-bus-tests/src/test/java/org/springframework/cloud/bus/BusAmqpIntegrationTests.java b/spring-cloud-bus-tests/src/test/java/org/springframework/cloud/bus/BusAmqpIntegrationTests.java
@@ -23,15 +23,16 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.RabbitMQContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.rabbitmq.RabbitMQContainer;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
 import org.springframework.cloud.bus.event.EnvironmentChangeRemoteApplicationEvent;
 import org.springframework.cloud.stream.binder.ProducerProperties;
 import org.springframework.cloud.stream.config.BindingServiceProperties;
@@ -49,6 +50,7 @@
 		"logging.level.org.springframework.cloud.bus=TRACE", "spring.cloud.bus.id=app:1",
 		"spring.autoconfigure.exclude=org.springframework.cloud.stream.test.binder.TestSupportBinderAutoConfiguration" })
 @Testcontainers
+@AutoConfigureWebTestClient
 public class BusAmqpIntegrationTests {
 
 	@Container
diff --git a/spring-cloud-bus-tests/src/test/java/org/springframework/cloud/bus/ShutdownListenerIntegrationTests.java b/spring-cloud-bus-tests/src/test/java/org/springframework/cloud/bus/ShutdownListenerIntegrationTests.java
@@ -21,16 +21,17 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.RabbitMQContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.rabbitmq.RabbitMQContainer;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
 import org.springframework.cloud.bus.event.EnvironmentChangeRemoteApplicationEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -47,6 +48,7 @@
 				"spring.cloud.stream.bindings.springCloudBusOutput.producer.errorChannelEnabled=true",
 				"logging.level.org.springframework.cloud.bus=TRACE", "spring.cloud.bus.id=app:1" })
 @Testcontainers
+@AutoConfigureWebTestClient
 public class ShutdownListenerIntegrationTests {
 
 	private static ConfigurableApplicationContext context;
diff --git a/spring-cloud-bus-tests/src/test/java/org/springframework/cloud/bus/jackson/BusJacksonIntegrationTests.java b/spring-cloud-bus-tests/src/test/java/org/springframework/cloud/bus/jackson/BusJacksonIntegrationTests.java
@@ -29,9 +29,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.resttestclient.TestRestTemplate;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.test.LocalServerPort;
-import org.springframework.boot.web.server.test.client.TestRestTemplate;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.cloud.bus.ServiceMatcher;
 import org.springframework.cloud.bus.event.RemoteApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
@@ -48,8 +49,10 @@
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 import static tools.jackson.databind.cfg.DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS;
 
-@SpringBootTest(properties = "spring.jackson.datetime.write-dates-as-timestamps=true", webEnvironment = RANDOM_PORT)
+@SpringBootTest(properties = "spring.jackson.datatype.datetime.write-dates-as-timestamps=true",
+		webEnvironment = RANDOM_PORT)
 @DirtiesContext
+@AutoConfigureTestRestTemplate
 public class BusJacksonIntegrationTests {
 
 	@LocalServerPort
diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml
@@ -79,7 +79,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-restclient</artifactId>
+			<artifactId>spring-boot-resttestclient</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/AckRemoteApplicationEvent.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/AckRemoteApplicationEvent.java
@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.bus.event;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -37,6 +38,7 @@ public class AckRemoteApplicationEvent extends RemoteApplicationEvent {
 	private Class<? extends RemoteApplicationEvent> event;
 
 	@SuppressWarnings("unused")
+	@JsonCreator
 	private AckRemoteApplicationEvent() {
 		super();
 		this.ackDestinationService = null;
diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/EnvironmentChangeRemoteApplicationEvent.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/EnvironmentChangeRemoteApplicationEvent.java
@@ -27,7 +27,8 @@
 @SuppressWarnings("serial")
 public class EnvironmentChangeRemoteApplicationEvent extends RemoteApplicationEvent {
 
-	private final Map<String, String> values;
+	// Do not make this final or Jackson 3 cannot set it when serializing the object
+	private Map<String, String> values;
 
 	@SuppressWarnings("unused")
 	private EnvironmentChangeRemoteApplicationEvent() {
diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/ShutdownRemoteApplicationEvent.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/ShutdownRemoteApplicationEvent.java
@@ -16,6 +16,8 @@
 
 package org.springframework.cloud.bus.event;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+
 /**
  * Event which indicates the application should be shutdown.
  *
@@ -24,6 +26,7 @@
 public class ShutdownRemoteApplicationEvent extends RemoteApplicationEvent {
 
 	@SuppressWarnings("unused")
+	@JsonCreator
 	private ShutdownRemoteApplicationEvent() {
 		// for serializers
 	}
diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/jackson/BusJacksonAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/jackson/BusJacksonAutoConfiguration.java
@@ -69,7 +69,7 @@ public class BusJacksonAutoConfiguration {
 	// otherwise RemoteApplicationEventRegistrar will register the bean
 	@Bean
 	@ConditionalOnMissingBean(name = "busJsonConverter")
-	public AbstractMessageConverter busJsonConverter(@Autowired(required = false) ObjectMapper objectMapper) {
+	public AbstractMessageConverter busJsonConverter(@Autowired(required = false) JsonMapper objectMapper) {
 		return new BusJacksonMessageConverter(objectMapper);
 	}
 
@@ -78,8 +78,8 @@ public AbstractMessageConverter busJsonConverter(@Autowired(required = false) Ob
 	protected static class CborConfiguration {
 
 		@Bean
-		public AbstractMessageConverter busCborConverter() {
-			return new BusJacksonMessageConverter(new MimeType("application", "cbor"), CBORMapper.builder().build());
+		public AbstractMessageConverter busCborConverter(CBORMapper objectMapper) {
+			return new BusJacksonMessageConverter(new MimeType("application", "cbor"), objectMapper);
 		}
 
 	}
diff --git a/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/RefreshListenerIntegrationTests.java b/spring-cloud-bus/src/test/java/org/springframework/cloud/bus/RefreshListenerIntegrationTests.java
@@ -23,8 +23,9 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.resttestclient.TestRestTemplate;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.test.client.TestRestTemplate;
 import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
@@ -43,6 +44,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		classes = RefreshListenerIntegrationTests.MyApp.class,
 		properties = { "management.endpoints.web.exposure.include=*", "spring.application.name=foobar" })
+@AutoConfigureTestRestTemplate
 public class RefreshListenerIntegrationTests {
 
 	@Autowired

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`
`17`	`17`	`package org.springframework.cloud.bus.event;`
`18`	`18`
	`19`	`+import com.fasterxml.jackson.annotation.JsonCreator;`
	`20`	`+`
`19`	`21`	`/**`
`20`	`22`	`* Event which indicates the application should be shutdown.`
`21`	`23`	`*`
`@@ -24,6 +26,7 @@`
`24`	`26`	`public class ShutdownRemoteApplicationEvent extends RemoteApplicationEvent {`
`25`	`27`
`26`	`28`	`@SuppressWarnings("unused")`
	`29`	`+ @JsonCreator`
`27`	`30`	`private ShutdownRemoteApplicationEvent() {`
`28`	`31`	`// for serializers`
`29`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public class BusJacksonAutoConfiguration {`
`69`	`69`	`// otherwise RemoteApplicationEventRegistrar will register the bean`
`70`	`70`	`@Bean`
`71`	`71`	`@ConditionalOnMissingBean(name = "busJsonConverter")`
`72`		`- public AbstractMessageConverter busJsonConverter(@Autowired(required = false) ObjectMapper objectMapper) {`
	`72`	`+ public AbstractMessageConverter busJsonConverter(@Autowired(required = false) JsonMapper objectMapper) {`
`73`	`73`	`return new BusJacksonMessageConverter(objectMapper);`
`74`	`74`	`}`
`75`	`75`
`@@ -78,8 +78,8 @@ public AbstractMessageConverter busJsonConverter(@Autowired(required = false) Ob`
`78`	`78`	`protected static class CborConfiguration {`
`79`	`79`
`80`	`80`	`@Bean`
`81`		`- public AbstractMessageConverter busCborConverter() {`
`82`		`- return new BusJacksonMessageConverter(new MimeType("application", "cbor"), CBORMapper.builder().build());`
	`81`	`+ public AbstractMessageConverter busCborConverter(CBORMapper objectMapper) {`
	`82`	`+ return new BusJacksonMessageConverter(new MimeType("application", "cbor"), objectMapper);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`}`