Skip to content

Commit

Permalink
🐛 mica-mqtt-server 修复分组订阅删除
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChunMengLu
ChunMengLu committed Jul 24, 2024
1 parent a53bccb commit 8a24cf1
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 1 deletion.
7 changes: 6 additions & 1 deletion ...er/src/main/java/net/dreamlu/iot/mqtt/core/server/session/InMemoryMqttSessionManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ public void removeSubscribe(String topicFilter, String clientId) {
} else if (filterType == TopicFilterType.QUEUE) {
map = queueSubscribeStore.get(topicFilter);
} else {
map = shareSubscribeStore.get(TopicFilterType.getShareGroupName(topicFilter)).get(topicFilter);
String groupName = TopicFilterType.getShareGroupName(topicFilter);
Map<String, Map<String, Integer>> groupMap = shareSubscribeStore.get(groupName);
if (groupMap == null) {
return;
}
map = groupMap.get(topicFilter);
}
if (map == null) {
return;
Expand Down
82 changes: 82 additions & 0 deletions ...tt-server/src/test/java/net/dreamlu/iot/mqtt/core/server/test/MqttSessionManagerTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
package net.dreamlu.iot.mqtt.core.server.test;

import net.dreamlu.iot.mqtt.core.server.model.Subscribe;
import net.dreamlu.iot.mqtt.core.server.session.IMqttSessionManager;
import net.dreamlu.iot.mqtt.core.server.session.InMemoryMqttSessionManager;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import java.util.List;

/**
* MqttSessionManager 测试
*
* @author L.cm
*/
class MqttSessionManagerTest {

@Test
void testAdd() {
IMqttSessionManager topicManager = new InMemoryMqttSessionManager();
topicManager.addSubscribe("/sys/1/456/thing/model/down_raw", "client1", 1);
topicManager.addSubscribe("/sys/2/456/thing/model/down_raw", "client1", 1);
topicManager.addSubscribe("/sys/3/4567/thing/model/down_raw", "client1", 1);
topicManager.addSubscribe("/sys/4/45678/thing/model/down_raw", "client1", 1);
topicManager.addSubscribe("/sys/1/4561/thing/model/down_raw", "client1", 0);
topicManager.addSubscribe("/sys/2/45612/thing/model/down_raw", "client1", 1);
topicManager.addSubscribe("/sys/+/+/thing/model/down_raw", "client1", 0);
topicManager.addSubscribe("/sys/3/456/thing/model/down_raw", "client1", 1);
topicManager.addSubscribe("/sys/12/456/thing/model/down_raw", "client1", 1);
topicManager.addSubscribe("/sys/11/4567/thing/model/down_raw", "client1", 1);
topicManager.addSubscribe("/sys/111/45678/thing/model/down_raw", "client1", 1);
topicManager.addSubscribe("/sys/123/4561/thing/model/down_raw", "client1", 0);
topicManager.addSubscribe("/sys/123/45612/thing/model/down_raw", "client1", 1);
topicManager.addSubscribe("/sys/1/+/thing/model/down_raw", "client1", 0);
topicManager.addSubscribe("/sys/1/456/thing/model/down_raw", "client2", 1);
topicManager.addSubscribe("/sys/2/456/thing/model/down_raw", "client2", 1);
topicManager.addSubscribe("/sys/3/4567/thing/model/down_raw", "client2", 1);
topicManager.addSubscribe("/sys/4/45678/thing/model/down_raw", "client2", 1);
topicManager.addSubscribe("/sys/1/4561/thing/model/down_raw", "client2", 0);
topicManager.addSubscribe("/sys/2/45612/thing/model/down_raw", "client2", 1);
topicManager.addSubscribe("/sys/+/+/thing/model/down_raw", "client2", 0);
topicManager.addSubscribe("/sys/3/456/thing/model/down_raw", "client2", 1);
topicManager.addSubscribe("/sys/12/456/thing/model/down_raw", "client2", 1);
topicManager.addSubscribe("/sys/11/4567/thing/model/down_raw", "client2", 1);
topicManager.addSubscribe("/sys/111/45678/thing/model/down_raw", "client2", 1);
topicManager.addSubscribe("/sys/123/4561/thing/model/down_raw", "client2", 0);
topicManager.addSubscribe("/sys/123/45612/thing/model/down_raw", "client2", 1);
topicManager.addSubscribe("/sys/1/+/thing/model/down_raw", "client2", 0);
topicManager.addSubscribe("/sys/1/456/thing/model/down_raw", "client3", 1);
topicManager.addSubscribe("/sys/2/456/thing/model/down_raw", "client3", 1);
topicManager.addSubscribe("/sys/3/4567/thing/model/down_raw", "client3", 1);
topicManager.addSubscribe("/sys/4/45678/thing/model/down_raw", "client3", 1);
topicManager.addSubscribe("/sys/1/4561/thing/model/down_raw", "client3", 0);
topicManager.addSubscribe("/sys/2/45612/thing/model/down_raw", "client3", 1);
topicManager.addSubscribe("/sys/+/+/thing/model/down_raw", "client3", 0);
topicManager.addSubscribe("/sys/3/456/thing/model/down_raw", "client3", 1);
topicManager.addSubscribe("/sys/12/456/thing/model/down_raw", "client3", 1);
topicManager.addSubscribe("/sys/11/4567/thing/model/down_raw", "client3", 1);
topicManager.addSubscribe("/sys/111/45678/thing/model/down_raw", "client3", 1);
topicManager.addSubscribe("/sys/123/4561/thing/model/down_raw", "client3", 0);
topicManager.addSubscribe("/sys/123/45612/thing/model/down_raw", "client3", 1);
topicManager.addSubscribe("/sys/1/+/thing/model/down_raw", "client3", 0);
topicManager.addSubscribe("$share/group1/sys/123/456/thing/model/down_raw", "client1", 0);
topicManager.addSubscribe("$queue/sys/123/456/thing/model/down_raw", "client31", 0);
topicManager.addSubscribe("$share/group1/sys/123/456/thing/model/down_raw", "client2", 0);
topicManager.addSubscribe("$queue/sys/123/456/thing/model/down_raw", "client2", 0);
topicManager.addSubscribe("$share/group1/sys/123/456/thing/model/down_raw", "client3", 0);
List<Subscribe> subscribeList = topicManager.getSubscriptions("client3");
Assertions.assertFalse(subscribeList.isEmpty());
}

@Test
void testRemove() {
IMqttSessionManager topicManager = new InMemoryMqttSessionManager();
topicManager.removeSubscribe("/sys/1/456/thing/model/down_raw", "client1");
topicManager.removeSubscribe("$share/group1/sys/123/456/thing/model/down_raw", "client1");
topicManager.removeSubscribe("$share/group1/sys/123/456/thing/model/down_raw", "client1");
List<Subscribe> subscribeList = topicManager.getSubscriptions("client3");
Assertions.assertTrue(subscribeList.isEmpty());
}

}

0 comments on commit 8a24cf1

Please sign in to comment.