Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-2346: Fix Java DSL TCP Factory

Browse Source 
Fixes https://github.com/spring-projects/spring-integration/issues/2346

* Fixed issue where the Java DSL will always create NIO connection factories
 regardless of which type you specified.

* Deprecated the 2 static booleans
This commit is contained in:
Tim Ysewyn
2018-02-01 21:12:00 +01:00
committed by Artem Bilan
parent 3530e76422
commit 90a751e69d
2 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-integration-ip/src/main/java/org/springframework/integration/ip/dsl/Tcp.java
View File

@@ -23,6 +23,7 @@ import org.springframework.integration.ip.tcp.connection.AbstractConnectionFacto
* Factory methods for TCP.
*
* @author Gary Russell
* @author Tim Ysewyn
* @since 5.0
*
*/
@@ -30,14 +31,20 @@ public final class Tcp {
/**
* Boolean indicating the connection factory should use NIO.
*
* @deprecated This isn't used anymore within the framework and will be removed in a future release.
*/
@Deprecated
public static final boolean NIO = true;
/**
* Boolean indicating the connection factory should not use NIO
* (default).
*
* @deprecated This isn't used anymore within the framework and will be removed in a future release.
*/
public static final boolean NET = true;
@Deprecated
public static final boolean NET = false;
private Tcp() {
super();
@@ -49,7 +56,7 @@ public final class Tcp {
* @return the spec.
*/
public static TcpServerConnectionFactorySpec nioServer(int port) {
return new TcpServerConnectionFactorySpec(port, NIO);
return new TcpServerConnectionFactorySpec(port, true);
}
/**
@@ -58,7 +65,7 @@ public final class Tcp {
* @return the spec.
*/
public static TcpServerConnectionFactorySpec netServer(int port) {
return new TcpServerConnectionFactorySpec(port, NET);
return new TcpServerConnectionFactorySpec(port, false);
}
/**
@@ -68,7 +75,7 @@ public final class Tcp {
* @return the spec.
*/
public static TcpClientConnectionFactorySpec nioClient(String host, int port) {
return new TcpClientConnectionFactorySpec(host, port, NIO);
return new TcpClientConnectionFactorySpec(host, port, true);
}
/**
@@ -78,7 +85,7 @@ public final class Tcp {
* @return the spec.
*/
public static TcpClientConnectionFactorySpec netClient(String host, int port) {
return new TcpClientConnectionFactorySpec(host, port, NET);
return new TcpClientConnectionFactorySpec(host, port, false);
}
/**

23
spring-integration-ip/src/test/java/org/springframework/integration/ip/dsl/ConnectionFacforyTests.java
View File

@@ -28,6 +28,10 @@ import org.junit.Test;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory;
import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory;
import org.springframework.integration.ip.tcp.connection.TcpNetClientConnectionFactory;
import org.springframework.integration.ip.tcp.connection.TcpNetServerConnectionFactory;
import org.springframework.integration.ip.tcp.connection.TcpNioClientConnectionFactory;
import org.springframework.integration.ip.tcp.connection.TcpNioServerConnectionFactory;
import org.springframework.integration.ip.util.TestingUtilities;
import org.springframework.integration.transformer.ObjectToStringTransformer;
import org.springframework.messaging.Message;
@@ -35,6 +39,7 @@ import org.springframework.messaging.support.GenericMessage;
/**
* @author Gary Russell
* @author Tim Ysewyn
* @since 5.0
*
*/
@@ -66,4 +71,22 @@ public class ConnectionFacforyTests {
server.stop();
}
@Test
public void shouldReturnNioFlavor() throws Exception {
AbstractServerConnectionFactory server = Tcp.nioServer(0).get();
assertTrue(server instanceof TcpNioServerConnectionFactory);
AbstractClientConnectionFactory client = Tcp.nioClient("localhost", server.getPort()).get();
assertTrue(client instanceof TcpNioClientConnectionFactory);
}
@Test
public void shouldReturnNetFlavor() throws Exception {
AbstractServerConnectionFactory server = Tcp.netServer(0).get();
assertTrue(server instanceof TcpNetServerConnectionFactory);
AbstractClientConnectionFactory client = Tcp.netClient("localhost", server.getPort()).get();
assertTrue(client instanceof TcpNetClientConnectionFactory);
}
}