Renamed AnnotationHelper to AnnotationSupport
This commit is contained in:
+2
-5
@@ -15,12 +15,9 @@
|
|||||||
*/
|
*/
|
||||||
package org.dna.mqtt.moquette.messaging.spi.impl;
|
package org.dna.mqtt.moquette.messaging.spi.impl;
|
||||||
|
|
||||||
import java.lang.reflect.InvocationTargetException;
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.logging.Level;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
||||||
import org.dna.mqtt.moquette.server.ServerChannel;
|
import org.dna.mqtt.moquette.server.ServerChannel;
|
||||||
|
|
||||||
@@ -32,9 +29,9 @@ import org.dna.mqtt.moquette.server.ServerChannel;
|
|||||||
*
|
*
|
||||||
* @author andrea
|
* @author andrea
|
||||||
*/
|
*/
|
||||||
class AnnotationHelper {
|
class AnnotationSupport {
|
||||||
|
|
||||||
private Map<Class, Method> messageClassToMethod = new HashMap<Class, Method>();
|
private final Map<Class, Method> messageClassToMethod = new HashMap<Class, Method>();
|
||||||
private Object targetInstance;
|
private Object targetInstance;
|
||||||
|
|
||||||
void processAnnotations(Object instance) {
|
void processAnnotations(Object instance) {
|
||||||
+5
-1
@@ -41,6 +41,7 @@ import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
|||||||
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
|
||||||
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
|
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
|
||||||
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
|
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
|
||||||
|
import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
|
||||||
import org.dna.mqtt.moquette.proto.messages.PubAckMessage;
|
import org.dna.mqtt.moquette.proto.messages.PubAckMessage;
|
||||||
import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
|
import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
|
||||||
import org.dna.mqtt.moquette.proto.messages.PubRecMessage;
|
import org.dna.mqtt.moquette.proto.messages.PubRecMessage;
|
||||||
@@ -487,7 +488,10 @@ class ProtocolProcessor implements EventHandler<ValueEvent> {
|
|||||||
m_messagesStore.cleanInFlight(publishKey);
|
m_messagesStore.cleanInFlight(publishKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
void processDisconnect(ServerChannel session, String clientID, boolean cleanSession) throws InterruptedException {
|
@MQTTMessage(message = DisconnectMessage.class)
|
||||||
|
void processDisconnect(ServerChannel session, DisconnectMessage msg) throws InterruptedException {
|
||||||
|
String clientID = (String) session.getAttribute(Constants.ATTR_CLIENTID);
|
||||||
|
boolean cleanSession = (Boolean) session.getAttribute(Constants.CLEAN_SESSION);
|
||||||
if (cleanSession) {
|
if (cleanSession) {
|
||||||
//cleanup topic subscriptions
|
//cleanup topic subscriptions
|
||||||
cleanSession(clientID);
|
cleanSession(clientID);
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
|
|||||||
private static SimpleMessaging INSTANCE;
|
private static SimpleMessaging INSTANCE;
|
||||||
|
|
||||||
private final ProtocolProcessor m_processor = new ProtocolProcessor();
|
private final ProtocolProcessor m_processor = new ProtocolProcessor();
|
||||||
private final AnnotationHelper annotationHelper = new AnnotationHelper();
|
private final AnnotationSupport annotationSupport = new AnnotationSupport();
|
||||||
|
|
||||||
CountDownLatch m_stopLatch;
|
CountDownLatch m_stopLatch;
|
||||||
|
|
||||||
@@ -92,7 +92,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
|
|||||||
m_ringBuffer.setGatingSequences(m_eventProcessor.getSequence());
|
m_ringBuffer.setGatingSequences(m_eventProcessor.getSequence());
|
||||||
m_executor.submit(m_eventProcessor);
|
m_executor.submit(m_eventProcessor);
|
||||||
|
|
||||||
annotationHelper.processAnnotations(m_processor);
|
annotationSupport.processAnnotations(m_processor);
|
||||||
processInit(configProps);
|
processInit(configProps);
|
||||||
// disruptorPublish(new InitEvent(configProps));
|
// disruptorPublish(new InitEvent(configProps));
|
||||||
}
|
}
|
||||||
@@ -133,6 +133,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void onEvent(ValueEvent t, long l, boolean bln) throws Exception {
|
public void onEvent(ValueEvent t, long l, boolean bln) throws Exception {
|
||||||
MessagingEvent evt = t.getEvent();
|
MessagingEvent evt = t.getEvent();
|
||||||
LOG.info("onEvent processing messaging event from input ringbuffer {}", evt);
|
LOG.info("onEvent processing messaging event from input ringbuffer {}", evt);
|
||||||
@@ -149,20 +150,14 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
|
|||||||
message instanceof PubRelMessage ||
|
message instanceof PubRelMessage ||
|
||||||
message instanceof PubRecMessage ||
|
message instanceof PubRecMessage ||
|
||||||
message instanceof PubCompMessage ||
|
message instanceof PubCompMessage ||
|
||||||
message instanceof PubAckMessage) {
|
message instanceof PubAckMessage ||
|
||||||
annotationHelper.dispatch(session, message);
|
message instanceof DisconnectMessage) {
|
||||||
|
annotationSupport.dispatch(session, message);
|
||||||
} else if (message instanceof PublishMessage) {
|
} else if (message instanceof PublishMessage) {
|
||||||
PublishEvent pubEvt;
|
PublishEvent pubEvt;
|
||||||
String clientID = (String) session.getAttribute(Constants.ATTR_CLIENTID);
|
String clientID = (String) session.getAttribute(Constants.ATTR_CLIENTID);
|
||||||
pubEvt = new PublishEvent((PublishMessage) message, clientID);
|
pubEvt = new PublishEvent((PublishMessage) message, clientID);
|
||||||
m_processor.processPublish(pubEvt);
|
m_processor.processPublish(pubEvt);
|
||||||
} else if (message instanceof DisconnectMessage) {
|
|
||||||
String clientID = (String) session.getAttribute(Constants.ATTR_CLIENTID);
|
|
||||||
boolean cleanSession = (Boolean) session.getAttribute(Constants.CLEAN_SESSION);
|
|
||||||
|
|
||||||
//close the TCP connection
|
|
||||||
//session.close(true);
|
|
||||||
m_processor.processDisconnect(session, clientID, cleanSession);
|
|
||||||
} else {
|
} else {
|
||||||
throw new RuntimeException("Illegal message received " + message);
|
throw new RuntimeException("Illegal message received " + message);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -25,7 +25,7 @@ import org.junit.Test;
|
|||||||
*
|
*
|
||||||
* @author andrea
|
* @author andrea
|
||||||
*/
|
*/
|
||||||
public class AnnotationHelperTest {
|
public class AnnotationSuportTest {
|
||||||
|
|
||||||
class SimplyAnnotatedFixture {
|
class SimplyAnnotatedFixture {
|
||||||
|
|
||||||
@@ -46,7 +46,7 @@ public class AnnotationHelperTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testAnnotationDiscovery() {
|
public void testAnnotationDiscovery() {
|
||||||
AnnotationHelper annHelper = new AnnotationHelper();
|
AnnotationSupport annHelper = new AnnotationSupport();
|
||||||
annHelper.processAnnotations(annotationTarget);
|
annHelper.processAnnotations(annotationTarget);
|
||||||
annHelper.dispatch(null, new ConnectMessage());
|
annHelper.dispatch(null, new ConnectMessage());
|
||||||
|
|
||||||
+4
-1
@@ -35,6 +35,7 @@ import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
|
|||||||
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
|
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
|
||||||
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
|
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
|
||||||
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
|
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
|
||||||
|
import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
|
||||||
import org.dna.mqtt.moquette.proto.messages.PublishMessage;
|
import org.dna.mqtt.moquette.proto.messages.PublishMessage;
|
||||||
import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
|
import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
|
||||||
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
|
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
|
||||||
@@ -259,11 +260,13 @@ public class ProtocolProcessorTest {
|
|||||||
connMsg.setProcotolVersion(VERSION_3_1_1);
|
connMsg.setProcotolVersion(VERSION_3_1_1);
|
||||||
connMsg.setClientID("CliID");
|
connMsg.setClientID("CliID");
|
||||||
connMsg.setCleanSession(false);
|
connMsg.setCleanSession(false);
|
||||||
|
m_session.setAttribute(Constants.ATTR_CLIENTID, "CliID");
|
||||||
|
m_session.setAttribute(Constants.CLEAN_SESSION, false);
|
||||||
|
|
||||||
//Connect a first time
|
//Connect a first time
|
||||||
m_processor.processConnect(m_session, connMsg);
|
m_processor.processConnect(m_session, connMsg);
|
||||||
//disconnect
|
//disconnect
|
||||||
m_processor.processDisconnect(m_session, "CliID", false);
|
m_processor.processDisconnect(m_session, new DisconnectMessage());
|
||||||
|
|
||||||
//Exercise, reconnect
|
//Exercise, reconnect
|
||||||
MockReceiverChannel firstReceiverSession = new MockReceiverChannel();
|
MockReceiverChannel firstReceiverSession = new MockReceiverChannel();
|
||||||
|
|||||||
Reference in New Issue
Block a user