Polish MessageBuilder

rstoyanchev · rstoyanchev · commit 824cb9f8cdb9 · 2013-10-07T09:27:04.000-04:00
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
@@ -27,9 +27,9 @@ public interface DestinationResolvingMessageSendingOperations<D> extends Message
 
 	<P> void send(String destinationName, Message<P> message) throws MessagingException;
 
-	<T> void convertAndSend(String destinationName, T message) throws MessagingException;
+	<T> void convertAndSend(String destinationName, T payload) throws MessagingException;
 
-	<T> void convertAndSend(String destinationName, T message, MessagePostProcessor postProcessor)
+	<T> 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
@@ -29,12 +29,12 @@ public interface MessageSendingOperations<D> {
 
 	<P> void send(D destination, Message<P> message) throws MessagingException;
 
-	<T> void convertAndSend(T message) throws MessagingException;
+	<T> void convertAndSend(T payload) throws MessagingException;
 
-	<T> void convertAndSend(D destination, T message) throws MessagingException;
+	<T> void convertAndSend(D destination, T payload) throws MessagingException;
 
-	<T> void convertAndSend(T message, MessagePostProcessor postProcessor) throws MessagingException;
+	<T> void convertAndSend(T payload, MessagePostProcessor postProcessor) throws MessagingException;
 
-	<T> void convertAndSend(D destination, T message, MessagePostProcessor postProcessor) throws MessagingException;
+	<T> 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
@@ -29,7 +29,7 @@
  * 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<String>
@@ -104,7 +104,7 @@ protected void doSend(String destination, Message<?> message) {
 		SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.wrap(message);
 		headers.setDestination(destination);
 		headers.setMessageTypeIfNotSet(SimpMessageType.MESSAGE);
-		message = MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build();
+		message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build();
 
 		long timeout = this.sendTimeout;
 		boolean sent = (timeout >= 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
@@ -123,7 +123,7 @@ public SessionHeaderPostProcessor(String sessionId) {
 		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
@@ -99,7 +99,7 @@ public Message<?> postProcessMessage(Message<?> message) {
 			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
@@ -325,7 +325,7 @@ private void handleMessageInternal(Message<?> message, Map<MappingInfo, HandlerM
 
 		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
@@ -106,7 +106,7 @@ else if (SimpMessageType.CONNECT.equals(messageType)) {
 			replyHeaders.setSessionId(headers.getSessionId());
 			replyHeaders.setHeader(SimpMessageHeaderAccessor.CONNECT_MESSAGE_HEADER, message);
 
-			Message<byte[]> connectAck = MessageBuilder.withPayloadAndHeaders(EMPTY_PAYLOAD, replyHeaders).build();
+			Message<byte[]> connectAck = MessageBuilder.withPayload(EMPTY_PAYLOAD).setHeaders(replyHeaders).build();
 			this.messageChannel.send(connectAck);
 		}
 	}
@@ -121,7 +121,7 @@ protected void sendMessageToSubscribers(String destination, Message<?> message)
 				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
@@ -131,7 +131,7 @@ public void handleMessage(Message<?> message) throws MessagingException {
 
 			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
@@ -239,7 +239,7 @@ protected void handleMessageInternal(Message<?> message) {
 			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 @@ protected void handleMessageInternal(Message<?> message) {
 		}
 
 		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 @@ private void readStompFrame(Message<byte[]> message) {
 			}
 
 			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 @@ private void sendError(String errorText) {
 			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 void connect() {
 			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
@@ -60,11 +60,11 @@ public Message<byte[]> decode(ByteBuffer buffer) {
 			MultiValueMap<String, String> 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
@@ -119,7 +119,7 @@ public void handleMessageFromClient(WebSocketSession session, WebSocketMessage w
 			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 @@ protected void sendErrorMessage(WebSocketSession session, Throwable error) {
 
 		StompHeaderAccessor headers = StompHeaderAccessor.create(StompCommand.ERROR);
 		headers.setMessage(error.getMessage());
-		Message<byte[]> message = MessageBuilder.withPayloadAndHeaders(new byte[0], headers).build();
+		Message<byte[]> 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 @@ else if (SimpMessageType.MESSAGE.equals(headers.getMessageType())) {
 		}
 
 		try {
-			message = MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build();
+			message = MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build();
 			byte[] bytes = this.stompEncoder.encode((Message<byte[]>)message);
 			session.sendMessage(new TextMessage(new String(bytes, Charset.forName("UTF-8"))));
 		}
@@ -248,7 +248,7 @@ public void afterSessionEnded(WebSocketSession session, CloseStatus closeStatus,
 
 		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
@@ -36,20 +36,19 @@ public final class MessageBuilder<T> {
 
 	private final T payload;
 
-	private final MessageHeaderAccessor headerAccessor;
+	private MessageHeaderAccessor headerAccessor;
 
 	private final Message<T> originalMessage;
 
 
 	/**
 	 * Private constructor to be invoked from the static factory methods only.
 	 */
-	private MessageBuilder(T payload, Message<T> originalMessage, MessageHeaderAccessor headerAccessor) {
+	private MessageBuilder(T payload, Message<T> 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 @@ private MessageBuilder(T payload, Message<T> originalMessage, MessageHeaderAcces
 	 */
 	public static <T> MessageBuilder<T> fromMessage(Message<T> message) {
 		Assert.notNull(message, "message must not be null");
-		MessageBuilder<T> builder = new MessageBuilder<T>(message.getPayload(), message, null);
-		return builder;
+		return new MessageBuilder<T>(message.getPayload(), message);
 	}
 
 	/**
@@ -71,19 +69,18 @@ public static <T> MessageBuilder<T> fromMessage(Message<T> message) {
 	 * @param payload the payload for the new message
 	 */
 	public static <T> MessageBuilder<T> withPayload(T payload) {
-		MessageBuilder<T> builder = new MessageBuilder<T>(payload, null, null);
-		return builder;
+		return new MessageBuilder<T>(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 <T> MessageBuilder<T> withPayloadAndHeaders(T payload, MessageHeaderAccessor headerAccessor) {
-		MessageBuilder<T> builder = new MessageBuilder<T>(payload, null, headerAccessor);
-		return builder;
+	public MessageBuilder<T> 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
@@ -155,7 +155,7 @@ public void webSocketResponseChannelUsedByAnnotatedMethod() {
 		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,15 +179,15 @@ public void webSocketResponseChannelUsedBySimpleBroker() {
 		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);
 
 		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 void brokerChannelUsedByAnnotatedMethod() {
 
 		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 void brokerChannelUsedByUserDestinationMessageHandler() {
 
 		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
@@ -145,7 +145,7 @@ protected Message<String> createConnectMessage(String sessionId) {
 		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) {
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
@@ -159,7 +159,7 @@ public void brokerUnvailableErrorFrameOnConnect() throws Exception {
 	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 void disconnectClosesRelaySessionCleanly() throws Exception {
 		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 static MessageExchangeBuilder connect(String sessionId) {
 			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 static MessageExchangeBuilder connectWithError(String sessionId) {
 			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 static MessageExchangeBuilder subscribeWithReceipt(String sessionId, Stri
 			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 static MessageExchangeBuilder subscribeWithReceipt(String sessionId, Stri
 		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
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
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

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ public interface DestinationResolvingMessageSendingOperations<D> extends Message`
`27`	`27`
`28`	`28`	`<P> void send(String destinationName, Message<P> message) throws MessagingException;`
`29`	`29`
`30`		`- <T> void convertAndSend(String destinationName, T message) throws MessagingException;`
	`30`	`+ <T> void convertAndSend(String destinationName, T payload) throws MessagingException;`
`31`	`31`
`32`		`- <T> void convertAndSend(String destinationName, T message, MessagePostProcessor postProcessor)`
	`32`	`+ <T> void convertAndSend(String destinationName, T payload, MessagePostProcessor postProcessor)`
`33`	`33`	`throws MessagingException;`
`34`	`34`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public SessionHeaderPostProcessor(String sessionId) {`
`123`	`123`	`public Message<?> postProcessMessage(Message<?> message) {`
`124`	`124`	`SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.wrap(message);`
`125`	`125`	`headers.setSessionId(this.sessionId);`
`126`		`- return MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build();`
	`126`	`+ return MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build();`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public Message<?> postProcessMessage(Message<?> message) {`
`99`	`99`	`headers.setSessionId(this.sessionId);`
`100`	`100`	`headers.setSubscriptionId(this.subscriptionId);`
`101`	`101`	`headers.setMessageTypeIfNotSet(SimpMessageType.MESSAGE);`
`102`		`- return MessageBuilder.withPayloadAndHeaders(message.getPayload(), headers).build();`
	`102`	`+ return MessageBuilder.withPayload(message.getPayload()).setHeaders(headers).build();`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ else if (SimpMessageType.CONNECT.equals(messageType)) {`
`106`	`106`	`replyHeaders.setSessionId(headers.getSessionId());`
`107`	`107`	`replyHeaders.setHeader(SimpMessageHeaderAccessor.CONNECT_MESSAGE_HEADER, message);`
`108`	`108`
`109`		`- Message<byte[]> connectAck = MessageBuilder.withPayloadAndHeaders(EMPTY_PAYLOAD, replyHeaders).build();`
	`109`	`+ Message<byte[]> connectAck = MessageBuilder.withPayload(EMPTY_PAYLOAD).setHeaders(replyHeaders).build();`
`110`	`110`	`this.messageChannel.send(connectAck);`
`111`	`111`	`}`
`112`	`112`	`}`
`@@ -121,7 +121,7 @@ protected void sendMessageToSubscribers(String destination, Message<?> message)`
`121`	`121`	`headers.setSubscriptionId(subscriptionId);`
`122`	`122`
`123`	`123`	`Object payload = message.getPayload();`
`124`		`- Message<?> clientMessage = MessageBuilder.withPayloadAndHeaders(payload, headers).build();`
	`124`	`+ Message<?> clientMessage = MessageBuilder.withPayload(payload).setHeaders(headers).build();`
`125`	`125`	`try {`
`126`	`126`	`this.messageChannel.send(clientMessage);`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ public Message<byte[]> decode(ByteBuffer buffer) {`
`60`	`60`	`MultiValueMap<String, String> headers = readHeaders(buffer);`
`61`	`61`	`byte[] payload = readPayload(buffer, headers);`
`62`	`62`
`63`		`- decodedMessage = MessageBuilder.withPayloadAndHeaders(payload,`
	`63`	`+ decodedMessage = MessageBuilder.withPayload(payload).setHeaders(`
`64`	`64`	`StompHeaderAccessor.create(StompCommand.valueOf(command), headers)).build();`
`65`	`65`	`}`
`66`	`66`	`else {`
`67`		`- decodedMessage = MessageBuilder.withPayloadAndHeaders(HEARTBEAT_PAYLOAD,`
	`67`	`+ decodedMessage = MessageBuilder.withPayload(HEARTBEAT_PAYLOAD).setHeaders(`
`68`	`68`	`StompHeaderAccessor.create(SimpMessageType.HEARTBEAT)).build();`
`69`	`69`	`}`
`70`	`70`