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

Upgrade to Reactor 2

Browse Source 
Issue: SPR-12599
This commit is contained in:
Stephane Maldini
2015-04-23 18:38:52 +01:00
committed by Rossen Stoyanchev
parent 122d3476d9
commit 74c0250525
13 changed files with 389 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/Reactor11TcpStompClientTests.java → spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/Reactor2TcpStompClientTests.java
View File

@@ -42,20 +42,20 @@ import org.springframework.util.SocketUtils;
import org.springframework.util.concurrent.ListenableFuture;
/**
* Integration tests for {@link Reactor11TcpStompClient}.
* Integration tests for {@link Reactor2TcpStompClient}.
*
* @author Rossen Stoyanchev
*/
public class Reactor11TcpStompClientTests {
public class Reactor2TcpStompClientTests {
private static final Log logger = LogFactory.getLog(Reactor11TcpStompClientTests.class);
private static final Log logger = LogFactory.getLog(Reactor2TcpStompClientTests.class);
@Rule
public final TestName testName = new TestName();
private BrokerService activeMQBroker;
private Reactor11TcpStompClient client;
private Reactor2TcpStompClient client;
@Before
@@ -77,7 +77,7 @@ public class Reactor11TcpStompClientTests {
ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
taskScheduler.afterPropertiesSet();
this.client = new Reactor11TcpStompClient("127.0.0.1", port);
this.client = new Reactor2TcpStompClient("127.0.0.1", port);
this.client.setMessageConverter(new StringMessageConverter());
this.client.setTaskScheduler(taskScheduler);
}
@@ -86,8 +86,7 @@ public class Reactor11TcpStompClientTests {
public void tearDown() throws Exception {
try {
this.client.shutdown();
}
catch (Throwable ex) {
} catch (Throwable ex) {
logger.error("Failed to shut client", ex);
}
final CountDownLatch latch = new CountDownLatch(1);

24
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java
View File

@@ -21,19 +21,19 @@ import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
import reactor.function.Consumer;
import reactor.function.Function;
import reactor.io.Buffer;
import org.springframework.messaging.Message;
import org.springframework.messaging.simp.SimpMessageType;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.util.InvalidMimeTypeException;
import reactor.fn.Consumer;
import reactor.fn.Function;
import reactor.io.buffer.Buffer;
import static org.junit.Assert.*;
/**
* Test fixture for {@link Reactor11StompCodec}.
* Test fixture for {@link Reactor2StompCodec}.
*
* @author Andy Wilkinson
*/
@@ -41,7 +41,7 @@ public class StompCodecTests {
private final ArgumentCapturingConsumer<Message<byte[]>> consumer = new ArgumentCapturingConsumer<Message<byte[]>>();
private final Function<Buffer, Message<byte[]>> decoder = new Reactor11StompCodec().decoder(consumer);
private final Function<Buffer, Message<byte[]>> decoder = new Reactor2StompCodec().decoder(consumer);
@Test
public void decodeFrameWithCrLfEols() {
@@ -176,7 +176,7 @@ public class StompCodecTests {
Buffer buffer = Buffer.wrap(frame1 + frame2);
final List<Message<byte[]>> messages = new ArrayList<Message<byte[]>>();
new Reactor11StompCodec().decoder(new Consumer<Message<byte[]>>() {
new Reactor2StompCodec().decoder(new Consumer<Message<byte[]>>() {
@Override
public void accept(Message<byte[]> message) {
messages.add(message);
@@ -234,7 +234,7 @@ public class StompCodecTests {
Buffer buffer = Buffer.wrap(frame);
final List<Message<byte[]>> messages = new ArrayList<Message<byte[]>>();
new Reactor11StompCodec().decoder(new Consumer<Message<byte[]>>() {
new Reactor2StompCodec().decoder(new Consumer<Message<byte[]>>() {
@Override
public void accept(Message<byte[]> message) {
messages.add(message);
@@ -251,7 +251,7 @@ public class StompCodecTests {
Message<byte[]> frame = MessageBuilder.createMessage(new byte[0], headers.getMessageHeaders());
assertEquals("DISCONNECT\n\n\0", new Reactor11StompCodec().encoder().apply(frame).asString());
assertEquals("DISCONNECT\n\n\0", new Reactor2StompCodec().encoder().apply(frame).asString());
}
@Test
@@ -262,7 +262,7 @@ public class StompCodecTests {
Message<byte[]> frame = MessageBuilder.createMessage(new byte[0], headers.getMessageHeaders());
String frameString = new Reactor11StompCodec().encoder().apply(frame).asString();
String frameString = new Reactor2StompCodec().encoder().apply(frame).asString();
assertTrue(frameString.equals("CONNECT\naccept-version:1.2\nhost:github.org\n\n\0") ||
frameString.equals("CONNECT\nhost:github.org\naccept-version:1.2\n\n\0"));
@@ -276,7 +276,7 @@ public class StompCodecTests {
Message<byte[]> frame = MessageBuilder.createMessage(new byte[0], headers.getMessageHeaders());
assertEquals("DISCONNECT\na\\c\\r\\n\\\\b:alpha\\cbravo\\r\\n\\\\\n\n\0",
new Reactor11StompCodec().encoder().apply(frame).asString());
new Reactor2StompCodec().encoder().apply(frame).asString());
}
@Test
@@ -287,7 +287,7 @@ public class StompCodecTests {
Message<byte[]> frame = MessageBuilder.createMessage("Message body".getBytes(), headers.getMessageHeaders());
assertEquals("SEND\na:alpha\ncontent-length:12\n\nMessage body\0",
new Reactor11StompCodec().encoder().apply(frame).asString());
new Reactor2StompCodec().encoder().apply(frame).asString());
}
@Test
@@ -298,7 +298,7 @@ public class StompCodecTests {
Message<byte[]> frame = MessageBuilder.createMessage("Message body".getBytes(), headers.getMessageHeaders());
assertEquals("SEND\ncontent-length:12\n\nMessage body\0",
new Reactor11StompCodec().encoder().apply(frame).asString());
new Reactor2StompCodec().encoder().apply(frame).asString());
}
private void assertIncompleteDecode(String partialFrame) {

6
spring-messaging/src/test/resources/log4j.properties
View File

@@ -4,10 +4,10 @@ log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n
log4j.rootCategory=WARN, console
log4j.logger.org.springframework.messaging=DEBUG
log4j.logger.org.apache.activemq=TRACE
log4j.logger.org.apache.activemq=INFO
# Enable TRACE level to chase integration test issues on CI servers
log4j.logger.org.springframework.messaging.simp.stomp=TRACE
log4j.logger.reactor.net=TRACE
log4j.logger.io.netty=TRACE
log4j.logger.reactor=DEBUG
log4j.logger.io.netty=INFO