root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid collection lookups in StompCommand 

Issue: SPR-14636
This commit is contained in:
Juergen Hoeller 2016-08-29 11:54:21 +02:00
parent 728a548199
commit 899ebd8ee2
2 changed files with 138 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompCommand.java
View File

@ -16,79 +16,76 @@
package org.springframework.messaging.simp.stomp; package org.springframework.messaging.simp.stomp;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.springframework.messaging.simp.SimpMessageType; import org.springframework.messaging.simp.SimpMessageType;
/** /**
* Represents a STOMP command. * Represents a STOMP command.
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @author Juergen Hoeller
* @since 4.0 * @since 4.0
*/ */
public enum StompCommand { public enum StompCommand {
// client // client
CONNECT, STOMP(SimpMessageType.CONNECT),
STOMP, CONNECT(SimpMessageType.CONNECT),
DISCONNECT, DISCONNECT(SimpMessageType.DISCONNECT),
SUBSCRIBE, SUBSCRIBE(SimpMessageType.SUBSCRIBE, true, true, false),
UNSUBSCRIBE, UNSUBSCRIBE(SimpMessageType.UNSUBSCRIBE, false, true, false),
SEND, SEND(SimpMessageType.MESSAGE, true, false, true),
ACK, ACK(SimpMessageType.OTHER),
NACK, NACK(SimpMessageType.OTHER),
BEGIN, BEGIN(SimpMessageType.OTHER),
COMMIT, COMMIT(SimpMessageType.OTHER),
ABORT, ABORT(SimpMessageType.OTHER),
// server // server
CONNECTED, CONNECTED(SimpMessageType.OTHER),
MESSAGE, RECEIPT(SimpMessageType.OTHER),
RECEIPT, MESSAGE(SimpMessageType.MESSAGE, true, true, true),
ERROR; ERROR(SimpMessageType.OTHER, false, false, true);
private static Map<StompCommand, SimpMessageType> messageTypes = new HashMap<>(); private final SimpMessageType messageType;
static {
messageTypes.put(StompCommand.CONNECT, SimpMessageType.CONNECT); private final boolean destination;
messageTypes.put(StompCommand.STOMP, SimpMessageType.CONNECT);
messageTypes.put(StompCommand.SEND, SimpMessageType.MESSAGE); private final boolean subscriptionId;
messageTypes.put(StompCommand.MESSAGE, SimpMessageType.MESSAGE);
messageTypes.put(StompCommand.SUBSCRIBE, SimpMessageType.SUBSCRIBE); private final boolean body;
messageTypes.put(StompCommand.UNSUBSCRIBE, SimpMessageType.UNSUBSCRIBE);
messageTypes.put(StompCommand.DISCONNECT, SimpMessageType.DISCONNECT);
StompCommand(SimpMessageType messageType) {
this(messageType, false, false, false);
} }
private static Collection<StompCommand> destinationRequired = Arrays.asList(SEND, SUBSCRIBE, MESSAGE); StompCommand(SimpMessageType messageType, boolean destination, boolean subscriptionId, boolean body) {
private static Collection<StompCommand> subscriptionIdRequired = Arrays.asList(SUBSCRIBE, UNSUBSCRIBE, MESSAGE); this.messageType = messageType;
private static Collection<StompCommand> contentLengthRequired = Arrays.asList(SEND, MESSAGE, ERROR); this.destination = destination;
private static Collection<StompCommand> bodyAllowed = Arrays.asList(SEND, MESSAGE, ERROR); this.subscriptionId = subscriptionId;
this.body = body;
}
public SimpMessageType getMessageType() { public SimpMessageType getMessageType() {
SimpMessageType type = messageTypes.get(this); return this.messageType;
return (type != null) ? type : SimpMessageType.OTHER;
} }
public boolean requiresDestination() { public boolean requiresDestination() {
return destinationRequired.contains(this); return this.destination;
} }
public boolean requiresSubscriptionId() { public boolean requiresSubscriptionId() {
return subscriptionIdRequired.contains(this); return this.subscriptionId;
} }
public boolean requiresContentLength() { public boolean requiresContentLength() {
return contentLengthRequired.contains(this); return this.body;
} }
public boolean isBodyAllowed() { public boolean isBodyAllowed() {
return bodyAllowed.contains(this); return this.body;
} }
} }

100
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCommandTests.java Normal file
View File

@ -0,0 +1,100 @@
/*
* Copyright 2002-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.messaging.simp.stomp;
import java.util.Arrays;
import java.util.Collection;
import java.util.EnumMap;
import java.util.Map;
import org.junit.Test;
import org.springframework.messaging.simp.SimpMessageType;
import static org.junit.Assert.*;
/**
* @author Juergen Hoeller
*/
public class StompCommandTests {
private static final Collection<StompCommand> destinationRequired =
Arrays.asList(StompCommand.SEND, StompCommand.SUBSCRIBE, StompCommand.MESSAGE);
private static final Collection<StompCommand> subscriptionIdRequired =
Arrays.asList(StompCommand.SUBSCRIBE, StompCommand.UNSUBSCRIBE, StompCommand.MESSAGE);
private static final Collection<StompCommand> contentLengthRequired =
Arrays.asList(StompCommand.SEND, StompCommand.MESSAGE, StompCommand.ERROR);
private static final Collection<StompCommand> bodyAllowed =
Arrays.asList(StompCommand.SEND, StompCommand.MESSAGE, StompCommand.ERROR);
private static final Map<StompCommand, SimpMessageType> messageTypes =
new EnumMap<>(StompCommand.class);
static {
messageTypes.put(StompCommand.STOMP, SimpMessageType.CONNECT);
messageTypes.put(StompCommand.CONNECT, SimpMessageType.CONNECT);
messageTypes.put(StompCommand.DISCONNECT, SimpMessageType.DISCONNECT);
messageTypes.put(StompCommand.SUBSCRIBE, SimpMessageType.SUBSCRIBE);
messageTypes.put(StompCommand.UNSUBSCRIBE, SimpMessageType.UNSUBSCRIBE);
messageTypes.put(StompCommand.SEND, SimpMessageType.MESSAGE);
messageTypes.put(StompCommand.MESSAGE, SimpMessageType.MESSAGE);
}
@Test
public void getMessageType() throws Exception {
for (StompCommand stompCommand : StompCommand.values()) {
SimpMessageType simp = messageTypes.get(stompCommand);
if (simp == null) {
simp = SimpMessageType.OTHER;
}
assertSame(simp, stompCommand.getMessageType());
}
}
@Test
public void requiresDestination() throws Exception {
for (StompCommand stompCommand : StompCommand.values()) {
assertEquals(destinationRequired.contains(stompCommand), stompCommand.requiresDestination());
}
}
@Test
public void requiresSubscriptionId() throws Exception {
for (StompCommand stompCommand : StompCommand.values()) {
assertEquals(subscriptionIdRequired.contains(stompCommand), stompCommand.requiresSubscriptionId());
}
}
@Test
public void requiresContentLength() throws Exception {
for (StompCommand stompCommand : StompCommand.values()) {
assertEquals(contentLengthRequired.contains(stompCommand), stompCommand.requiresContentLength());
}
}
@Test
public void isBodyAllowed() throws Exception {
for (StompCommand stompCommand : StompCommand.values()) {
assertEquals(bodyAllowed.contains(stompCommand), stompCommand.isBodyAllowed());
}
}
}