anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor changed, fixed typo in method name (ProcotolVersion to ProtocolVersion)

Browse Source
This commit is contained in:
andrea
2015-08-08 19:03:27 +02:00
parent ccc5ceb3b9
commit 0c114d3dab
6 changed files with 39 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java
+1 -1
View File
@@ -152,7 +152,7 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
@MQTTMessage(message = ConnectMessage.class)
void processConnect(ServerChannel session, ConnectMessage msg) {
LOG.debug("CONNECT for client <{}>", msg.getClientID());
if (msg.getProcotolVersion() != VERSION_3_1 && msg.getProcotolVersion() != VERSION_3_1_1) {
if (msg.getProtocolVersion() != VERSION_3_1 && msg.getProtocolVersion() != VERSION_3_1_1) {
ConnAckMessage badProto = new ConnAckMessage();
badProto.setReturnCode(ConnAckMessage.UNNACEPTABLE_PROTOCOL_VERSION);
LOG.warn("processConnect sent bad proto ConnAck");
broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java
+3 -3
View File
@@ -77,7 +77,7 @@ public class ServerLowlevelMessagesIntegrationTests {
public void elapseKeepAliveTime() throws InterruptedException {
int keepAlive = 2; //secs
ConnectMessage connectMessage = new ConnectMessage();
connectMessage.setProcotolVersion((byte)3);
connectMessage.setProtocolVersion((byte) 3);
connectMessage.setClientID("FAKECLNT");
connectMessage.setKeepAlive(keepAlive);
m_client.sendMessage(connectMessage);
@@ -101,7 +101,7 @@ public class ServerLowlevelMessagesIntegrationTests {
int keepAlive = 2; //secs
ConnectMessage connectMessage = new ConnectMessage();
connectMessage.setProcotolVersion((byte)3);
connectMessage.setProtocolVersion((byte) 3);
connectMessage.setClientID("FAKECLNT");
connectMessage.setKeepAlive(keepAlive);
connectMessage.setWillFlag(true);
@@ -145,7 +145,7 @@ public class ServerLowlevelMessagesIntegrationTests {
int keepAlive = 2; //secs
ConnectMessage connectMessage = new ConnectMessage();
connectMessage.setProcotolVersion((byte) 4);
connectMessage.setProtocolVersion((byte) 4);
connectMessage.setClientID("");
connectMessage.setKeepAlive(keepAlive);
connectMessage.setWillFlag(false);
broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java
+9 -9
View File
@@ -158,7 +158,7 @@ public class ProtocolProcessorTest {
@Before
public void setUp() throws InterruptedException {
connMsg = new ConnectMessage();
connMsg.setProcotolVersion((byte) 0x03);
connMsg.setProtocolVersion((byte) 0x03);
m_session = new DummyChannel();
@@ -182,7 +182,7 @@ public class ProtocolProcessorTest {
@Test
public void testHandleConnect_BadProtocol() {
connMsg.setProcotolVersion((byte) 0x02);
connMsg.setProtocolVersion((byte) 0x02);
//Exercise
m_processor.processConnect(m_session, connMsg);
@@ -316,7 +316,7 @@ public class ProtocolProcessorTest {
//create another connect same clientID but with bad credentials
ConnectMessage evilClientConnMsg = new ConnectMessage();
evilClientConnMsg.setProcotolVersion((byte) 0x03);
evilClientConnMsg.setProtocolVersion((byte) 0x03);
evilClientConnMsg.setClientID("Client1");
evilClientConnMsg.setUserFlag(true);
evilClientConnMsg.setPasswordFlag(true);
@@ -339,7 +339,7 @@ public class ProtocolProcessorTest {
@Test
public void testConnAckContainsSessionPresentFlag() throws InterruptedException {
connMsg = new ConnectMessage();
connMsg.setProcotolVersion(VERSION_3_1_1);
connMsg.setProtocolVersion(VERSION_3_1_1);
connMsg.setClientID("CliID");
connMsg.setCleanSession(false);
m_session.setAttribute(NettyChannel.ATTR_KEY_CLIENTID, "CliID");
@@ -383,7 +383,7 @@ public class ProtocolProcessorTest {
subs.init(new MemoryStorageService());
m_processor.init(subs, m_storageService, m_sessionStore, null, true, new PermitAllAuthorizator(), NO_OBSERVERS_INTERCEPTOR);
ConnectMessage connectMessage = new ConnectMessage();
connectMessage.setProcotolVersion((byte)3);
connectMessage.setProtocolVersion((byte) 3);
connectMessage.setClientID(FAKE_CLIENT_ID);
connectMessage.setCleanSession(subscription.isCleanSession());
m_processor.processConnect(m_session, connectMessage);
@@ -429,7 +429,7 @@ public class ProtocolProcessorTest {
MockReceiverChannel firstReceiverSession = new MockReceiverChannel();
ConnectMessage connectMessage = new ConnectMessage();
connectMessage.setProcotolVersion((byte)3);
connectMessage.setProtocolVersion((byte) 3);
connectMessage.setClientID(FAKE_CLIENT_ID);
connectMessage.setCleanSession(subscription.isCleanSession());
m_processor.processConnect(firstReceiverSession, connectMessage);
@@ -437,7 +437,7 @@ public class ProtocolProcessorTest {
//connect the second fake subscriber
MockReceiverChannel secondReceiverSession = new MockReceiverChannel();
ConnectMessage connectMessage2 = new ConnectMessage();
connectMessage2.setProcotolVersion((byte)3);
connectMessage2.setProtocolVersion((byte) 3);
connectMessage2.setClientID(FAKE_CLIENT_ID2);
connectMessage2.setCleanSession(subscription.isCleanSession());
m_processor.processConnect(secondReceiverSession, connectMessage2);
@@ -567,7 +567,7 @@ public class ProtocolProcessorTest {
m_processor.init(subs, m_storageService, m_sessionStore, null, true, new PermitAllAuthorizator(), NO_OBSERVERS_INTERCEPTOR);
ConnectMessage connectMessage = new ConnectMessage();
connectMessage.setClientID(FAKE_PUBLISHER_ID);
connectMessage.setProcotolVersion((byte)3);
connectMessage.setProtocolVersion((byte) 3);
connectMessage.setCleanSession(subscription.isCleanSession());
m_processor.processConnect(m_session, connectMessage);
ByteBuffer buffer = ByteBuffer.allocate(5).put("Hello".getBytes());
@@ -606,7 +606,7 @@ public class ProtocolProcessorTest {
m_processor.init(subs, m_storageService, m_sessionStore, null, true, new PermitAllAuthorizator(), NO_OBSERVERS_INTERCEPTOR);
ConnectMessage connectMessage = new ConnectMessage();
connectMessage.setClientID(FAKE_PUBLISHER_ID);
connectMessage.setProcotolVersion((byte)3);
connectMessage.setProtocolVersion((byte) 3);
connectMessage.setCleanSession(false);
m_processor.processConnect(m_session, connectMessage);
netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectDecoder.java
+5 -5
View File
@@ -94,8 +94,8 @@ public class ConnectDecoder extends DemuxDecoder {
}
//ProtocolVersion 1 byte (value 0x03 for 3.1, 0x04 for 3.1.1)
message.setProcotolVersion(in.readByte());
if (message.getProcotolVersion() == VERSION_3_1_1) {
message.setProtocolVersion(in.readByte());
if (message.getProtocolVersion() == VERSION_3_1_1) {
//if 3.1.1, check the flags (dup, retain and qos == 0)
if (message.isDupFlag() || message.isRetainFlag() || message.getQos() != AbstractMessage.QOSType.MOST_ONE) {
throw new CorruptedFrameException("Received a CONNECT with fixed header flags != 0");
@@ -114,7 +114,7 @@ public class ConnectDecoder extends DemuxDecoder {
//Connection flag
byte connFlags = in.readByte();
if (message.getProcotolVersion() == VERSION_3_1_1) {
if (message.getProtocolVersion() == VERSION_3_1_1) {
if ((connFlags & 0x01) != 0) { //bit(0) of connection flags is != 0
throw new CorruptedFrameException("Received a CONNECT with connectionFlags[0(bit)] != 0");
}
@@ -147,8 +147,8 @@ public class ConnectDecoder extends DemuxDecoder {
int keepAlive = in.readUnsignedShort();
message.setKeepAlive(keepAlive);
if ((remainingLength == 12 && message.getProcotolVersion() == VERSION_3_1) ||
(remainingLength == 10 && message.getProcotolVersion() == VERSION_3_1_1)) {
if ((remainingLength == 12 && message.getProtocolVersion() == VERSION_3_1) ||
(remainingLength == 10 && message.getProtocolVersion() == VERSION_3_1_1)) {
out.add(message);
return;
}
netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectDecoderTest.java
+2 -2
View File
@@ -238,7 +238,7 @@ public class ConnectDecoderTest {
private void verifyBaseHeader(ConnectMessage connMessage) {
assertNotNull(connMessage);
assertEquals("MQIsdp", connMessage.getProtocolName());
assertEquals(VERSION_3_1, connMessage.getProcotolVersion());
assertEquals(VERSION_3_1, connMessage.getProtocolVersion());
assertTrue(connMessage.isUserFlag());
assertTrue(connMessage.isPasswordFlag());
assertTrue(connMessage.isCleanSession());
@@ -251,7 +251,7 @@ public class ConnectDecoderTest {
private void verifyBaseHeader311(ConnectMessage connMessage) {
assertNotNull(connMessage);
assertEquals("MQTT", connMessage.getProtocolName());
assertEquals(VERSION_3_1_1, connMessage.getProcotolVersion());
assertEquals(VERSION_3_1_1, connMessage.getProtocolVersion());
assertTrue(connMessage.isUserFlag());
assertTrue(connMessage.isPasswordFlag());
assertTrue(connMessage.isCleanSession());
parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ConnectMessage.java
+19 -26
View File
@@ -21,24 +21,24 @@ package org.eclipse.moquette.proto.messages;
* @author andrea
*/
public class ConnectMessage extends AbstractMessage {
String m_protocolName;
byte m_procotolVersion;
protected String m_protocolName;
protected byte m_protocolVersion;
//Connection flags
boolean m_cleanSession;
boolean m_willFlag;
byte m_willQos;
boolean m_willRetain;
boolean m_passwordFlag;
boolean m_userFlag;
int m_keepAlive;
protected boolean m_cleanSession;
protected boolean m_willFlag;
protected byte m_willQos;
protected boolean m_willRetain;
protected boolean m_passwordFlag;
protected boolean m_userFlag;
protected int m_keepAlive;
//Variable part
String m_username;
String m_password;
String m_clientID;
String m_willtopic;
String m_willMessage;
protected String m_username;
protected String m_password;
protected String m_clientID;
protected String m_willtopic;
protected String m_willMessage;
public ConnectMessage() {
m_messageType = AbstractMessage.CONNECT;
@@ -68,12 +68,12 @@ public class ConnectMessage extends AbstractMessage {
this.m_passwordFlag = passwordFlag;
}
public byte getProcotolVersion() {
return m_procotolVersion;
public byte getProtocolVersion() {
return m_protocolVersion;
}
public void setProcotolVersion(byte procotolVersion) {
this.m_procotolVersion = procotolVersion;
public void setProtocolVersion(byte protocolVersion) {
this.m_protocolVersion = protocolVersion;
}
public String getProtocolName() {
@@ -158,18 +158,11 @@ public class ConnectMessage extends AbstractMessage {
@Override
public String toString() {
String base = String.format("Connect [clientID: %s, prot: %s, ver: %02X, clean: %b]", m_clientID, m_protocolName, m_procotolVersion, m_cleanSession);
String base = String.format("Connect [clientID: %s, prot: %s, ver: %02X, clean: %b]", m_clientID, m_protocolName, m_protocolVersion, m_cleanSession);
if (m_willFlag) {
base += String.format(" Will [QoS: %d, retain: %b]", m_willQos, m_willRetain);
}
return base;
}
public ConnectMessage readOnlyClone() {
try {
return (ConnectMessage) super.clone();
} catch (CloneNotSupportedException e) {
return null;
}
}
}