✨ mica-mqtt client 添加批量取消订阅。

mica-mqtt-codec/src/main/java/net/dreamlu/iot/mqtt/codec/MqttMessageBuilders.java

@@ -21,6 +21,7 @@ import net.dreamlu.iot.mqtt.codec.MqttProperties.MqttPropertyType;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -200,22 +201,29 @@ public final class MqttMessageBuilders {
 
 	public static final class SubscribeBuilder {
 
-		private List<MqttTopicSubscription> subscriptions;
+		private final List<MqttTopicSubscription> subscriptions;
 		private int messageId;
 		private MqttProperties properties;
 
 		SubscribeBuilder() {
+			subscriptions = new ArrayList<>(5);
 		}
 
-		public SubscribeBuilder addSubscription(MqttQoS qos, String topic) {
-			ensureSubscriptionsExist();
-			subscriptions.add(new MqttTopicSubscription(topic, qos));
+		public SubscribeBuilder addSubscription(MqttTopicSubscription subscription) {
+			subscriptions.add(subscription);
 			return this;
 		}
 
+		public SubscribeBuilder addSubscription(MqttQoS qos, String topic) {
+			return addSubscription(new MqttTopicSubscription(topic, qos));
+		}
+
 		public SubscribeBuilder addSubscription(String topic, MqttSubscriptionOption option) {
-			ensureSubscriptionsExist();
-			subscriptions.add(new MqttTopicSubscription(topic, option));
+			return addSubscription(new MqttTopicSubscription(topic, option));
+		}
+
+		public SubscribeBuilder addSubscriptions(Collection<MqttTopicSubscription> subscriptionColl) {
+			subscriptions.addAll(subscriptionColl);
 			return this;
 		}
 
@@ -237,31 +245,27 @@ public final class MqttMessageBuilders {
 			MqttSubscribePayload mqttSubscribePayload = new MqttSubscribePayload(subscriptions);
 			return new MqttSubscribeMessage(mqttFixedHeader, mqttVariableHeader, mqttSubscribePayload);
 		}
-
-		private void ensureSubscriptionsExist() {
-			if (subscriptions == null) {
-				subscriptions = new ArrayList<>(5);
-			}
-		}
 	}
 
 	public static final class UnsubscribeBuilder {
-
-		private List<String> topicFilters;
+		private final List<String> topicFilters;
 		private int messageId;
 		private MqttProperties properties;
 
 		UnsubscribeBuilder() {
+			topicFilters = new ArrayList<>(5);
 		}
 
 		public UnsubscribeBuilder addTopicFilter(String topic) {
-			if (topicFilters == null) {
-				topicFilters = new ArrayList<>(5);
-			}
 			topicFilters.add(topic);
 			return this;
 		}
 
+		public UnsubscribeBuilder addTopicFilters(Collection<String> topicColl) {
+			topicFilters.addAll(topicColl);
+			return this;
+		}
+
 		public UnsubscribeBuilder messageId(int messageId) {
 			this.messageId = messageId;
 			return this;

mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/DefaultMqttClientProcessor.java

@@ -197,11 +197,11 @@ public class DefaultMqttClientProcessor implements IMqttClientProcessor {
 			return;
 		}
 		if (logger.isInfoEnabled()) {
-			logger.info("MQTT Topic:{} successfully unSubscribed  messageId:{}", pendingUnSubscription.getTopic(), messageId);
+			logger.info("MQTT Topic:{} successfully unSubscribed  messageId:{}", pendingUnSubscription.getTopics(), messageId);
 		}
 		pendingUnSubscription.onUnSubAckReceived();
 		clientSession.removePaddingUnSubscribe(messageId);
-		clientSession.removeSubscriptions(pendingUnSubscription.getTopic());
+		clientSession.removeSubscriptions(pendingUnSubscription.getTopics());
 	}
 
 	@Override

mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/DefaultMqttClientSession.java

@@ -116,8 +116,8 @@ public final class DefaultMqttClientSession implements IMqttClientSession {
 	}
 
 	@Override
-	public void removeSubscriptions(String topicFilter) {
-		subscriptions.remove(topicFilter);
+	public void removeSubscriptions(List<String> topicFilters) {
+		topicFilters.forEach(subscriptions::remove);
 	}
 
 	@Override

mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/IMqttClientSession.java

@@ -88,9 +88,9 @@ public interface IMqttClientSession {
 	/**
 	 * 删除订阅过程消息
 	 *
-	 * @param topicFilter topicFilter
+	 * @param topicFilters topicFilter 集合
 	 */
-	void removeSubscriptions(String topicFilter);
+	void removeSubscriptions(List<String> topicFilters);
 
 	/**
 	 * 添加取消订阅过程消息

mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttClient.java

@@ -25,6 +25,8 @@ import org.tio.client.TioClient;
 import org.tio.core.Tio;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
@@ -122,18 +124,28 @@ public final class MqttClient {
 	/**
 	 * 取消订阅
 	 *
-	 * @param topicFilter topicFilter
+	 * @param topicFilters topicFilter 集合
+	 * @return MqttClient
+	 */
+	public MqttClient unSubscribe(String... topicFilters) {
+		return unSubscribe(Arrays.asList(topicFilters));
+	}
+
+	/**
+	 * 取消订阅
+	 *
+	 * @param topicFilters topicFilter 集合
 	 * @return MqttClient
 	 */
-	public MqttClient unSubscribe(String topicFilter) {
+	public MqttClient unSubscribe(List<String> topicFilters) {
 		int messageId = MqttClientMessageId.getId();
 		MqttUnsubscribeMessage message = MqttMessageBuilders.unsubscribe()
-			.addTopicFilter(topicFilter)
+			.addTopicFilters(topicFilters)
 			.messageId(messageId)
 			.build();
-		MqttPendingUnSubscription pendingUnSubscription = new MqttPendingUnSubscription(topicFilter, message);
+		MqttPendingUnSubscription pendingUnSubscription = new MqttPendingUnSubscription(topicFilters, message);
 		Boolean result = Tio.send(context, message);
-		logger.info("MQTT Topic:{} messageId:{} unSubscribing result:{}", topicFilter, messageId, result);
+		logger.info("MQTT Topic:{} messageId:{} unSubscribing result:{}", topicFilters, messageId, result);
 		// 解绑 subManage listener
 		clientSession.addPaddingUnSubscribe(messageId, pendingUnSubscription);
 		pendingUnSubscription.startRetransmissionTimer(executor, msg -> Tio.send(context, msg));

mica-mqtt-core/src/main/java/net/dreamlu/iot/mqtt/core/client/MqttPendingUnSubscription.java

@@ -4,6 +4,7 @@ import net.dreamlu.iot.mqtt.codec.MqttMessage;
 import net.dreamlu.iot.mqtt.codec.MqttUnsubscribeMessage;
 import net.dreamlu.iot.mqtt.core.common.RetryProcessor;
 
+import java.util.List;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.function.Consumer;
 
@@ -11,16 +12,16 @@ import java.util.function.Consumer;
  * MqttPendingSubscription，参考于 netty-mqtt-client
  */
 final class MqttPendingUnSubscription {
-	private final String topic;
+	private final List<String> topics;
 	private final RetryProcessor<MqttUnsubscribeMessage> retryProcessor = new RetryProcessor<>();
 
-	MqttPendingUnSubscription(String topic, MqttUnsubscribeMessage unSubscribeMessage) {
-		this.topic = topic;
+	MqttPendingUnSubscription(List<String> topics, MqttUnsubscribeMessage unSubscribeMessage) {
+		this.topics = topics;
 		this.retryProcessor.setOriginalMessage(unSubscribeMessage);
 	}
 
-	protected String getTopic() {
-		return topic;
+	protected List<String> getTopics() {
+		return topics;
 	}
 
 	protected void startRetransmissionTimer(ScheduledThreadPoolExecutor executor, Consumer<MqttMessage> sendPacket) {