Improve performance of StompCommand.getMessageType()

Closes SPR-14636
spring-projects · Aug 28, 2016 · e9555cf · e9555cf
1 parent 57cb7c7
commit e9555cf
Showing 1 changed file with 20 additions and 31 deletions.
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompCommand.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompCommand.java
@@ -18,8 +18,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.springframework.messaging.simp.SimpMessageType;
 
@@ -32,46 +30,37 @@
 public enum StompCommand {
 
 	// client
-	CONNECT,
-	STOMP,
-	DISCONNECT,
-	SUBSCRIBE,
-	UNSUBSCRIBE,
-	SEND,
-	ACK,
-	NACK,
-	BEGIN,
-	COMMIT,
-	ABORT,
+	CONNECT(SimpMessageType.CONNECT),
+	STOMP(SimpMessageType.CONNECT),
+	DISCONNECT(SimpMessageType.DISCONNECT),
+	SUBSCRIBE(SimpMessageType.SUBSCRIBE),
+	UNSUBSCRIBE(SimpMessageType.UNSUBSCRIBE),
+	SEND(SimpMessageType.MESSAGE),
+	ACK(null),
+	NACK(null),
+	BEGIN(null),
+	COMMIT(null),
+	ABORT(null),
 
 	// server
-	CONNECTED,
-	MESSAGE,
-	RECEIPT,
-	ERROR;
-
-
-	private static Map<StompCommand, SimpMessageType> messageTypes = new HashMap<>();
-	static {
-		messageTypes.put(StompCommand.CONNECT, SimpMessageType.CONNECT);
-		messageTypes.put(StompCommand.STOMP, SimpMessageType.CONNECT);
-		messageTypes.put(StompCommand.SEND, SimpMessageType.MESSAGE);
-		messageTypes.put(StompCommand.MESSAGE, SimpMessageType.MESSAGE);
-		messageTypes.put(StompCommand.SUBSCRIBE, SimpMessageType.SUBSCRIBE);
-		messageTypes.put(StompCommand.UNSUBSCRIBE, SimpMessageType.UNSUBSCRIBE);
-		messageTypes.put(StompCommand.DISCONNECT, SimpMessageType.DISCONNECT);
-	}
+	CONNECTED(null),
+	MESSAGE(SimpMessageType.MESSAGE),
+	RECEIPT(null),
+	ERROR(null);
 
 	private static Collection<StompCommand> destinationRequired = Arrays.asList(SEND, SUBSCRIBE, MESSAGE);
 	private static Collection<StompCommand> subscriptionIdRequired = Arrays.asList(SUBSCRIBE, UNSUBSCRIBE, MESSAGE);
 	private static Collection<StompCommand> contentLengthRequired = Arrays.asList(SEND, MESSAGE, ERROR);
 	private static Collection<StompCommand> bodyAllowed = Arrays.asList(SEND, MESSAGE, ERROR);
 
+	private SimpMessageType simpMessageType;
 
+	StompCommand(SimpMessageType simpMessageType) {
+		this.simpMessageType = simpMessageType;
+	}
 
 	public SimpMessageType getMessageType() {
-		SimpMessageType type = messageTypes.get(this);
-		return (type != null) ? type : SimpMessageType.OTHER;
+		return (simpMessageType != null) ? simpMessageType : SimpMessageType.OTHER;
 	}
 
 	public boolean requiresDestination() {