GH-10621: Fix UUIDConverter for new nullability contract

Fixes: #10621

The `org.springframework.core.convert.converter.Converter` has now a flexible generic param nullability contract.

* Fix `UUIDConverter` to mark a generic `UUID` argument as `@Nullable` to satisfy contract of super interface
* Move Spring dependencies to the latest snapshots
* Fix `DefaultLockRepositoryTests` timing race conditions
* Fix warnings and some clean up in the `TcpNioConnectionTests`

Author: artembilan

build.gradle

@@ -101,11 +101,11 @@ ext {
     servletApiVersion = '6.1.0'
     smackVersion = '4.4.8'
     springAmqpVersion = '4.0.0'
-    springDataVersion = '2025.1.0'
-    springGraphqlVersion = '2.0.0'
-    springKafkaVersion = '4.0.0'
-    springSecurityVersion = '7.0.0'
-    springVersion = '7.0.1'
+    springDataVersion = '2025.1.1-SNAPSHOT'
+    springGraphqlVersion = '2.0.1-SNAPSHOT'
+    springKafkaVersion = '4.0.1-SNAPSHOT'
+    springSecurityVersion = '7.0.1-SNAPSHOT'
+    springVersion = '7.0.2-SNAPSHOT'
     springWsVersion = '5.0.0'
     testcontainersVersion = '2.0.2'
     tomcatVersion = '11.0.14'

spring-integration-core/src/main/java/org/springframework/integration/util/UUIDConverter.java

@@ -38,7 +38,7 @@
  * @author Artem Bilan
  * @author Ngoc Nhan
  */
-public class UUIDConverter implements Converter<Object, UUID> {
+public class UUIDConverter implements Converter<Object, @Nullable UUID> {
 
 	private static final Pattern UUID_REGEX =
 			Pattern.compile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");

spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java

@@ -77,6 +77,7 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessagingException;
 import org.springframework.messaging.support.ErrorMessage;
+import org.springframework.messaging.support.GenericMessage;
 import org.springframework.scheduling.concurrent.SimpleAsyncTaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.util.ReflectionUtils;
@@ -150,9 +151,7 @@ public void testWriteTimeout(TestInfo testInfo) throws Exception {
 			connection.send(MessageBuilder.withPayload(new byte[1000000]).build());
 		}
 		catch (MessagingException e) {
-			assertThat(e.getCause() instanceof SocketTimeoutException)
-					.as("Expected SocketTimeoutException, got " + e.getClass().getSimpleName() +
-							":" + e.getMessage()).isTrue();
+			assertThat(e).hasCauseInstanceOf(SocketTimeoutException.class);
 		}
 		done.countDown();
 		factory.stop();
@@ -183,13 +182,13 @@ public void testReadTimeout(TestInfo testInfo) throws Exception {
 			}
 		});
 		assertThat(latch.await(30, TimeUnit.SECONDS)).isTrue();
-		TcpNioClientConnectionFactory factory = new TcpNioClientConnectionFactory("localhost",
-				serverSocket.get().getLocalPort());
+		TcpNioClientConnectionFactory factory =
+				new TcpNioClientConnectionFactory("localhost", serverSocket.get().getLocalPort());
 		factory.setApplicationEventPublisher(nullPublisher);
 		factory.setSoTimeout(100);
 		factory.start();
 		TcpConnection connection = factory.getConnection();
-		connection.send(MessageBuilder.withPayload("Test").build());
+		connection.send(new GenericMessage<>("Test"));
 		with().pollInterval(Duration.ofMillis(10))
 				.await()
 				.atMost(Duration.ofSeconds(10))
@@ -220,8 +219,8 @@ public void testMemoryLeak(TestInfo testInfo) throws Exception {
 			}
 		});
 		assertThat(latch.await(30, TimeUnit.SECONDS)).isTrue();
-		TcpNioClientConnectionFactory factory = new TcpNioClientConnectionFactory("localhost",
-				serverSocket.get().getLocalPort());
+		TcpNioClientConnectionFactory factory =
+				new TcpNioClientConnectionFactory("localhost", serverSocket.get().getLocalPort());
 		factory.setApplicationEventPublisher(nullPublisher);
 		factory.setNioHarvestInterval(100);
 		factory.start();
