[rocketmq-spring] branch master updated: enhancement(extRocketMQTemplate):Remove the limitation that ExtRocketMQTemplate can not keep the same nameserver as RocketMQTemplate

[vongosling]

This is an automated email from the ASF dual-hosted git repository.

vongosling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-spring.git


The following commit(s) were added to refs/heads/master by this push:
     new ce94b6a  enhancement(extRocketMQTemplate):Remove the limitation that 
ExtRocketMQTemplate can not keep the same nameserver as RocketMQTemplate
     new 0ae7904  Merge pull request #212 from RongtongJin/apache-master
ce94b6a is described below

commit ce94b6adf0d680903305df2533bfd739541f0f5c
Author: rongtongjin <794220...@qq.com>
AuthorDate: Tue Dec 24 15:36:35 2019 +0800

    enhancement(extRocketMQTemplate):Remove the limitation that 
ExtRocketMQTemplate can not keep the same nameserver as RocketMQTemplate
---
 .../annotation/ExtRocketMQTemplateConfiguration.java       |  5 ++---
 .../autoconfigure/ExtProducerResetConfiguration.java       |  7 -------
 .../autoconfigure/RocketMQAutoConfigurationTest.java       | 14 --------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git 
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/ExtRocketMQTemplateConfiguration.java
 
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/ExtRocketMQTemplateConfiguration.java
index c268b57..05eaa46 100644
--- 
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/ExtRocketMQTemplateConfiguration.java
+++ 
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/ExtRocketMQTemplateConfiguration.java
@@ -17,13 +17,12 @@
 
 package org.apache.rocketmq.spring.annotation;
 
-import org.springframework.stereotype.Component;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.springframework.stereotype.Component;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
@@ -38,7 +37,7 @@ public @interface ExtRocketMQTemplateConfiguration {
     /**
      * The property of "name-server".
      */
-    String nameServer();
+    String nameServer() default "${rocketmq.name-server:}";
 
     /**
      * Name of producer.
diff --git 
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java
 
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java
index 1c019bb..daab3c3 100644
--- 
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java
+++ 
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java
@@ -162,12 +162,5 @@ public class ExtProducerResetConfiguration implements 
ApplicationContextAware, S
                     "please check the @ExtRocketMQTemplateConfiguration",
                 annotation.value()));
         }
-
-        if (rocketMQProperties.getNameServer() == null ||
-            
rocketMQProperties.getNameServer().equals(environment.resolvePlaceholders(annotation.nameServer())))
 {
-            throw new BeanDefinitionValidationException(
-                "Bad annotation definition in 
@ExtRocketMQTemplateConfiguration, nameServer property is same with " +
-                    "global property, please use the default 
RocketMQTemplate!");
-        }
     }
 }
\ No newline at end of file
diff --git 
a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
 
b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
index 553183d..5c0ccca 100644
--- 
a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
+++ 
b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
@@ -32,11 +32,8 @@ import 
org.apache.rocketmq.spring.support.RocketMQMessageConverter;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import 
org.springframework.beans.factory.support.BeanDefinitionValidationException;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import 
org.springframework.boot.test.context.assertj.AssertableApplicationContext;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.boot.test.context.runner.ContextConsumer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.Message;
@@ -88,17 +85,6 @@ public class RocketMQAutoConfigurationTest {
 
     @Test
     public void testExtRocketMQTemplate() {
-        runner.withPropertyValues("rocketmq.name-server=127.0.0.1:9876").
-            withUserConfiguration(TestExtRocketMQTemplateConfig.class, 
CustomObjectMappersConfig.class).
-            run(new ContextConsumer<AssertableApplicationContext>() {
-                @Override
-                public void accept(AssertableApplicationContext context) 
throws Throwable {
-                    Throwable th = context.getStartupFailure();
-                    System.out.printf("th==" + th + "\n");
-                    Assert.assertTrue(th instanceof 
BeanDefinitionValidationException);
-                }
-            });
-
         runner.withPropertyValues("rocketmq.name-server=127.0.1.1:9876").
             withUserConfiguration(TestExtRocketMQTemplateConfig.class, 
CustomObjectMappersConfig.class).
             run((context) -> {