fix:apache#103 support resolvePlaceholders for selectorExpression cod…

…estyle
liuliuzo · Sep 27, 2019 · f85574d · f85574d
1 parent 95ca292
commit f85574d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...rc/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java b/...rc/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java
@@ -126,7 +126,9 @@ private void registerContainer(String beanName, Object bean) {
 
     private DefaultRocketMQListenerContainer createRocketMQListenerContainer(String name, Object bean, RocketMQMessageListener annotation) {
         DefaultRocketMQListenerContainer container = new DefaultRocketMQListenerContainer();
-
+
+        container.setRocketMQMessageListener(annotation);
+
         String nameServer = environment.resolvePlaceholders(annotation.nameServer());
         nameServer = StringUtils.isEmpty(nameServer) ? rocketMQProperties.getNameServer() : nameServer;
         String accessChannel = environment.resolvePlaceholders(annotation.accessChannel());
@@ -140,7 +142,6 @@ private DefaultRocketMQListenerContainer createRocketMQListenerContainer(String
             container.setSelectorExpression(tags);
         }
         container.setConsumerGroup(environment.resolvePlaceholders(annotation.consumerGroup()));
-        container.setRocketMQMessageListener(annotation);
         container.setRocketMQListener((RocketMQListener) bean);
         container.setObjectMapper(objectMapper);
         container.setName(name);  // REVIEW ME, use the same clientId or multiple?

diff --git a/...ot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java b/...ot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java
@@ -191,6 +191,7 @@ public void setRocketMQMessageListener(RocketMQMessageListener anno) {
         this.consumeMode = anno.consumeMode();
         this.consumeThreadMax = anno.consumeThreadMax();
         this.messageModel = anno.messageModel();
+        this.selectorExpression = anno.selectorExpression();
         this.selectorType = anno.selectorType();
         this.consumeTimeout = anno.consumeTimeout();
     }