@@ -237,6 +236,7 @@ public void testMemoryLeak(TestInfo testInfo) throws Exception {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testCleanup() {
 		TcpNioClientConnectionFactory factory = new TcpNioClientConnectionFactory("localhost", 0);
 		factory.setApplicationEventPublisher(nullPublisher);
@@ -504,9 +504,10 @@ public void transferHeaders() throws Exception {
 		outboundConnection.setMapper(outMapper);
 		outboundConnection.setSerializer(new MapJsonSerializer());
 
-		Message<String> message = MessageBuilder.withPayload("foo")
-				.setHeader("bar", "baz")
-				.build();
+		Message<String> message =
+				MessageBuilder.withPayload("foo")
+						.setHeader("bar", "baz")
+						.build();
 		outboundConnection.send(message);
 
 		AtomicReference<Message<?>> inboundMessage = new AtomicReference<>();
@@ -556,7 +557,7 @@ public void testAssemblerUsesSecondaryExecutor() throws Exception {
 			}
 			Thread.sleep(100);
 		}
-		assertThat(n < 100).as("Could not open socket to localhost:" + port).isTrue();
+		assertThat(n).as("Could not open socket to localhost:" + port).isLessThan(100);
 		socket.getOutputStream().write("foo\r\n".getBytes());
 		socket.close();
 
@@ -614,7 +615,7 @@ public void testAllMessagesDelivered() throws Exception {
 				}
 				Thread.sleep(1);
 			}
-			assertThat(n < 100).as("Could not open socket to localhost:" + port).isTrue();
+			assertThat(n).as("Could not open socket to localhost:" + port).isLessThan(100);
 			sockets[i] = socket;
 		}
 		for (int i = 0; i < numberOfSockets; i++) {
@@ -717,8 +718,8 @@ public void publishEvent(Object event) {
 		DirectFieldAccessor dfa = new DirectFieldAccessor(connection);
 		dfa.setPropertyValue("logger", logger);
 
-		ChannelInputStream cis = spy(TestUtils
-				.getPropertyValue(connection, "channelInputStream", ChannelInputStream.class));
+		ChannelInputStream cis =
+				spy(TestUtils.getPropertyValue(connection, "channelInputStream", ChannelInputStream.class));
 		dfa.setPropertyValue("channelInputStream", cis);
 
 		final CountDownLatch readerLatch = new CountDownLatch(4); // 3 dataAvailable, 1 continuing

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/DefaultLockRepositoryTests.java

@@ -63,6 +63,21 @@ void clear() {
 		this.client.close();
 	}
 
+	@Test
+	void testAcquired() {
+		this.client.acquire("test", Duration.ofSeconds(10));
+		assertThat(this.client.isAcquired("test")).isTrue();
+
+		this.client.delete("test");
+	}
+
+	@Test
+	void testDelete() {
+		this.client.acquire("test", Duration.ofSeconds(10));
+		assertThat(this.client.delete("test")).isTrue();
+		assertThat(this.client.isAcquired("test")).isFalse();
+	}
+
 	@Transactional
 	@Test
 	void testNewTransactionIsStartedWhenTransactionIsAlreadyActive() {
@@ -101,19 +116,14 @@ void testIsAcquiredFromRepeatableReadTransaction() {
 		assertThat(this.client.isAcquired("test")).isFalse();
 	}
 
-	@Test
-	void testAcquired() {
-		client.acquire("test", Duration.ofMillis(100));
-		assertThat(this.client.isAcquired("test")).isTrue();
-	}
-
 	@RetryingTest(10)
 	void testAcquireSameLockTwiceAndTtlWillBeUpdated() throws InterruptedException {
 		client.acquire("test", Duration.ofMillis(150));
 		Thread.sleep(10);
-		client.acquire("test", Duration.ofMillis(150));
+		client.acquire("test", Duration.ofSeconds(10));
 		Thread.sleep(60);
 		assertThat(this.client.isAcquired("test")).isTrue();
+		this.client.delete("test");
 	}
 
 	@Test
@@ -167,9 +177,10 @@ void testIsAcquiredLockIsExpired() throws InterruptedException {
 	void testRenew() throws InterruptedException {
 		client.acquire("test", Duration.ofMillis(150));
 		Thread.sleep(10);
-		assertThat(client.renew("test", Duration.ofMillis(150))).isTrue();
+		assertThat(client.renew("test", Duration.ofSeconds(1))).isTrue();
 		Thread.sleep(60);
 		assertThat(this.client.isAcquired("test")).isTrue();
+		this.client.delete("test");
 	}
 
 	@RetryingTest(10)
@@ -194,13 +205,6 @@ void testRenewLockIsAcquiredByAnotherProcess() {
 		lockRepositoryOfAnotherProcess.close();
 	}
 
-	@Test
-	void testDelete() {
-		this.client.acquire("test", Duration.ofSeconds(10));
-		assertThat(this.client.delete("test")).isTrue();
-		assertThat(this.client.isAcquired("test")).isFalse();
-	}
-
 	@Test
 	void testDeleteLockIsAcquiredByAnotherProcess() {
 		DefaultLockRepository lockRepositoryOfAnotherProcess = new DefaultLockRepository(dataSource);