support simple consumer supports subscribing to multiple topics

Author: panzhi33

rocketmq-v5-client-spring-boot-samples/rocketmq-v5-client-consume-simple-subscribe-muliti-topic-demo/src/main/resources/application.properties

@@ -14,10 +14,11 @@
 # limitations under the License.
 
 rocketmq.simple-consumer.endpoints=localhost:8081
-rocketmq.simple-consumer.consumer-group=demo-group
-rocketmq.simple-consumer.filter-expression-map.demo-topic1.tag=tagA
-rocketmq.simple-consumer.filter-expression-map.demo-topic1.filter-expression-type=tag
-rocketmq.simple-consumer.filter-expression-map.demo-topic2.tag=tagB
-rocketmq.simple-consumer.filter-expression-map.demo-topic2.filter-expression-type=tag
+rocketmq.simple-consumer.consumer-group=localhost:8081
+rocketmq.simple-consumer.subscription-expressions.demo-topic.tag=tagA
+rocketmq.simple-consumer.subscription-expressions.demo-topic.filter-expression-type=tag
+rocketmq.simple-consumer.subscription-expressions.demo-topic2.tag=tagB
+rocketmq.simple-consumer.subscription-expressions.demo-topic2.filter-expression-type=tag
 #rocketmq.simple-consumer.access-key=
 #rocketmq.simple-consumer.secret-key=
+

rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/RocketMQAutoConfiguration.java

@@ -118,13 +118,13 @@ public SimpleConsumerBuilder simpleConsumerBuilder(RocketMQProperties rocketMQPr
         }
 
         // Set the subscription for the consumer.
-        if (simpleConsumer.getFilterExpressionMap().isEmpty()) {
+        if (simpleConsumer.getSubscriptionExpressions().isEmpty()) {
             FilterExpression filterExpression = RocketMQUtil.createFilterExpression(simpleConsumer.getTag(), simpleConsumer.getFilterExpressionType());
             if (Objects.nonNull(filterExpression)) {
                 simpleConsumerBuilder.setSubscriptionExpressions(Collections.singletonMap(simpleConsumer.getTopic(), filterExpression));
             }
         } else {
-            Map<String, FilterExpression> subscriptionExpressions = RocketMQUtil.createSubscriptionExpressions(simpleConsumer.getFilterExpressionMap());
+            Map<String, FilterExpression> subscriptionExpressions = RocketMQUtil.createSubscriptionExpressions(simpleConsumer.getSubscriptionExpressions());
             simpleConsumerBuilder.setSubscriptionExpressions(subscriptionExpressions);
         }
         return simpleConsumerBuilder;

rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/RocketMQProperties.java

@@ -16,6 +16,7 @@
  */
 package org.apache.rocketmq.client.autoconfigure;
 
+import org.apache.rocketmq.client.common.FilterExpression;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import java.util.Map;
@@ -216,7 +217,7 @@ public static class SimpleConsumer {
         /**
          * key is topic
          */
-        private Map<String, FilterExpression> filterExpressionMap;
+        private Map<String, FilterExpression> subscriptionExpressions;
 
         public String getAccessKey() {
             return accessKey;
@@ -306,12 +307,12 @@ public void setNamespace(String namespace) {
             this.namespace = namespace;
         }
 
-        public Map<String, FilterExpression> getFilterExpressionMap() {
-            return filterExpressionMap;
+        public Map<String, FilterExpression> getSubscriptionExpressions() {
+            return subscriptionExpressions;
         }
 
-        public void setFilterExpressionMap(Map<String, FilterExpression> filterExpressionMap) {
-            this.filterExpressionMap = filterExpressionMap;
+        public void setSubscriptionExpressions(Map<String, FilterExpression> subscriptionExpressions) {
+            this.subscriptionExpressions = subscriptionExpressions;
         }
 
         @Override
@@ -329,27 +330,4 @@ public String toString() {
                     '}';
         }
     }
-
-    public static class FilterExpression {
-        private String tag;
-
-        private String filterExpressionType;
-
-        public String getTag() {
-            return tag;
-        }
-
-        public void setTag(String tag) {
-            this.tag = tag;
-        }
-
-        public String getFilterExpressionType() {
-            return filterExpressionType;
-        }
-
-        public void setFilterExpressionType(String filterExpressionType) {
-            this.filterExpressionType = filterExpressionType;
-        }
-    }
-
 }

rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/common/FilterExpression.java

@@ -0,0 +1,23 @@
+package org.apache.rocketmq.client.common;
+
+public class FilterExpression {
+        private String tag;
+
+        private String filterExpressionType;
+
+        public String getTag() {
+            return tag;
+        }
+
+        public void setTag(String tag) {
+            this.tag = tag;
+        }
+
+        public String getFilterExpressionType() {
+            return filterExpressionType;
+        }
+
+        public void setFilterExpressionType(String filterExpressionType) {
+            this.filterExpressionType = filterExpressionType;
+        }
+    }

rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/support/RocketMQUtil.java

@@ -187,7 +187,7 @@ public static FilterExpression createFilterExpression(String tag, String type) {
         return filterExpression;
     }
 
-    public static Map<String, FilterExpression> createSubscriptionExpressions(Map<String, RocketMQProperties.FilterExpression> map) {
+    public static Map<String, FilterExpression> createSubscriptionExpressions(Map<String, org.apache.rocketmq.client.common.FilterExpression> map) {
         Map<String, FilterExpression> subscriptionExpressions = new HashMap<>();
         map.forEach((topic, expression) -> {
             FilterExpressionType filterExpressionType = "tag".equalsIgnoreCase(expression.getFilterExpressionType()) ? FilterExpressionType.TAG : FilterExpressionType.SQL92;