Added onMessageConsumed logic.

Related to:  https://github.com/andsel/moquette/issues/156
This commit is contained in:
Dee Eldredge
2016-03-23 23:09:16 +01:00
committed by andsel
parent 0b883d1f9a
commit f44283d5f0
9 changed files with 1043 additions and 982 deletions
@@ -38,4 +38,7 @@ public abstract class AbstractInterceptHandler implements InterceptHandler {
@Override @Override
public void onUnsubscribe(InterceptUnsubscribeMessage msg) {} public void onUnsubscribe(InterceptUnsubscribeMessage msg) {}
@Override
public void onMessageConsumed(InterceptConsumedMessage msg) {}
} }
@@ -18,6 +18,7 @@ package io.moquette.interception;
import io.moquette.parser.proto.messages.AbstractMessage; import io.moquette.parser.proto.messages.AbstractMessage;
import io.moquette.spi.impl.subscriptions.Subscription; import io.moquette.spi.impl.subscriptions.Subscription;
import io.moquette.interception.messages.InterceptConnectMessage; import io.moquette.interception.messages.InterceptConnectMessage;
import io.moquette.interception.messages.InterceptConsumedMessage;
import io.moquette.interception.messages.InterceptDisconnectMessage; import io.moquette.interception.messages.InterceptDisconnectMessage;
import io.moquette.interception.messages.InterceptPublishMessage; import io.moquette.interception.messages.InterceptPublishMessage;
import io.moquette.interception.messages.InterceptSubscribeMessage; import io.moquette.interception.messages.InterceptSubscribeMessage;
@@ -46,4 +47,6 @@ public interface InterceptHandler {
void onSubscribe(InterceptSubscribeMessage msg); void onSubscribe(InterceptSubscribeMessage msg);
void onUnsubscribe(InterceptUnsubscribeMessage msg); void onUnsubscribe(InterceptUnsubscribeMessage msg);
void onMessageConsumed(InterceptConsumedMessage msg);
} }
@@ -15,6 +15,7 @@
*/ */
package io.moquette.interception; package io.moquette.interception;
import io.moquette.interception.messages.InterceptConsumedMessage;
import io.moquette.parser.proto.messages.ConnectMessage; import io.moquette.parser.proto.messages.ConnectMessage;
import io.moquette.parser.proto.messages.PublishMessage; import io.moquette.parser.proto.messages.PublishMessage;
import io.moquette.spi.impl.subscriptions.Subscription; import io.moquette.spi.impl.subscriptions.Subscription;
@@ -44,4 +45,5 @@ public interface Interceptor {
void notifyTopicUnsubscribed(String topic, String clientID); void notifyTopicUnsubscribed(String topic, String clientID);
void notifyMessageConsumed(InterceptConsumedMessage msg);
} }
@@ -0,0 +1,15 @@
package io.moquette.interception.messages;
import static io.moquette.spi.IMessagesStore.StoredMessage;
public class InterceptConsumedMessage {
final private StoredMessage msg;
public InterceptConsumedMessage( final StoredMessage msg) {
this.msg = msg;
}
public StoredMessage getMsg() {
return msg;
}
}
@@ -18,6 +18,7 @@ package io.moquette.spi;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import io.moquette.spi.IMessagesStore.StoredMessage;
import io.moquette.spi.impl.subscriptions.Subscription; import io.moquette.spi.impl.subscriptions.Subscription;
/** /**
@@ -138,4 +139,6 @@ public interface ISessionsStore {
void secondPhaseAckWaiting(String clientID, int messageID); void secondPhaseAckWaiting(String clientID, int messageID);
String mapToGuid(String clientID, int messageID); String mapToGuid(String clientID, int messageID);
public StoredMessage getInflightMessage(String clientID, int messageID);
} }
@@ -106,4 +106,16 @@ final class BrokerInterceptor implements Interceptor {
}); });
} }
} }
@Override
public void notifyMessageConsumed( final InterceptConsumedMessage msg ) {
for (final InterceptHandler handler : this.handlers) {
executor.execute(new Runnable() {
@Override
public void run() {
handler.onMessageConsumed(msg);
}
});
}
}
} }
@@ -17,6 +17,7 @@ package io.moquette.spi.persistence;
import io.moquette.spi.ClientSession; import io.moquette.spi.ClientSession;
import io.moquette.spi.IMessagesStore; import io.moquette.spi.IMessagesStore;
import io.moquette.spi.IMessagesStore.StoredMessage;
import io.moquette.spi.ISessionsStore; import io.moquette.spi.ISessionsStore;
import io.moquette.spi.impl.Utils; import io.moquette.spi.impl.Utils;
import io.moquette.spi.impl.subscriptions.Subscription; import io.moquette.spi.impl.subscriptions.Subscription;
@@ -237,4 +238,15 @@ class MapDBSessionsStore implements ISessionsStore {
static String messageId2GuidsMapName(String clientID) { static String messageId2GuidsMapName(String clientID) {
return "guidsMapping_" + clientID; return "guidsMapping_" + clientID;
} }
@Override
public StoredMessage getInflightMessage( String clientID, int messageID ) {
Map<Integer, String> clientEntries = m_inflightStore.get( clientID );
if( clientEntries == null )
return null;
String guid = clientEntries.get( messageID );
if( guid == null )
return null;
return m_messagesStore.getMessageByGuid( guid );
}
} }
@@ -63,6 +63,11 @@ public class BrokerInterceptorTest {
public void onUnsubscribe(InterceptUnsubscribeMessage msg) { public void onUnsubscribe(InterceptUnsubscribeMessage msg) {
n.set(80); n.set(80);
} }
@Override
public void onMessageConsumed( InterceptConsumedMessage msg ) {
n.set(90);
}
} }
private static final BrokerInterceptor interceptor = new BrokerInterceptor(Arrays.<InterceptHandler>asList(new MockObserver())); private static final BrokerInterceptor interceptor = new BrokerInterceptor(Arrays.<InterceptHandler>asList(new MockObserver()));
@@ -17,6 +17,7 @@ package io.moquette.spi.persistence;
import io.moquette.spi.ClientSession; import io.moquette.spi.ClientSession;
import io.moquette.spi.IMessagesStore; import io.moquette.spi.IMessagesStore;
import io.moquette.spi.IMessagesStore.StoredMessage;
import io.moquette.spi.ISessionsStore; import io.moquette.spi.ISessionsStore;
import io.moquette.spi.impl.Utils; import io.moquette.spi.impl.Utils;
import io.moquette.spi.impl.subscriptions.Subscription; import io.moquette.spi.impl.subscriptions.Subscription;
@@ -232,4 +233,9 @@ public class MemorySessionStore implements ISessionsStore {
clientID, new HashMap<Integer, String>()); clientID, new HashMap<Integer, String>());
return guids.get(messageID); return guids.get(messageID);
} }
@Override
public StoredMessage getInflightMessage( String clientID, int messageID ) {
return null;
}
} }