You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by di...@apache.org on 2019/01/17 13:20:17 UTC
[rocketmq-spring] 11/37: Support configuration property with
relaxed names
This is an automated email from the ASF dual-hosted git repository.
dinglei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-spring.git
commit 11b9a50a6580e8d5f3259909d724dacbd67ec47d
Author: walking98 <wi...@gmail.com>
AuthorDate: Wed Dec 12 11:05:41 2018 +0800
Support configuration property with relaxed names
---
.../src/main/resources/application.properties | 2 +-
.../spring/config/RocketMQAutoConfiguration.java | 9 +++++----
.../spring/config/RocketMQAutoConfigurationTest.java | 16 +++++++++++++---
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/rocketmq-spring-boot-samples/rocketmq-produce-demo/src/main/resources/application.properties b/rocketmq-spring-boot-samples/rocketmq-produce-demo/src/main/resources/application.properties
index 2187442..f14b1ba 100644
--- a/rocketmq-spring-boot-samples/rocketmq-produce-demo/src/main/resources/application.properties
+++ b/rocketmq-spring-boot-samples/rocketmq-produce-demo/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.rocketmq.nameServer=localhost:9876
+spring.rocketmq.name-server=localhost:9876
spring.rocketmq.producer.group=my-group1
spring.rocketmq.topic=string-topic
spring.rocketmq.orderTopic=order-paid-topic
diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQAutoConfiguration.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQAutoConfiguration.java
index d229d2b..e62eb8d 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQAutoConfiguration.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQAutoConfiguration.java
@@ -38,18 +38,18 @@ import java.util.Objects;
@Configuration
@EnableConfigurationProperties(RocketMQProperties.class)
-@ConditionalOnProperty(prefix = "spring.rocketmq", value = "nameServer")
+@ConditionalOnProperty(prefix = "spring.rocketmq", value = "name-server")
@Import(ListenerContainerConfiguration.class)
public class RocketMQAutoConfiguration {
@Bean
@ConditionalOnMissingBean(DefaultMQProducer.class)
- @ConditionalOnProperty(prefix = "spring.rocketmq", value = {"nameServer", "producer.group"})
+ @ConditionalOnProperty(prefix = "spring.rocketmq", value = {"name-server", "producer.group"})
public DefaultMQProducer defaultMQProducer(RocketMQProperties rocketMQProperties) {
RocketMQProperties.Producer producerConfig = rocketMQProperties.getProducer();
String nameServer = rocketMQProperties.getNameServer();
String groupName = producerConfig.getGroup();
- Assert.hasText(nameServer, "[spring.rocketmq.nameServer] must not be null");
+ Assert.hasText(nameServer, "[spring.rocketmq.name-server] must not be null");
Assert.hasText(groupName, "[spring.rocketmq.producer.group] must not be null");
DefaultMQProducer producer = new DefaultMQProducer(groupName);
@@ -98,7 +98,8 @@ public class RocketMQAutoConfiguration {
@Bean(name = RocketMQConfigUtils.ROCKETMQ_TRANSACTION_ANNOTATION_PROCESSOR_BEAN_NAME)
@ConditionalOnBean(TransactionHandlerRegistry.class)
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
- public static RocketMQTransactionAnnotationProcessor transactionAnnotationProcessor(TransactionHandlerRegistry transactionHandlerRegistry) {
+ public static RocketMQTransactionAnnotationProcessor transactionAnnotationProcessor(
+ TransactionHandlerRegistry transactionHandlerRegistry) {
return new RocketMQTransactionAnnotationProcessor(transactionHandlerRegistry);
}
}
diff --git a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/config/RocketMQAutoConfigurationTest.java b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/config/RocketMQAutoConfigurationTest.java
index a841a74..2656249 100644
--- a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/config/RocketMQAutoConfigurationTest.java
+++ b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/config/RocketMQAutoConfigurationTest.java
@@ -48,8 +48,8 @@ public class RocketMQAutoConfigurationTest {
@Test
- public void testDefaultMQProducer() {
- runner.withPropertyValues("spring.rocketmq.nameServer=127.0.0.1:9876",
+ public void testDefaultMQProducerWithRelaxPropertyName() {
+ runner.withPropertyValues("spring.rocketmq.name-server=127.0.0.1:9876",
"spring.rocketmq.producer.group=spring_rocketmq").
run((context) -> {
assertThat(context).hasSingleBean(DefaultMQProducer.class);
@@ -59,8 +59,18 @@ public class RocketMQAutoConfigurationTest {
}
@Test
+ public void testDefaultMQProducer() {
+ runner.withPropertyValues("spring.rocketmq.nameServer=127.0.0.1:9876",
+ "spring.rocketmq.producer.group=spring_rocketmq").
+ run((context) -> {
+ assertThat(context).hasSingleBean(DefaultMQProducer.class);
+ });
+
+ }
+
+ @Test
public void testRocketMQListenerContainer() {
- runner.withPropertyValues("spring.rocketmq.nameServer=127.0.0.1:9876").
+ runner.withPropertyValues("spring.rocketmq.name-server=127.0.0.1:9876").
withUserConfiguration(TestConfig.class).
run((context) -> {
// No producer on consume side