From e04a8d9948b127482a3dcfae5716dcbc33512df1 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 6 Jan 2017 10:24:17 -0500 Subject: [PATCH] Fix compatibility with the latest SF https://build.spring.io/browse/INT-MJATS41-869 * Revert to `B-S` versions for SA and SF * Since `MessagingException.toString()` now includes and `failedMessage` as well, a comparision with `TcpConnectionExceptionEvent.toString()` should be a bit different See https://jira.spring.io/browse/SPR-15091 --- build.gradle | 4 ++-- .../ip/tcp/connection/TcpSocketFactorySupport.java | 2 +- .../integration/ip/tcp/connection/ConnectionEventTests.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 615b0a0d38..1c1a08aa07 100644 --- a/build.gradle +++ b/build.gradle @@ -123,7 +123,7 @@ subprojects { subproject -> slf4jVersion = "1.7.21" tomcatVersion = "8.0.33" smackVersion = '4.1.7' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.M2' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.BUILD-SNAPSHOT' springDataJpaVersion = '2.0.0.M1' springDataMongoVersion = '2.0.0.M1' springDataRedisVersion = '2.0.0.M1' @@ -131,7 +131,7 @@ subprojects { subproject -> springSecurityVersion = '4.2.0.RELEASE' springSocialTwitterVersion = '2.0.0.M1' springRetryVersion = '1.2.0.RC1' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.M4' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.BUILD-SNAPSHOT' springWsVersion = '2.4.0.RELEASE' xmlUnitVersion = '1.6' xstreamVersion = '1.4.7' diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSocketFactorySupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSocketFactorySupport.java index 7e570f34ea..13eb85f69e 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSocketFactorySupport.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSocketFactorySupport.java @@ -33,7 +33,7 @@ public interface TcpSocketFactorySupport { /** * Supplies the {@link ServerSocketFactory} to be used to create new * {@link ServerSocket}s. - * @return the ServerSocketFacory + * @return the ServerSocketFactory */ ServerSocketFactory getServerSocketFactory(); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java index 49b537c953..96b395d447 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java @@ -117,7 +117,8 @@ public class ConnectionEventTests { assertNotNull(theEvent.get(0)); assertTrue(theEvent.get(0) instanceof TcpConnectionExceptionEvent); assertTrue(theEvent.get(0).toString().endsWith("[factory=foo, connectionId=" + conn.getConnectionId() + "]")); - assertThat(theEvent.get(0).toString(), containsString("RuntimeException: foo]")); + assertThat(theEvent.get(0).toString(), + containsString("RuntimeException: foo, failedMessage=GenericMessage [payload=bar")); TcpConnectionExceptionEvent event = (TcpConnectionExceptionEvent) theEvent.get(0); assertNotNull(event.getCause()); assertSame(toBeThrown, event.getCause().getCause());