Start version 7.0

* Upgrade to the latest dependencies, including Spring Boot 4.0
* Spring Boot 4.0 has split an auto-configuration modules to many much smaller.
Therefore, we have to include specific starter or that module in some places
* Migrate JUnit 4 tests to JUnit Jupiter
* Fix JPA 3.2 deprecations
* Fix WebSocket samples to add required `handshakeHandler` bean

Author: artembilan

advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java

@@ -16,23 +16,17 @@
 
 package org.springframework.integration.samples.advance.testing.jms;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.BDDMockito.willAnswer;
-import static org.mockito.BDDMockito.willReturn;
-import static org.mockito.Mockito.mock;
-
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import jakarta.jms.JMSException;
+import jakarta.jms.TextMessage;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 
@@ -49,18 +43,21 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-import jakarta.jms.JMSException;
-import jakarta.jms.TextMessage;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.BDDMockito.willAnswer;
+import static org.mockito.BDDMockito.willReturn;
+import static org.mockito.Mockito.mock;
 
 /**
  * @author David Turanski
  * @author Gunnar Hillert
  * @author Gary Russell
  * @author Artem Bilan
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@SpringJUnitConfig
 @ContextConfiguration
 @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
 public class JmsMockTests {
@@ -87,8 +84,7 @@ public class JmsMockTests {
 	@Qualifier("invalidMessageChannel")
 	private SubscribableChannel invalidMessageChannel;
 
-
-	@Before
+	@BeforeEach
 	public void setup() throws JMSException {
 		Mockito.reset(this.mockJmsTemplate);
 		TextMessage message = mock(TextMessage.class);
@@ -99,18 +95,13 @@ public void setup() throws JMSException {
 		willReturn(message)
 				.given(this.mockJmsTemplate).receiveSelected(isNull());
 
-
 		willAnswer((Answer<String>) invocation -> testMessageHolder.get())
 				.given(message).getText();
 	}
 
 	/**
 	 * This test verifies that a message received on a polling JMS inbound channel adapter is
 	 * routed to the designated channel and that the message payload is as expected
-	 *
-	 * @throws JMSException
-	 * @throws InterruptedException
-	 * @throws IOException
 	 */
 	@Test
 	public void testReceiveMessage() throws JMSException, InterruptedException, IOException {
@@ -120,20 +111,16 @@ public void testReceiveMessage() throws JMSException, InterruptedException, IOEx
 
 					@Override
 					protected void verifyMessage(Message<?> message) {
-						assertEquals("hello", message.getPayload());
+						assertThat(message.getPayload()).isEqualTo("hello");
 					}
 				}
 		);
-		assertTrue("message not sent to expected output channel", sent);
+		assertThat(sent).as("message not sent to expected output channel").isTrue();
 	}
 
 	/**
 	 * This test verifies that a message received on a polling JMS inbound channel adapter is
 	 * routed to the errorChannel and that the message payload is the expected exception
-	 *
-	 * @throws JMSException
-	 * @throws IOException
-	 * @throws InterruptedException
 	 */
 	@Test
 	public void testReceiveInvalidMessage() throws JMSException, IOException, InterruptedException {
@@ -142,12 +129,12 @@ public void testReceiveInvalidMessage() throws JMSException, IOException, Interr
 
 					@Override
 					protected void verifyMessage(Message<?> message) {
-						assertEquals("invalid payload", message.getPayload());
+						assertThat(message.getPayload()).isEqualTo("invalid payload");
 					}
 
 				}
 		);
-		assertTrue("message not sent to expected output channel", sent);
+		assertThat(sent).as("message not sent to expected output channel").isTrue();
 	}
 
 	/**
@@ -157,15 +144,13 @@ protected void verifyMessage(Message<?> message) {
 	 * @param expectedOutputChannel The expected output channel
 	 * @param handler An instance of CountDownHandler to handle (verify) the output message
 	 * @return true if the message was received on the expected channel
-	 * @throws JMSException
-	 * @throws InterruptedException
 	 */
 	protected boolean verifyJmsMessageReceivedOnOutputChannel(Object obj, SubscribableChannel expectedOutputChannel,
 			CountDownHandler handler) throws InterruptedException {
+
 		return verifyJmsMessageOnOutputChannel(obj, expectedOutputChannel, handler, 10000);
 	}
 
