Fix compatibility with the latest SF

* Upgrade Spring dependencies to the latest SNAPSHOTs
* Fix tests to verify against stack traces: the message
of the `NestedRuntimeException`  does not include the nested exception information.
Related to spring-projects/spring-framework#25162
* Fix `JdbcMessageStore` and `DefaultLockRepository` to rely on the `DataIntegrityViolationException`
instead of only its `DuplicateKeyException` extension.
This is the current behavior of the SQL errors translation
* Disable `WebFluxDslTests.testValidation()` - doesn't subscribe to the reply somehow...
* Refine `SimplePool.PoolSemaphore.reducePermits()`

Author: artembilan

build.gradle

@@ -67,7 +67,7 @@ ext {
     hazelcastVersion = '5.1.1'
     hibernateVersion = '5.6.8.Final'
     hsqldbVersion = '2.6.1'
-    h2Version = '2.1.210'
+    h2Version = '2.1.212'
     jacksonVersion = '2.13.3'
     jaxbVersion = '3.0.2'
     jcifsVersion = '2.1.29'
@@ -91,21 +91,21 @@ ext {
     pahoMqttClientVersion = '1.2.5'
     postgresVersion = '42.3.3'
     r2dbch2Version = '0.9.1.RELEASE'
-    reactorVersion = '2020.0.18'
+    reactorVersion = '2022.0.0-M2'
     resilience4jVersion = '1.7.1'
     romeToolsVersion = '1.18.0'
     rsocketVersion = '1.1.2'
     saajVersion = '2.0.1'
     servletApiVersion = '5.0.0'
     smackVersion = '4.4.5'
-    springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-M3'
-    springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-M4'
+    springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
+    springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
     springGraphqlVersion = '1.0.0'
-    springKafkaVersion = '3.0.0-M4'
+    springKafkaVersion = '3.0.0-SNAPSHOT'
     springRetryVersion = '1.3.3'
-    springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M5'
-    springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M4'
-    springWsVersion = '4.0.0-M2'
+    springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
+    springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
+    springWsVersion = '4.0.0-SNAPSHOT'
     testcontainersVersion = '1.17.1'
     tomcatVersion = '10.0.21'
     xmlUnitVersion = '2.9.0'

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@ public void testPtP() throws Exception {
 		amqpChannel.setBeanFactory(mock(BeanFactory.class));
 		amqpChannel.afterPropertiesSet();
 
-		MessageListener listener = (MessageListener) container.getMessageListener();
+		MessageListener listener = container.getMessageListener();
 
 		assertThatExceptionOfType(MessageDeliveryException.class)
 				.isThrownBy(() -> listener.onMessage(new Message("Hello world!".getBytes())))
@@ -101,7 +101,7 @@ public void testPubSub() {
 		amqpChannel.afterPropertiesSet();
 
 		List<String> logList = insertMockLoggerInListener(amqpChannel);
-		MessageListener listener = (MessageListener) container.getMessageListener();
+		MessageListener listener = container.getMessageListener();
 		listener.onMessage(new Message("Hello world!".getBytes()));
 		verifyLogReceived(logList);
 	}

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

@@ -280,8 +280,8 @@ private static class PoolSemaphore extends Semaphore {
 		}
 
 		@Override
-		public void reducePermits(int reduction) { // NOSONAR increases visibility
-			super.reducePermits(reduction > availablePermits() ? availablePermits() : reduction);
+		public void reducePermits(int reduction) {
+			super.reducePermits(Math.min(reduction, availablePermits()));
 		}
 
 	}

spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.integration.aggregator;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.mock;
 
 import java.util.ArrayList;
@@ -200,13 +200,9 @@ public void testResequencingWithCapacity() {
 		Message<?> message3 = createMessage("789", "ABC", 4, 1, replyChannel);
 		this.resequencer.handleMessage(message1);
 		this.resequencer.handleMessage(message2);
-		try {
-			this.resequencer.handleMessage(message3);
-			fail("Expected exception");
-		}
-		catch (MessagingException e) {
-			assertThat(e.getMessage()).contains("out of capacity (2) for group 'ABC'");
-		}
+		assertThatExceptionOfType(MessagingException.class)
+				.isThrownBy(() -> this.resequencer.handleMessage(message3))
+				.withStackTraceContaining("out of capacity (2) for group 'ABC'");
 	}
 
 	@Test

spring-integration-core/src/test/java/org/springframework/integration/channel/reactive/ReactiveStreamsConsumerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 the original author or authors.
+ * Copyright 2016-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -100,7 +100,7 @@ public void testReactiveStreamsConsumerFluxMessageChannel() throws InterruptedEx
 		assertThatExceptionOfType(MessageDeliveryException.class)
 				.isThrownBy(() -> testChannel.send(testMessage))
 				.withCauseInstanceOf(IllegalStateException.class)
-				.withMessageContaining("doesn't have subscribers to accept messages");
+				.withStackTraceContaining("doesn't have subscribers to accept messages");
 
 		reactiveConsumer.start();
 
@@ -279,7 +279,7 @@ public void testReactiveStreamsConsumerViaConsumerEndpointFactoryBean() throws E
 		assertThatExceptionOfType(MessageDeliveryException.class)
 				.isThrownBy(() -> testChannel.send(testMessage))
 				.withCauseInstanceOf(IllegalStateException.class)
-				.withMessageContaining("doesn't have subscribers to accept messages");
+				.withStackTraceContaining("doesn't have subscribers to accept messages");
 
 		endpointFactoryBean.start();
 
@@ -321,7 +321,7 @@ public void testReactiveStreamsConsumerFluxMessageChannelReactiveMessageHandler(
 		assertThatExceptionOfType(MessageDeliveryException.class)
 				.isThrownBy(() -> testChannel.send(testMessage))
 				.withCauseInstanceOf(IllegalStateException.class)
-				.withMessageContaining("doesn't have subscribers to accept messages");
+				.withStackTraceContaining("doesn't have subscribers to accept messages");
 
 		reactiveConsumer.start();
 

spring-integration-core/src/test/java/org/springframework/integration/channel/registry/HeaderChannelRegistryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +17,14 @@
 package org.springframework.integration.channel.registry;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.Map;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -49,8 +48,7 @@
 import org.springframework.messaging.support.GenericMessage;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 /**
  * @author Gary Russell
@@ -59,8 +57,7 @@
  * @since 3.0
  *
  */
-@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
+@SpringJUnitConfig
 @DirtiesContext
 public class HeaderChannelRegistryTests {
 
@@ -95,7 +92,7 @@ public class HeaderChannelRegistryTests {
 	public void testReplace() {
 		MessagingTemplate template = new MessagingTemplate();
 		template.setDefaultDestination(this.input);
-		Message<?> reply = template.sendAndReceive(new GenericMessage<String>("foo"));
+		Message<?> reply = template.sendAndReceive(new GenericMessage<>("foo"));
 		assertThat(reply).isNotNull();
 		assertThat(reply.getPayload()).isEqualTo("echo:foo");
 		String stringReplyChannel = reply.getHeaders().get("stringReplyChannel", String.class);
@@ -109,7 +106,7 @@ public void testReplace() {
 	public void testReplaceTtl() {
 		MessagingTemplate template = new MessagingTemplate();
 		template.setDefaultDestination(this.inputTtl);
-		Message<?> reply = template.sendAndReceive(new GenericMessage<String>("ttl"));
+		Message<?> reply = template.sendAndReceive(new GenericMessage<>("ttl"));
 		assertThat(reply).isNotNull();
 		assertThat(reply.getPayload()).isEqualTo("echo:ttl");
 		String stringReplyChannel = reply.getHeaders().get("stringReplyChannel", String.class);
@@ -135,7 +132,7 @@ public void testReplaceCustomTtl() {
 						.get(stringReplyChannel), "expireAt", Long.class) - System.currentTimeMillis())
 				.isGreaterThan(160000L).isLessThan(181000L);
 		// Now for Elvis...
-		reply = template.sendAndReceive(new GenericMessage<String>("ttl"));
+		reply = template.sendAndReceive(new GenericMessage<>("ttl"));
 		assertThat(reply).isNotNull();
 		assertThat(reply.getPayload()).isEqualTo("echo:ttl");
 		stringReplyChannel = reply.getHeaders().get("stringReplyChannel", String.class);
@@ -167,7 +164,7 @@ public void testReplaceGatewayWithExplicitReplyChannel() {
 	public void testReplaceError() {
 		MessagingTemplate template = new MessagingTemplate();
 		template.setDefaultDestination(this.inputPolled);
-		Message<?> reply = template.sendAndReceive(new GenericMessage<String>("bar"));
+		Message<?> reply = template.sendAndReceive(new GenericMessage<>("bar"));
 		assertThat(reply).isNotNull();
 		assertThat(reply instanceof ErrorMessage).isTrue();
 		assertThat(((ErrorMessage) reply).getOriginalMessage()).isNotNull();
@@ -188,15 +185,9 @@ public void testAlreadyAString() {
 
 	@Test
 	public void testNull() {
-		Message<String> requestMessage = MessageBuilder.withPayload("foo")
-				.build();
-		try {
-			this.input.send(requestMessage);
-			fail("expected exception");
-		}
-		catch (Exception e) {
-			assertThat(e.getMessage()).contains("no output-channel or replyChannel");
-		}
+		assertThatExceptionOfType(Exception.class)
+				.isThrownBy(() -> this.input.send(new GenericMessage<>("test")))
+				.withStackTraceContaining("no output-channel or replyChannel");
 	}
 
 	@Test
@@ -223,14 +214,10 @@ public void testBFCRWithRegistry() {
 			throw new NoSuchBeanDefinitionException("bar");
 		}).when(beanFactory).getBean("foo", MessageChannel.class);
 		resolver.setBeanFactory(beanFactory);
-		try {
-			resolver.resolveDestination("foo");
-			fail("Expected exception");
-		}
-		catch (DestinationResolutionException e) {
-			assertThat(e.getMessage()).contains("failed to look up MessageChannel with name 'foo' in the BeanFactory" +
-					".");
-		}
+
+		assertThatExceptionOfType(DestinationResolutionException.class)
+				.isThrownBy(() -> resolver.resolveDestination("foo"))
+				.withMessageContaining("failed to look up MessageChannel with name 'foo' in the BeanFactory.");
 	}
 
 	@Test
@@ -241,15 +228,11 @@ public void testBFCRNoRegistry() {
 			throw new NoSuchBeanDefinitionException("bar");
 		}).when(beanFactory).getBean("foo", MessageChannel.class);
 		resolver.setBeanFactory(beanFactory);
-		try {
-			resolver.resolveDestination("foo");
-			fail("Expected exception");
-		}
-		catch (DestinationResolutionException e) {
-			assertThat(e.getMessage()).contains("failed to look up MessageChannel with name 'foo' in the BeanFactory" +
-					" " +
-					"(and there is no HeaderChannelRegistry present).");
-		}
+
+		assertThatExceptionOfType(DestinationResolutionException.class)
+				.isThrownBy(() -> resolver.resolveDestination("foo"))
+				.withMessageContaining("failed to look up MessageChannel with name 'foo' in the BeanFactory" +
+						" (and there is no HeaderChannelRegistry present).");
 	}
 
 	@Test

spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.integration.config;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -217,24 +217,17 @@ public void testSimpleJavaBeanAggregator() {
 
 	@Test
 	public void testMissingMethodOnAggregator() {
-		try {
-			new ClassPathXmlApplicationContext("invalidMethodNameAggregator.xml", this.getClass()).close();
-			fail("Expected exception");
-		}
-		catch (BeanCreationException e) {
-			assertThat(e.getMessage()).contains("Adder] has no eligible methods");
-		}
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(() -> new ClassPathXmlApplicationContext("invalidMethodNameAggregator.xml", getClass()))
+				.withStackTraceContaining("Adder] has no eligible methods");
 	}
 
 	@Test
 	public void testMissingReleaseStrategyDefinition() {
-		try {
-			new ClassPathXmlApplicationContext("ReleaseStrategyMethodWithMissingReference.xml", this.getClass()).close();
-			fail("Expected exception");
-		}
-		catch (BeanCreationException e) {
-			assertThat(e.getMessage()).contains("No bean named 'testReleaseStrategy' available");
-		}
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(() -> new ClassPathXmlApplicationContext("ReleaseStrategyMethodWithMissingReference.xml",
+						getClass()))
+				.withStackTraceContaining("No bean named 'testReleaseStrategy' available");
 	}
 
 	@Test
@@ -289,13 +282,9 @@ public void testAggregatorWithPojoReleaseStrategyAsCollection() {
 
 	@Test
 	public void testAggregatorWithInvalidReleaseStrategyMethod() {
-		try {
-			new ClassPathXmlApplicationContext("invalidReleaseStrategyMethod.xml", this.getClass()).close();
-			fail("Expected exception");
-		}
-		catch (BeanCreationException e) {
-			assertThat(e.getMessage()).contains("TestReleaseStrategy] has no eligible methods");
-		}
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(() -> new ClassPathXmlApplicationContext("invalidReleaseStrategyMethod.xml", getClass()))
+				.withStackTraceContaining("TestReleaseStrategy] has no eligible methods");
 	}
 
 	@Test

spring-integration-core/src/test/java/org/springframework/integration/config/CorrelationStrategyInvalidConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,28 +16,26 @@
 
 package org.springframework.integration.config;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * @author Marius Bogoevici
  * @author Gary Russell
+ * @author Artem Bilan
  */
 public class CorrelationStrategyInvalidConfigurationTests {
 
 	@Test
 	public void testCorrelationStrategyWithVoidReturningMethods() throws Exception {
-		try {
-			new ClassPathXmlApplicationContext("correlationStrategyWithVoidMethods.xml",
-					CorrelationStrategyInvalidConfigurationTests.class).close();
-		}
-		catch (BeanCreationException e) {
-			assertThat(e.getMessage()).contains("MessageCountReleaseStrategy] has no eligible methods");
-		}
+		assertThatExceptionOfType(BeanCreationException.class)
+				.isThrownBy(() -> new ClassPathXmlApplicationContext("correlationStrategyWithVoidMethods.xml",
+						getClass()))
+				.withStackTraceContaining("MessageCountReleaseStrategy] has no eligible methods");
 	}
 
 	public static class VoidReturningCorrelationStrategy {