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

Polish MessageBuilder

Browse Source
This commit is contained in:
Rossen Stoyanchev
2013-10-07 09:26:26 -04:00
parent 4574528a27
commit 824cb9f8cd
18 changed files with 55 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-messaging/src/test/java/org/springframework/messaging/simp/config/WebSocketMessageBrokerConfigurationSupportTests.java
View File

@@ -155,7 +155,7 @@ public class WebSocketMessageBrokerConfigurationSupportTests {
headers.setSessionId("sess1");
headers.setSubscriptionId("subs1");
headers.setDestination("/foo");
Message<?> message = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build();
Message<?> message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build();
when(channel.send(any(Message.class))).thenReturn(true);
messageHandler.handleMessage(message);
@@ -179,7 +179,7 @@ public class WebSocketMessageBrokerConfigurationSupportTests {
headers.setSessionId("sess1");
headers.setSubscriptionId("subs1");
headers.setDestination("/foo");
Message<?> message = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build();
Message<?> message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build();
// subscribe
broker.handleMessage(message);
@@ -187,7 +187,7 @@ public class WebSocketMessageBrokerConfigurationSupportTests {
headers = StompHeaderAccessor.create(StompCommand.SEND);
headers.setSessionId("sess1");
headers.setDestination("/foo");
message = MessageBuilder.withPayloadAndHeaders("bar".getBytes(), headers).build();
message = MessageBuilder.withPayload("bar".getBytes()).setHeaders(headers).build();
// message
when(channel.send(any(Message.class))).thenReturn(true);
@@ -236,7 +236,7 @@ public class WebSocketMessageBrokerConfigurationSupportTests {
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND);
headers.setDestination("/foo");
Message<?> message = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build();
Message<?> message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build();
when(channel.send(any(Message.class))).thenReturn(true);
messageHandler.handleMessage(message);
@@ -260,7 +260,7 @@ public class WebSocketMessageBrokerConfigurationSupportTests {
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND);
headers.setDestination("/user/joe/foo");
Message<?> message = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build();
Message<?> message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build();
when(channel.send(any(Message.class))).thenReturn(true);
messageHandler.handleMessage(message);

2
spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java
View File

@@ -145,7 +145,7 @@ public class SimpleBrokerMessageHandlerTests {
SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT);
headers.setSessionId(sessionId);
return MessageBuilder.withPayloadAndHeaders("", headers).build();
return MessageBuilder.withPayload("").setHeaders(headers).build();
}
protected Message<String> createMessage(String destination, String payload) {

12
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
View File

@@ -159,7 +159,7 @@ public class StompBrokerRelayMessageHandlerIntegrationTests {
public void messageDeliverExceptionIfSystemSessionForwardFails() throws Exception {
stopBrokerAndAwait();
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND);
this.relay.handleMessage(MessageBuilder.withPayloadAndHeaders("test".getBytes(), headers).build());
this.relay.handleMessage(MessageBuilder.withPayload("test".getBytes()).setHeaders(headers).build());
}
@Test
@@ -235,7 +235,7 @@ public class StompBrokerRelayMessageHandlerIntegrationTests {
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.DISCONNECT);
headers.setSessionId(sess1);
this.relay.handleMessage(MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build());
this.relay.handleMessage(MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build());
Thread.sleep(2000);
@@ -404,7 +404,7 @@ public class StompBrokerRelayMessageHandlerIntegrationTests {
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.CONNECT);
headers.setSessionId(sessionId);
headers.setAcceptVersion("1.1,1.2");
Message<?> message = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build();
Message<?> message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build();
MessageExchangeBuilder builder = new MessageExchangeBuilder(message);
builder.expected.add(new StompConnectedFrameMessageMatcher(sessionId));
@@ -415,7 +415,7 @@ public class StompBrokerRelayMessageHandlerIntegrationTests {
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.CONNECT);
headers.setSessionId(sessionId);
headers.setAcceptVersion("1.1,1.2");
Message<?> message = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build();
Message<?> message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build();
MessageExchangeBuilder builder = new MessageExchangeBuilder(message);
return builder.andExpectError();
}
@@ -428,7 +428,7 @@ public class StompBrokerRelayMessageHandlerIntegrationTests {
headers.setSubscriptionId(subscriptionId);
headers.setDestination(destination);
headers.setReceipt(receiptId);
Message<?> message = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build();
Message<?> message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build();
MessageExchangeBuilder builder = new MessageExchangeBuilder(message);
builder.expected.add(new StompReceiptFrameMessageMatcher(sessionId, receiptId));
@@ -438,7 +438,7 @@ public class StompBrokerRelayMessageHandlerIntegrationTests {
public static MessageExchangeBuilder send(String destination, String payload) {
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND);
headers.setDestination(destination);
Message<?> message = MessageBuilder.withPayloadAndHeaders(payload.getBytes(UTF_8), headers).build();
Message<?> message = MessageBuilder.withPayload(payload.getBytes(UTF_8)).setHeaders(headers).build();
return new MessageExchangeBuilder(message);
}

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

@@ -28,6 +28,7 @@ import org.springframework.messaging.support.MessageBuilder;
import reactor.function.Consumer;
import reactor.function.Function;
import reactor.io.Buffer;
import static org.junit.Assert.*;
@@ -174,7 +175,7 @@ public class StompCodecTests {
public void encodeFrameWithNoHeadersAndNoBody() {
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.DISCONNECT);
Message<byte[]> frame = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build();
Message<byte[]> frame = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build();
assertEquals("DISCONNECT\n\n\0", new StompCodec().encoder().apply(frame).asString());
}
@@ -185,7 +186,7 @@ public class StompCodecTests {
headers.setAcceptVersion("1.2");
headers.setHost("github.org");
Message<byte[]> frame = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build();
Message<byte[]> frame = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build();
String frameString = new StompCodec().encoder().apply(frame).asString();
@@ -198,7 +199,7 @@ public class StompCodecTests {
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.DISCONNECT);
headers.addNativeHeader("a:\r\n\\b", "alpha:bravo\r\n\\");
Message<byte[]> frame = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build();
Message<byte[]> frame = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build();
assertEquals("DISCONNECT\na\\c\\r\\n\\\\b:alpha\\cbravo\\r\\n\\\\\n\n\0", new StompCodec().encoder().apply(frame).asString());
}
@@ -208,7 +209,7 @@ public class StompCodecTests {
StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.SEND);
headers.addNativeHeader("a", "alpha");
Message<byte[]> frame = MessageBuilder.withPayloadAndHeaders("Message body".getBytes(), headers).build();
Message<byte[]> frame = MessageBuilder.withPayload("Message body".getBytes()).setHeaders(headers).build();
assertEquals("SEND\na:alpha\ncontent-length:12\n\nMessage body\0", new StompCodec().encoder().apply(frame).asString());
}

4
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompProtocolHandlerTests.java
View File

@@ -69,12 +69,12 @@ public class StompProtocolHandlerTests {
connectHeaders.setHeartbeat(10000, 10000);
connectHeaders.setNativeHeader(StompHeaderAccessor.STOMP_ACCEPT_VERSION_HEADER, "1.0,1.1");
Message<?> connectMessage = MessageBuilder.withPayloadAndHeaders(new byte[0], connectHeaders).build();
Message<?> connectMessage = MessageBuilder.withPayload(new byte[0]).setHeaders(connectHeaders).build();
SimpMessageHeaderAccessor connectAckHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT_ACK);
connectAckHeaders.setHeader(SimpMessageHeaderAccessor.CONNECT_MESSAGE_HEADER, connectMessage);
Message<byte[]> connectAck = MessageBuilder.withPayloadAndHeaders(new byte[0], connectAckHeaders).build();
Message<byte[]> connectAck = MessageBuilder.withPayload(new byte[0]).setHeaders(connectAckHeaders).build();
this.stompHandler.handleMessageToClient(this.session, connectAck);
verifyNoMoreInteractions(this.channel);

2
spring-messaging/src/test/java/org/springframework/messaging/support/channel/ChannelInterceptorTests.java
View File

@@ -131,8 +131,6 @@ public class ChannelInterceptorTests {
private AtomicInteger counter = new AtomicInteger();
private String foo;
@Override
public Message<?> preSend(Message<?> message, MessageChannel channel) {
assertNotNull(message);