From d22ec1cf7acd514b01d00202089d2f300c3f267f Mon Sep 17 00:00:00 2001 From: "selva.andre" Date: Sun, 15 Jun 2014 18:47:17 +0200 Subject: [PATCH] Minor change, remove unused (and without any meaning) session parameter from PublishEvent --- .../spi/impl/HawtDBStorageService.java | 2 +- .../messaging/spi/impl/ProtocolProcessor.java | 6 +++--- .../messaging/spi/impl/SimpleMessaging.java | 2 +- .../messaging/spi/impl/events/PublishEvent.java | 17 ++++------------- .../spi/impl/ProtocolProcessorTest.java | 10 +++++----- 5 files changed, 14 insertions(+), 23 deletions(-) diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java index 199f22a4..ac9f149e 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java +++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/HawtDBStorageService.java @@ -307,7 +307,7 @@ public class HawtDBStorageService implements IStorageService { ByteBuffer bbmessage = ByteBuffer.wrap(message); //bbmessage.flip(); PublishEvent liveEvt = new PublishEvent(evt.getTopic(), evt.getQos(), - bbmessage, evt.isRetain(), evt.getClientID(), evt.getMessageID(), null); + bbmessage, evt.isRetain(), evt.getClientID(), evt.getMessageID()); return liveEvt; } } diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java index b89948f0..248334bf 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java +++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java @@ -318,13 +318,13 @@ class ProtocolProcessor implements EventHandler { //if the target subscription is not clean session and is not connected => store it if (!sub.isCleanSession() && !sub.isActive()) { //clone the event with matching clientID - PublishEvent newPublishEvt = new PublishEvent(topic, qos, message, retain, sub.getClientId(), messageID, null); + PublishEvent newPublishEvt = new PublishEvent(topic, qos, message, retain, sub.getClientId(), messageID); m_storageService.storePublishForFuture(newPublishEvt); } else { //if QoS 2 then store it in temp memory if (qos ==AbstractMessage.QOSType.EXACTLY_ONCE) { String publishKey = String.format("%s%d", sub.getClientId(), messageID); - PublishEvent newPublishEvt = new PublishEvent(topic, qos, message, retain, sub.getClientId(), messageID, null); + PublishEvent newPublishEvt = new PublishEvent(topic, qos, message, retain, sub.getClientId(), messageID); m_storageService.addInFlight(newPublishEvt, publishKey); } //publish @@ -482,7 +482,7 @@ class ProtocolProcessor implements EventHandler { if (m_willStore.containsKey(clientID)) { WillMessage will = m_willStore.get(clientID); PublishEvent pubEvt = new PublishEvent(will.getTopic(), will.getQos(), - will.getPayload(), will.isRetained(), clientID, null); + will.getPayload(), will.isRetained(), clientID); processPublish(pubEvt); m_willStore.remove(clientID); } diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java index 684f5088..cdfbcf6b 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java +++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java @@ -145,7 +145,7 @@ public class SimpleMessaging implements IMessaging, EventHandler { } else if (message instanceof PublishMessage) { PublishEvent pubEvt; String clientID = (String) session.getAttribute(Constants.ATTR_CLIENTID); - pubEvt = new PublishEvent((PublishMessage) message, clientID, session); + pubEvt = new PublishEvent((PublishMessage) message, clientID); // if (message.getQos() == QOSType.MOST_ONE) { // pubEvt = new PublishEvent(pubMsg.getTopicName(), pubMsg.getQos(), pubMsg.getPayload(), pubMsg.isRetainFlag(), clientID, session); // diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java index 7f33dcb8..c51ece56 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java +++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java @@ -35,33 +35,29 @@ public class PublishEvent extends MessagingEvent { //Optional attribute, available only fo QoS 1 and 2 int m_msgID; - transient ServerChannel m_session; - - public PublishEvent(PublishMessage pubMsg, String clientID, ServerChannel session) { + public PublishEvent(PublishMessage pubMsg, String clientID) { m_topic = pubMsg.getTopicName(); m_qos = pubMsg.getQos(); m_message = pubMsg.getPayload(); m_retain = pubMsg.isRetainFlag(); m_clientID = clientID; - m_session = session; if (pubMsg.getQos() != QOSType.MOST_ONE) { m_msgID = pubMsg.getMessageID(); } } public PublishEvent(String topic, QOSType qos, ByteBuffer message, boolean retain, - String clientID, ServerChannel session) { + String clientID) { m_topic = topic; m_qos = qos; m_message = message; m_retain = retain; m_clientID = clientID; - m_session = session; } public PublishEvent(String topic, QOSType qos, ByteBuffer message, boolean retain, - String clientID, int msgID, ServerChannel session) { - this(topic, qos, message, retain, clientID, session); + String clientID, int msgID) { + this(topic, qos, message, retain, clientID); m_msgID = msgID; } @@ -89,11 +85,6 @@ public class PublishEvent extends MessagingEvent { return m_msgID; } - //TODO remove the session it's never used!! - public ServerChannel getSession() { - return m_session; - } - @Override public String toString() { return "PublishEvent{" + diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java index 292767d4..e604bff3 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java +++ b/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java @@ -272,7 +272,7 @@ public class ProtocolProcessorTest { //Exercise ByteBuffer buffer = ByteBuffer.allocate(5).put("Hello".getBytes()); - PublishEvent pubEvt = new PublishEvent(FAKE_TOPIC, AbstractMessage.QOSType.MOST_ONE, buffer, false, "FakeCLI", null); + PublishEvent pubEvt = new PublishEvent(FAKE_TOPIC, AbstractMessage.QOSType.MOST_ONE, buffer, false, "FakeCLI"); m_processor.processPublish(pubEvt); //Verify @@ -321,7 +321,7 @@ public class ProtocolProcessorTest { //Exercise ByteBuffer buffer = ByteBuffer.allocate(5).put("Hello".getBytes()); buffer.rewind(); - PublishEvent pubEvt = new PublishEvent(FAKE_TOPIC, AbstractMessage.QOSType.MOST_ONE, buffer, false, "FakeCLI", null); + PublishEvent pubEvt = new PublishEvent(FAKE_TOPIC, AbstractMessage.QOSType.MOST_ONE, buffer, false, "FakeCLI"); m_processor.processPublish(pubEvt); //Verify @@ -418,7 +418,7 @@ public class ProtocolProcessorTest { connectMessage.setCleanSession(subscription.isCleanSession()); m_processor.processConnect(m_session, connectMessage); ByteBuffer buffer = ByteBuffer.allocate(5).put("Hello".getBytes()); - PublishEvent pubEvt = new PublishEvent(FAKE_TOPIC, AbstractMessage.QOSType.MOST_ONE, buffer, true, "Publisher", null); + PublishEvent pubEvt = new PublishEvent(FAKE_TOPIC, AbstractMessage.QOSType.MOST_ONE, buffer, true, "Publisher"); m_processor.processPublish(pubEvt); //Exercise @@ -447,7 +447,7 @@ public class ProtocolProcessorTest { //Exercise ByteBuffer buffer = ByteBuffer.allocate(5).put("Hello".getBytes()); - PublishEvent pubEvt = new PublishEvent("/topic", AbstractMessage.QOSType.MOST_ONE, buffer, true, "Publisher", null); + PublishEvent pubEvt = new PublishEvent("/topic", AbstractMessage.QOSType.MOST_ONE, buffer, true, "Publisher"); m_processor.processPublish(pubEvt); //Verify no message is received @@ -467,7 +467,7 @@ public class ProtocolProcessorTest { //Exercise ByteBuffer buffer = ByteBuffer.allocate(5).put("Hello".getBytes()); - PublishEvent pubEvt = new PublishEvent("/topic", AbstractMessage.QOSType.MOST_ONE, buffer, true, "Publisher", null); + PublishEvent pubEvt = new PublishEvent("/topic", AbstractMessage.QOSType.MOST_ONE, buffer, true, "Publisher"); m_processor.processPublish(pubEvt); //Verify no message is received