-
 	/**
 	 * Provide a message via a mock JMS template and wait for the specified timeout to receive the message
 	 * on the expected channel
@@ -176,8 +161,6 @@ protected boolean verifyJmsMessageReceivedOnOutputChannel(Object obj, Subscribab
 	 * to process the entire flow. Only set if the default is
 	 * not long enough
 	 * @return true if the message was received on the expected channel
-	 * @throws JMSException
-	 * @throws InterruptedException
 	 */
 	protected boolean verifyJmsMessageOnOutputChannel(Object obj, SubscribableChannel expectedOutputChannel,
 			CountDownHandler handler, int timeoutMillisec) throws InterruptedException {
@@ -195,7 +178,6 @@ protected boolean verifyJmsMessageOnOutputChannel(Object obj, SubscribableChanne
 		CountDownLatch latch = new CountDownLatch(1);
 		handler.setLatch(latch);
 
-
 		expectedOutputChannel.subscribe(handler);
 
 		this.jmsInboundChannelAdapter.start();
@@ -213,7 +195,7 @@ protected boolean verifyJmsMessageOnOutputChannel(Object obj, SubscribableChanne
 	/*
 	 * A MessageHandler that uses a CountDownLatch to synchronize with the calling thread
 	 */
-	private abstract class CountDownHandler implements MessageHandler {
+	private abstract static class CountDownHandler implements MessageHandler {
 
 		CountDownLatch latch;
 

advanced/dynamic-tcp-client/src/test/java/org/springframework/integration/samples/dynamictcp/DynamicTcpClientApplicationTests.java

@@ -1,11 +1,9 @@
 package org.springframework.integration.samples.dynamictcp;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 public class DynamicTcpClientApplicationTests {
 

applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Delivery.java

@@ -16,34 +16,37 @@
 
 package org.springframework.integration.samples.cafe;
 
+import java.io.Serial;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * @author Marius Bogoevici
  * @author Tom McCuch
  * @author Gunnar Hillert
+ * @author Artem Bilan
  */
-public class Delivery implements Serializable{
+public class Delivery implements Serializable {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
 	private static final String SEPARATOR = "-----------------------";
 
-	private List<Drink> deliveredDrinks;
+	private ArrayList<Drink> deliveredDrinks;
 
 	private int orderNumber;
 
 	// Default constructor required by Jackson Java JSON-processor
-	public Delivery() {}
+	public Delivery() {
+	}
 
 	public Delivery(List<Drink> deliveredDrinks) {
-		assert(deliveredDrinks.size() > 0);
-		this.deliveredDrinks = deliveredDrinks;
+		this.deliveredDrinks = new ArrayList<>(deliveredDrinks);
 		this.orderNumber = deliveredDrinks.get(0).getOrderNumber();
 	}
 
-
 	public int getOrderNumber() {
 		return orderNumber;
 	}
@@ -57,13 +60,13 @@ public List<Drink> getDeliveredDrinks() {
 	}
 
 	public void setDeliveredDrinks(List<Drink> deliveredDrinks) {
-		this.deliveredDrinks = deliveredDrinks;
+		this.deliveredDrinks = new ArrayList<>(deliveredDrinks);
 	}
 
 	@Override
 	public String toString() {
-		StringBuffer buffer = new StringBuffer(SEPARATOR + "\n");
-		buffer.append("Order #" + getOrderNumber() + "\n");
+		StringBuilder buffer = new StringBuilder(SEPARATOR + "\n");
+		buffer.append("Order #").append(getOrderNumber()).append("\n");
 		for (Drink drink : getDeliveredDrinks()) {
 			buffer.append(drink);
 			buffer.append("\n");

applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Order.java

@@ -16,6 +16,7 @@
 
 package org.springframework.integration.samples.cafe;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,18 +26,21 @@
  * @author Marius Bogoevici
  * @author Tom McCuch
  * @author Gunnar Hillert
+ * @author Artem Bilan
  */
-public class Order implements Serializable{
+public class Order implements Serializable {
 
+	@Serial
 	private static final long serialVersionUID = 1L;
 
-	private List<OrderItem> orderItems = new ArrayList<OrderItem>();
+	private ArrayList<OrderItem> orderItems = new ArrayList<>();
 
 	/** the order number used for tracking */
 	private int number;
 
 	// Default constructor required by Jackson Java JSON-processor
-	public Order() {}
+	public Order() {
+	}
 
 	public Order(int number) {
 		this.number = number;
@@ -59,6 +63,7 @@ public List<OrderItem> getItems() {
 	}
 
 	public void setItems(List<OrderItem> orderItems) {
-		this.orderItems = orderItems;
+		this.orderItems = new ArrayList<>(orderItems);
 	}
+
 }

applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java

@@ -26,7 +26,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.mail.MailProperties;
+import org.springframework.boot.mail.autoconfigure.MailProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.integration.dsl.IntegrationFlow;
 import org.springframework.integration.dsl.Pollers;

applications/loanshark/src/main/resources/META-INF/persistence.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
 	<persistence-unit name="persistenceUnit" transaction-type="RESOURCE_LOCAL">
-        <provider>org.hibernate.ejb.HibernatePersistence</provider>
         <properties>
             <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
             <!--value='create' to build a new database on each run; value='update' to modify an existing database; value='create-drop' means the same as 'create' but also drops tables when Hibernate closes; value='validate' makes no changes to the database-->

applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml

@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd   http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd   http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd   http://www.springframework.org/schema/jee https://www.springframework.org/schema/jee/spring-jee.xsd   http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:tx="http://www.springframework.org/schema/tx"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd   http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd       http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
+
 	<import resource="integrationContext.xml"/>
-    <!--
+	<!--
 		This will automatically locate any and all property files you have
 		within your classpath, provided they fall under the META-INF/spring
 		directory. The located property files are parsed and their values can
 		then be used within application context files in the form of
 		${propertyKey}.
 	-->
-    <context:property-placeholder location="classpath*:META-INF/spring/*.properties"/>
-    <!--
+	<context:property-placeholder location="classpath*:META-INF/spring/*.properties"/>
+	<!--
 		Turn on AspectJ @Configurable support. As a result, any time you
 		instantiate an object, Spring will attempt to perform dependency
 		injection on that object. This occurs for instantiation via the "new"
@@ -22,8 +27,8 @@
 		method). Roo applications use this useful feature in a number of
 		areas, such as @PersistenceContext injection into entities.
 	-->
-    <context:spring-configured/>
-    <!--
+	<context:spring-configured/>
+	<!--
 		This declaration will cause Spring to locate every @Component,
 		@Repository and @Service in your application. In practical terms this
 		allows you to write a POJO and then simply annotate the new POJO as an
@@ -44,22 +49,31 @@
 		The most commonly used annotation is @Autowired, which instructs Spring to
 		dependency inject an object into your class.
 	-->
-    <context:component-scan base-package="org.springframework.integration.samples.loanbroker.loanshark">
-        <context:exclude-filter expression=".*_Roo_.*" type="regex"/>
-        <context:exclude-filter expression=".*TestAccumulator.*" type="regex"/>
-        <context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/>
-    </context:component-scan>
-    <bean class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" id="dataSource">
-        <property name="driverClassName" value="${database.driverClassName}"/>
-        <property name="url" value="${database.url}"/>
-        <property name="username" value="${database.username}"/>
-        <property name="password" value="${database.password}"/>
-    </bean>
-    <bean class="org.springframework.orm.jpa.JpaTransactionManager" id="transactionManager">
-        <property name="entityManagerFactory" ref="entityManagerFactory"/>
-    </bean>
-    <tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>
-    <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory">
-        <property name="dataSource" ref="dataSource"/>
-    </bean>
+	<context:component-scan base-package="org.springframework.integration.samples.loanbroker.loanshark">
+		<context:exclude-filter expression=".*_Roo_.*" type="regex"/>
+		<context:exclude-filter expression=".*TestAccumulator.*" type="regex"/>
+		<context:exclude-filter expression="org.springframework.stereotype.Controller" type="annotation"/>
+	</context:component-scan>
+
+	<bean class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close" id="dataSource">
+		<property name="driverClassName" value="${database.driverClassName}"/>
+		<property name="url" value="${database.url}"/>
+		<property name="username" value="${database.username}"/>
+		<property name="password" value="${database.password}"/>
+	</bean>
+
+	<bean class="org.springframework.orm.jpa.JpaTransactionManager" id="transactionManager">
+		<property name="entityManagerFactory" ref="entityManagerFactory"/>
+	</bean>
+
+	<tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>
+
+	<bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory">
+		<property name="dataSource" ref="dataSource"/>
+		<property name="persistenceUnitName" value="persistenceUnit"/>
+		<property name="jpaVendorAdapter">
+			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"/>
+		</property>
+	</bean>
+
 </beans>