diff --git a/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageSendingOperations.java b/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageSendingOperations.java index 8f93ccb1ef..4b82b53143 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageSendingOperations.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageSendingOperations.java @@ -27,9 +27,9 @@ public interface DestinationResolvingMessageSendingOperations extends Message

void send(String destinationName, Message

message) throws MessagingException; - void convertAndSend(String destinationName, T message) throws MessagingException; + void convertAndSend(String destinationName, T payload) throws MessagingException; - void convertAndSend(String destinationName, T message, MessagePostProcessor postProcessor) + void convertAndSend(String destinationName, T payload, MessagePostProcessor postProcessor) throws MessagingException; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/core/MessageSendingOperations.java b/spring-messaging/src/main/java/org/springframework/messaging/core/MessageSendingOperations.java index 3e14c1ea1a..b9b4773a59 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/core/MessageSendingOperations.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/core/MessageSendingOperations.java @@ -29,12 +29,12 @@ public interface MessageSendingOperations {

void send(D destination, Message

message) throws MessagingException; - void convertAndSend(T message) throws MessagingException; + void convertAndSend(T payload) throws MessagingException; - void convertAndSend(D destination, T message) throws MessagingException; + void convertAndSend(D destination, T payload) throws MessagingException; - void convertAndSend(T message, MessagePostProcessor postProcessor) throws MessagingException; + void convertAndSend(T payload, MessagePostProcessor postProcessor) throws MessagingException; - void convertAndSend(D destination, T message, MessagePostProcessor postProcessor) throws MessagingException; + void convertAndSend(D destination, T payload, MessagePostProcessor postProcessor) throws MessagingException; } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java index aea1bc127a..2272b7fcd8 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java @@ -29,7 +29,7 @@ import org.springframework.util.Assert; * A specialization of {@link AbstractMessageSendingTemplate} that adds String-based * destinations as a message header. * - * @author Mark Fisher + * @author Rossen Stoyanchev * @since 4.0 */ public class SimpMessagingTemplate extends AbstractMessageSendingTemplate @@ -104,7 +104,7 @@ public class SimpMessagingTemplate extends AbstractMessageSendingTemplate= 0) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java index 4d22a60640..f2e9409268 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java @@ -123,7 +123,7 @@ public class SendToMethodReturnValueHandler implements HandlerMethodReturnValueH public Message postProcessMessage(Message message) { SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.wrap(message); headers.setSessionId(this.sessionId); - return MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build(); + return MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); } } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java index 9b0e4fdde2..164c10e028 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java @@ -99,7 +99,7 @@ public class SubscriptionMethodReturnValueHandler implements HandlerMethodReturn headers.setSessionId(this.sessionId); headers.setSubscriptionId(this.subscriptionId); headers.setMessageTypeIfNotSet(SimpMessageType.MESSAGE); - return MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build(); + return MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); } } } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandler.java index 08fa177c6d..c4fa547ffb 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandler.java @@ -325,7 +325,7 @@ public class AnnotationMethodMessageHandler implements MessageHandler, Applicati try { headers.setDestination(lookupPath); - message = MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build(); + message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); Object returnValue = invocableHandlerMethod.invoke(message); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandler.java index 7592ad13ae..efa57e3797 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandler.java @@ -106,7 +106,7 @@ public class SimpleBrokerMessageHandler extends AbstractBrokerMessageHandler { replyHeaders.setSessionId(headers.getSessionId()); replyHeaders.setHeader(SimpMessageHeaderAccessor.CONNECT_MESSAGE_HEADER, message); - Message connectAck = MessageBuilder.withPayloadAndHeaders(EMPTY_PAYLOAD, replyHeaders).build(); + Message connectAck = MessageBuilder.withPayload(EMPTY_PAYLOAD).setHeaders(replyHeaders).build(); this.messageChannel.send(connectAck); } } @@ -121,7 +121,7 @@ public class SimpleBrokerMessageHandler extends AbstractBrokerMessageHandler { headers.setSubscriptionId(subscriptionId); Object payload = message.getPayload(); - Message clientMessage = MessageBuilder.withPayloadAndHeaders(payload, headers).build(); + Message clientMessage = MessageBuilder.withPayload(payload).setHeaders(headers).build(); try { this.messageChannel.send(clientMessage); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserDestinationMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserDestinationMessageHandler.java index d27db9946b..a645a270ec 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserDestinationMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserDestinationMessageHandler.java @@ -131,7 +131,7 @@ public class UserDestinationMessageHandler implements MessageHandler { String targetDestination = destinationParser.getTargetDestination(sessionId); headers.setDestination(targetDestination); - message = MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build(); + message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); if (logger.isTraceEnabled()) { logger.trace("Sending message to resolved target destination " + targetDestination); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java index 277e314c77..08da6d15a8 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java @@ -239,7 +239,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler sessionId = (sessionId == null) ? SystemStompRelaySession.ID : sessionId; headers.setSessionId(sessionId); headers.updateStompCommandAsClientMessage(); - message = MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build(); + message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); } if (sessionId == null) { @@ -252,7 +252,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler } if (SimpMessageType.CONNECT.equals(messageType)) { - message = MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build(); + message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); StompRelaySession session = new StompRelaySession(sessionId); this.relaySessions.put(sessionId, session); session.connect(message); @@ -359,7 +359,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler } headers.setSessionId(this.sessionId); - message = MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build(); + message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); sendMessageToClient(message); } @@ -383,7 +383,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.ERROR); headers.setSessionId(this.sessionId); headers.setMessage(errorText); - Message errorMessage = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build(); + Message errorMessage = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build(); sendMessageToClient(errorMessage); } @@ -516,7 +516,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler headers.setLogin(systemLogin); headers.setPasscode(systemPasscode); headers.setHeartbeat(systemHeartbeatSendInterval, systemHeartbeatReceiveInterval); - Message connectMessage = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build(); + Message connectMessage = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build(); super.connect(connectMessage); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java index 69d3930441..5b1a0d446b 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java @@ -60,11 +60,11 @@ public class StompDecoder { MultiValueMap headers = readHeaders(buffer); byte[] payload = readPayload(buffer, headers); - decodedMessage = MessageBuilder.withPayloadAndHeaders(payload, + decodedMessage = MessageBuilder.withPayload(payload).setHeaders( StompHeaderAccessor.create(StompCommand.valueOf(command), headers)).build(); } else { - decodedMessage = MessageBuilder.withPayloadAndHeaders(HEARTBEAT_PAYLOAD, + decodedMessage = MessageBuilder.withPayload(HEARTBEAT_PAYLOAD).setHeaders( StompHeaderAccessor.create(SimpMessageType.HEARTBEAT)).build(); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompProtocolHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompProtocolHandler.java index 59ebf7f8c8..2a4b17cdbb 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompProtocolHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompProtocolHandler.java @@ -119,7 +119,7 @@ public class StompProtocolHandler implements SubProtocolHandler { headers.setSessionId(session.getId()); headers.setUser(session.getPrincipal()); - message = MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build(); + message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); outputChannel.send(message); } catch (Throwable t) { @@ -132,7 +132,7 @@ public class StompProtocolHandler implements SubProtocolHandler { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.ERROR); headers.setMessage(error.getMessage()); - Message message = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build(); + Message message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build(); String payload = new String(this.stompEncoder.encode(message), Charset.forName("UTF-8")); try { session.sendMessage(new TextMessage(payload)); @@ -176,7 +176,7 @@ public class StompProtocolHandler implements SubProtocolHandler { } try { - message = MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build(); + message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build(); byte[] bytes = this.stompEncoder.encode((Message)message); session.sendMessage(new TextMessage(new String(bytes, Charset.forName("UTF-8")))); } @@ -248,7 +248,7 @@ public class StompProtocolHandler implements SubProtocolHandler { StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.DISCONNECT); headers.setSessionId(session.getId()); - Message message = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build(); + Message message = MessageBuilder.withPayload(new byte[0]).setHeaders(headers).build(); outputChannel.send(message); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageBuilder.java b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageBuilder.java index 33091cdf66..fc77467897 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/support/MessageBuilder.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/support/MessageBuilder.java @@ -36,7 +36,7 @@ public final class MessageBuilder { private final T payload; - private final MessageHeaderAccessor headerAccessor; + private MessageHeaderAccessor headerAccessor; private final Message originalMessage; @@ -44,12 +44,11 @@ public final class MessageBuilder { /** * Private constructor to be invoked from the static factory methods only. */ - private MessageBuilder(T payload, Message originalMessage, MessageHeaderAccessor headerAccessor) { + private MessageBuilder(T payload, Message originalMessage) { Assert.notNull(payload, "payload must not be null"); this.payload = payload; this.originalMessage = originalMessage; - this.headerAccessor = (headerAccessor != null) ? - headerAccessor : new MessageHeaderAccessor(originalMessage); + this.headerAccessor = new MessageHeaderAccessor(originalMessage); } /** @@ -61,8 +60,7 @@ public final class MessageBuilder { */ public static MessageBuilder fromMessage(Message message) { Assert.notNull(message, "message must not be null"); - MessageBuilder builder = new MessageBuilder(message.getPayload(), message, null); - return builder; + return new MessageBuilder(message.getPayload(), message); } /** @@ -71,19 +69,18 @@ public final class MessageBuilder { * @param payload the payload for the new message */ public static MessageBuilder withPayload(T payload) { - MessageBuilder builder = new MessageBuilder(payload, null, null); - return builder; + return new MessageBuilder(payload, null); } + /** - * Create a builder for a new {@link Message} instance with the provided payload and headers. - * - * @param payload the payload for the new message + * Set the message headers. * @param headerAccessor the headers for the message */ - public static MessageBuilder withPayloadAndHeaders(T payload, MessageHeaderAccessor headerAccessor) { - MessageBuilder builder = new MessageBuilder(payload, null, headerAccessor); - return builder; + public MessageBuilder setHeaders(MessageHeaderAccessor headerAccessor) { + Assert.notNull(headerAccessor, "headerAccessor is required"); + this.headerAccessor = headerAccessor; + return this; } /** diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/WebSocketMessageBrokerConfigurationSupportTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/WebSocketMessageBrokerConfigurationSupportTests.java index 5bdfa4687a..0f04f25ecd 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/config/WebSocketMessageBrokerConfigurationSupportTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/config/WebSocketMessageBrokerConfigurationSupportTests.java @@ -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); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java index 7974a47f0e..0fa8929a25 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpleBrokerMessageHandlerTests.java @@ -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 createMessage(String destination, String payload) { diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java index e12b43d945..ccd6b4bc54 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java @@ -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); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java index e1cbcfc931..5854b963eb 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java @@ -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 frame = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build(); + Message 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 frame = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build(); + Message 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 frame = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build(); + Message 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 frame = MessageBuilder.withPayloadAndHeaders("Message body".getBytes(), headers).build(); + Message 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()); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompProtocolHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompProtocolHandlerTests.java index c44914b1df..74c5dd8976 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompProtocolHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompProtocolHandlerTests.java @@ -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 connectAck = MessageBuilder.withPayloadAndHeaders(new byte[0], connectAckHeaders).build(); + Message connectAck = MessageBuilder.withPayload(new byte[0]).setHeaders(connectAckHeaders).build(); this.stompHandler.handleMessageToClient(this.session, connectAck); verifyNoMoreInteractions(this.channel); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/support/channel/ChannelInterceptorTests.java b/spring-messaging/src/test/java/org/springframework/messaging/support/channel/ChannelInterceptorTests.java index 1a68361fa9..cd9e9f8068 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/support/channel/ChannelInterceptorTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/support/channel/ChannelInterceptorTests.java @@ -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);