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

Removed no more used methods

Browse Source
This commit is contained in:
andsel
2015-11-16 23:53:10 +01:00
parent 9236def453
commit fdf5b03983
5 changed files with 2 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/org/eclipse/moquette/spi/IMessagesStore.java
-6
View File
@@ -92,11 +92,5 @@ public interface IMessagesStore {
void close();
void persistQoS2Message(String publishKey, PublishEvent evt);
void removeQoS2Message(String publishKey);
PublishEvent retrieveQoS2Message(String publishKey);
void cleanRetained(String topic);
}
broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java
-8
View File
@@ -291,10 +291,6 @@ public class ProtocolProcessor {
sendPubAck(new PubAckEvent(messageID, clientID));
LOG.debug("replying with PubAck to MSG ID {}", messageID);
} else if (qos == AbstractMessage.QOSType.EXACTLY_ONCE) { //QoS2
// String publishKey = String.format("%s%d", clientID, messageID);
//store the message in temp store
//TODO use the global message store
// m_messagesStore.persistQoS2Message(publishKey, publishEvt);
m_messagesStore.storePublishForFuture(publishEvt);
sendPubRec(clientID, messageID);
//Next the client will send us a pub rel
@@ -456,13 +452,9 @@ public class ProtocolProcessor {
String clientID = (String) session.getAttribute(NettyChannel.ATTR_KEY_CLIENTID);
int messageID = msg.getMessageID();
LOG.debug("PUB --PUBREL--> SRV processPubRel invoked for clientID {} ad messageID {}", clientID, messageID);
// String publishKey = String.format("%s%d", clientID, messageID);
// PublishEvent evt = m_messagesStore.retrieveQoS2Message(publishKey);
//get guid, get message
ClientSession targetSession = m_sessionsStore.sessionForClient(clientID);
PublishEvent evt = targetSession.storedMessage(messageID);
forward2Subscribers(evt);
// m_messagesStore.removeQoS2Message(publishKey);
if (evt.isRetain()) {
final String topic = evt.getTopic();
broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java
-21
View File
@@ -70,8 +70,6 @@ public class MapDBPersistentStore implements IMessagesStore, ISessionsStore {
private ConcurrentMap<String, Map<Integer, String>> m_inflightStore;
//map clientID <-> set of currently in flight packet identifiers
Map<String, Set<Integer>> m_inFlightIds;
//bind clientID+MsgID -> evt message published
private ConcurrentMap<String, StoredPublishEvent> m_qos2Store;
//persistent Map of clientID, set of Subscriptions
private ConcurrentMap<String, Set<Subscription>> m_persistentSubscriptions;
private ConcurrentMap<String, PersistentSession> m_persistentSessions;
@@ -119,7 +117,6 @@ public class MapDBPersistentStore implements IMessagesStore, ISessionsStore {
m_inflightStore = m_db.getHashMap("inflight");
m_inFlightIds = m_db.getHashMap("inflightPacketIDs");
m_persistentSubscriptions = m_db.getHashMap("subscriptions");
m_qos2Store = m_db.getHashMap("qos2Store");
m_persistentSessions = m_db.getHashMap("sessions");
m_enqueuedStore = m_db.getHashMap("sessionQueue");
m_secondPhaseStore = m_db.getHashMap("secondPhase");
@@ -417,24 +414,6 @@ public class MapDBPersistentStore implements IMessagesStore, ISessionsStore {
LOG.debug("Persistence commit scheduler is shutdown");
}
/*-------- QoS 2 storage management --------------*/
@Override
public void persistQoS2Message(String publishKey, PublishEvent evt) {
LOG.debug("persistQoS2Message store pubKey: {}, evt: {}", publishKey, evt);
m_qos2Store.put(publishKey, convertToStored(evt));
}
@Override
public void removeQoS2Message(String publishKey) {
LOG.debug("Removing stored Q0S2 message <{}>", publishKey);
m_qos2Store.remove(publishKey);
}
public PublishEvent retrieveQoS2Message(String publishKey) {
StoredPublishEvent storedEvt = m_qos2Store.get(publishKey);
return convertFromStored(storedEvt);
}
private StoredPublishEvent convertToStored(PublishEvent evt) {
return new StoredPublishEvent(evt);
}
broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java
+2 -2
View File
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue;
* @author andreaorg.eclipse.moquette.commons.Constants.
*/
public class ServerIntegrationWebSocketTest {
private static final Logger LOG = LoggerFactory.getLogger(ServerIntegrationPahoTest.class);
private static final Logger LOG = LoggerFactory.getLogger(ServerIntegrationWebSocketTest.class);
Server m_server;
WebSocketClient client;
@@ -79,7 +79,7 @@ public class ServerIntegrationWebSocketTest {
URI echoUri = new URI(destUri);
ClientUpgradeRequest request = new ClientUpgradeRequest();
client.connect(socket, echoUri, request);
LOG.info("Connecting to : %s%n", echoUri);
LOG.info("Connecting to : %s", echoUri);
boolean connected = socket.awaitConnected(4, TimeUnit.SECONDS);
assertTrue(connected);
broker/src/test/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java
-18
View File
@@ -46,7 +46,6 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore {
//maps clientID->[messageID*]
private Map<String, Set<Integer>> m_secondPhaseStore = new HashMap<>();
private Map<String, Set<Integer>> m_inflightIDs = new HashMap<>();
private Map<String, PublishEvent> m_qos2Store = new HashMap<>();
private Map<String, Map<Integer, String>> m_messageToGuids = new HashMap<>();
private MemorySessionStore m_sessionsStore;
@@ -147,28 +146,11 @@ public class MemoryStorageService implements IMessagesStore, ISessionsStore {
return nextPacketId;
}
@Override
public void close() {
//To change body of implemented methods use File | Settings | File Templates.
}
@Override
public void persistQoS2Message(String publishKey, PublishEvent evt) {
LOG.debug("persistQoS2Message store pubKey {}, evt {}", publishKey, evt);
m_qos2Store.put(publishKey, evt);
}
@Override
public void removeQoS2Message(String publishKey) {
m_qos2Store.remove(publishKey);
}
@Override
public PublishEvent retrieveQoS2Message(String publishKey) {
return m_qos2Store.get(publishKey);
}
@Override
public void addNewSubscription(Subscription newSubscription) {
m_sessionsStore.addNewSubscription(newSubscription);