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

Introduce new HEARTBEAT message type

Browse Source 
Previously, there was no generic concept of a message that represents
a heartbeat and the STOMP-specific code used a null STOMP command to
represent a heartbeat.

This commit introduces HEARTBEAT as a new SimpMessageType. The STOMP
support has been updated to create HEARTBEAT messages to represent
heartbeats, and to use the new message type as the mechanism by which
heartbeats are identified.
This commit is contained in:
Andy Wilkinson
2013-10-02 11:30:18 +01:00
committed by Rossen Stoyanchev
parent a7f735b50a
commit 41e411a8a5
5 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageType.java
View File

@@ -30,6 +30,8 @@ public enum SimpMessageType {
CONNECT_ACK,
HEARTBEAT,
MESSAGE,
SUBSCRIBE,

25
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
View File

@@ -23,6 +23,7 @@ import java.nio.charset.Charset;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.messaging.Message;
import org.springframework.messaging.simp.SimpMessageType;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
@@ -50,27 +51,29 @@ public class StompDecoder {
*/
public Message<byte[]> decode(ByteBuffer buffer) {
skipLeadingEol(buffer);
Message<byte[]> decodedMessage;
String command = readCommand(buffer);
if (command.length() > 0) {
MultiValueMap<String, String> headers = readHeaders(buffer);
byte[] payload = readPayload(buffer, headers);
Message<byte[]> decodedMessage = MessageBuilder.withPayloadAndHeaders(payload,
decodedMessage = MessageBuilder.withPayloadAndHeaders(payload,
StompHeaderAccessor.create(StompCommand.valueOf(command), headers)).build();
if (logger.isTraceEnabled()) {
logger.trace("Decoded " + decodedMessage);
}
return decodedMessage;
}
else {
if (logger.isTraceEnabled()) {
logger.trace("Decoded heartbeat");
}
return MessageBuilder.withPayload(HEARTBEAT_PAYLOAD).build();
decodedMessage = MessageBuilder.withPayloadAndHeaders(HEARTBEAT_PAYLOAD,
StompHeaderAccessor.create(SimpMessageType.HEARTBEAT)).build();
}
if (logger.isTraceEnabled()) {
logger.trace("Decoded " + decodedMessage);
}
return decodedMessage;
}
private String readCommand(ByteBuffer buffer) {

3
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java
View File

@@ -26,6 +26,7 @@ import java.util.Map.Entry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.messaging.Message;
import org.springframework.messaging.simp.SimpMessageType;
/**
* An encoder for STOMP frames
@@ -78,7 +79,7 @@ public final class StompEncoder {
}
private boolean isHeartbeat(StompHeaderAccessor headers) {
return headers.getCommand() == null;
return headers.getMessageType() == SimpMessageType.HEARTBEAT;
}
private void writeCommand(StompHeaderAccessor headers, DataOutputStream output) throws IOException {