vongosling closed pull request #14: Fixed for [ISSUE-9] & [ISSUE-7]
URL: https://github.com/apache/rocketmq-spring/pull/14
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/README.md b/README.md
index fc4689e..9f42552 100644
--- a/README.md
+++ b/README.md
@@ -54,8 +54,8 @@ Note: Current RELEASE.VERSION=2.0.1-SNAPSHOT （public review
phase）
```properties
## application.properties
-spring.rocketmq.name-server=127.0.0.1:9876
-spring.rocketmq.producer.group=my-group
+rocketmq.name-server=127.0.0.1:9876
+rocketmq.producer.group=my-group
```
> Note:
@@ -93,12 +93,12 @@ public class ProducerApplication implements
CommandLineRunner{
> More relevant configurations for producing:
>
> ```properties
-> spring.rocketmq.producer.retry-times-when-send-async-failed=0
-> spring.rocketmq.producer.send-message-timeout=300000
-> spring.rocketmq.producer.compress-message-body-threshold=4096
-> spring.rocketmq.producer.max-message-size=4194304
-> spring.rocketmq.producer.retry-another-broker-when-not-store-ok=false
-> spring.rocketmq.producer.retry-times-when-send-failed=2
+> rocketmq.producer.retry-times-when-send-async-failed=0
+> rocketmq.producer.send-message-timeout=300000
+> rocketmq.producer.compress-message-body-threshold=4096
+> rocketmq.producer.max-message-size=4194304
+> rocketmq.producer.retry-another-broker-when-not-store-ok=false
+> rocketmq.producer.retry-times-when-send-failed=2
> ```
@@ -147,7 +147,7 @@ public class ProducerApplication implements
CommandLineRunner{
```properties
## application.properties
-spring.rocketmq.name-server=127.0.0.1:9876
+rocketmq.name-server=127.0.0.1:9876
```
> Note:
@@ -191,7 +191,7 @@ public class ConsumerApplication{
1. How to connected many `nameserver` on production environment？
- `spring.rocketmq.nameServer` support the configuration of multiple
`nameserver`, separated by `;`. For example: `172.19.0.1: 9876; 172.19.0.2:
9876`
+ `rocketmq.name-server` support the configuration of multiple `nameserver`,
separated by `;`. For example: `172.19.0.1: 9876; 172.19.0.2: 9876`
1. When was `rocketMQTemplate` destroyed?
diff --git a/README_zh_CN.md b/README_zh_CN.md
index 8b4d136..82bb24e 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -45,8 +45,8 @@
```properties
## application.properties
-spring.rocketmq.name-server=127.0.0.1:9876
-spring.rocketmq.producer.group=my-group
+rocketmq.name-server=127.0.0.1:9876
+rocketmq.producer.group=my-group
```
> 注意:
@@ -125,12 +125,12 @@ public class ProducerApplication implements
CommandLineRunner{
> 更多发送相关配置
>
> ```properties
-> spring.rocketmq.producer.retry-times-when-send-async-failed=0
-> spring.rocketmq.producer.send-message-timeout=300000
-> spring.rocketmq.producer.compress-message-body-threshold=4096
-> spring.rocketmq.producer.max-message-size=4194304
-> spring.rocketmq.producer.retry-another-broker-when-not-store-ok=false
-> spring.rocketmq.producer.retry-times-when-send-failed=2
+> rocketmq.producer.retry-times-when-send-async-failed=0
+> rocketmq.producer.send-message-timeout=300000
+> rocketmq.producer.compress-message-body-threshold=4096
+> rocketmq.producer.max-message-size=4194304
+> rocketmq.producer.retry-another-broker-when-not-store-ok=false
+> rocketmq.producer.retry-times-when-send-failed=2
> ```
@@ -138,7 +138,7 @@ public class ProducerApplication implements
CommandLineRunner{
```properties
## application.properties
-spring.rocketmq.name-server=127.0.0.1:9876
+rocketmq.name-server=127.0.0.1:9876
```
> 注意:
@@ -183,7 +183,7 @@ public class ConsumerApplication{
1. 生产环境有多个`nameserver`该如何连接？
-
`spring.rocketmq.nameServer`支持配置多个`nameserver`地址，采用`;`分隔即可。例如：`172.19.0.1:9876;172.19.0.2:9876`
+
`rocketmq.name-server`支持配置多个`nameserver`地址，采用`;`分隔即可。例如：`172.19.0.1:9876;172.19.0.2:9876`
1. `rocketMQTemplate`在什么时候被销毁？
diff --git
a/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/OrderPaidEventConsumer.java
b/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/OrderPaidEventConsumer.java
index 774cd23..677e0ea 100644
---
a/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/OrderPaidEventConsumer.java
+++
b/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/OrderPaidEventConsumer.java
@@ -26,7 +26,7 @@
* OrderPaidEventConsumer
*/
@Service
-@RocketMQMessageListener(topic = "${spring.rocketmq.orderTopic}",
consumerGroup = "order-paid-consumer")
+@RocketMQMessageListener(topic = "${demo.rocketmq.orderTopic}", consumerGroup
= "order-paid-consumer")
public class OrderPaidEventConsumer implements
RocketMQListener<OrderPaidEvent> {
@Override
diff --git
a/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/StringConsumer.java
b/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/StringConsumer.java
index 370e847..2b90c69 100644
---
a/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/StringConsumer.java
+++
b/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/StringConsumer.java
@@ -25,7 +25,7 @@
* RocketMQMessageListener
*/
@Service
-@RocketMQMessageListener(topic = "${spring.rocketmq.topic}", consumerGroup =
"string_consumer")
+@RocketMQMessageListener(topic = "${demo.rocketmq.topic}", consumerGroup =
"string_consumer")
public class StringConsumer implements RocketMQListener<String> {
@Override
public void onMessage(String message) {
diff --git
a/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/StringTransactionalConsumer.java
b/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/StringTransactionalConsumer.java
index 5eebcc8..be5d08d 100644
---
a/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/StringTransactionalConsumer.java
+++
b/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/java/org/apache/rocketmq/samples/springboot/consumer/StringTransactionalConsumer.java
@@ -25,7 +25,7 @@
* StringTransactionalConsumer
*/
@Service
-@RocketMQMessageListener(topic = "${spring.rocketmq.transTopic}",
consumerGroup = "string_trans_consumer")
+@RocketMQMessageListener(topic = "${demo.rocketmq.transTopic}", consumerGroup
= "string_trans_consumer")
public class StringTransactionalConsumer implements RocketMQListener<String> {
@Override
public void onMessage(String message) {
diff --git
a/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/resources/application.properties
b/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/resources/application.properties
index bbdeed1..5f74d5d 100644
---
a/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/resources/application.properties
+++
b/rocketmq-spring-boot-samples/rocketmq-consume-demo/src/main/resources/application.properties
@@ -1,7 +1,9 @@
spring.application.name=rocketmq-consume-demo
-spring.rocketmq.nameServer=localhost:9876
-spring.rocketmq.topic=string-topic
-spring.rocketmq.orderTopic=order-paid-topic
-spring.rocketmq.msgExtTopic=message-ext-topic
-spring.rocketmq.transTopic=spring-transaction-topic
+rocketmq.name-server=localhost:9876
+rocketmq.topic=string-topic
+
+# properties used in application code
+demo.rocketmq.orderTopic=order-paid-topic
+demo.rocketmq.msgExtTopic=message-ext-topic
+demo.rocketmq.transTopic=spring-transaction-topic
diff --git
a/rocketmq-spring-boot-samples/rocketmq-produce-demo/src/main/java/org/apache/rocketmq/samples/springboot/ProducerApplication.java
b/rocketmq-spring-boot-samples/rocketmq-produce-demo/src/main/java/org/apache/rocketmq/samples/springboot/ProducerApplication.java
index bec2450..d7ca208 100644
---
a/rocketmq-spring-boot-samples/rocketmq-produce-demo/src/main/java/org/apache/rocketmq/samples/springboot/ProducerApplication.java
+++
b/rocketmq-spring-boot-samples/rocketmq-produce-demo/src/main/java/org/apache/rocketmq/samples/springboot/ProducerApplication.java
@@ -46,13 +46,13 @@
private static final String TX_PGROUP_NAME = "myTxProducerGroup";
@Resource
private RocketMQTemplate rocketMQTemplate;
- @Value("${spring.rocketmq.transTopic}")
+ @Value("${demo.rocketmq.transTopic}")
private String springTransTopic;
- @Value("${spring.rocketmq.topic}")
+ @Value("${demo.rocketmq.topic}")
private String springTopic;
- @Value("${spring.rocketmq.orderTopic}")
+ @Value("${demo.rocketmq.orderTopic}")
private String orderPaidTopic;
- @Value("${spring.rocketmq.msgExtTopic}")
+ @Value("${demo.rocketmq.msgExtTopic}")
private String msgExtTopic;
public static void main(String[] args) {
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 f14b1ba..7965b28 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,6 +1,8 @@
-spring.rocketmq.name-server=localhost:9876
-spring.rocketmq.producer.group=my-group1
-spring.rocketmq.topic=string-topic
-spring.rocketmq.orderTopic=order-paid-topic
-spring.rocketmq.msgExtTopic=message-ext-topic
-spring.rocketmq.transTopic=spring-transaction-topic
\ No newline at end of file
+rocketmq.name-server=localhost:9876
+rocketmq.producer.group=my-group1
+
+# properties used in the application
+demo.rocketmq.topic=string-topic
+demo.rocketmq.orderTopic=order-paid-topic
+demo.rocketmq.msgExtTopic=message-ext-topic
+demo.rocketmq.transTopic=spring-transaction-topic
\ No newline at end of file
diff --git
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/ListenerContainerConfiguration.java
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/ListenerContainerConfiguration.java
index 625bae6..506369e 100644
---
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/ListenerContainerConfiguration.java
+++
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/ListenerContainerConfiguration.java
@@ -122,7 +122,9 @@ private DefaultRocketMQListenerContainer
createRocketMQListenerContainer(Object
private void validate(RocketMQMessageListener annotation) {
if (annotation.consumeMode() == ConsumeMode.ORDERLY &&
- annotation.messageModel() == MessageModel.BROADCASTING)
- throw new BeanDefinitionValidationException("Bad annotation
definition in @RocketMQMessageListener, messageModel BROADCASTING does not
support ORDERLY message!");
+ annotation.messageModel() == MessageModel.BROADCASTING) {
+ throw new BeanDefinitionValidationException(
+ "Bad annotation definition in @RocketMQMessageListener,
messageModel BROADCASTING does not support ORDERLY message!");
+ }
}
}
\ No newline at end of file
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 a2efeb6..c031335 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,20 +38,20 @@
@Configuration
@EnableConfigurationProperties(RocketMQProperties.class)
@ConditionalOnClass({ MQAdmin.class, ObjectMapper.class })
-@ConditionalOnProperty(prefix = "spring.rocketmq", value = "name-server")
+@ConditionalOnProperty(prefix = "rocketmq", value = "name-server")
@Import({ JacksonFallbackConfiguration.class,
ListenerContainerConfiguration.class })
@AutoConfigureAfter(JacksonAutoConfiguration.class)
public class RocketMQAutoConfiguration {
@Bean
@ConditionalOnMissingBean(DefaultMQProducer.class)
- @ConditionalOnProperty(prefix = "spring.rocketmq", value = {"name-server",
"producer.group"})
+ @ConditionalOnProperty(prefix = "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.name-server] must not be
null");
- Assert.hasText(groupName, "[spring.rocketmq.producer.group] must not
be null");
+ Assert.hasText(nameServer, "[rocketmq.name-server] must not be null");
+ Assert.hasText(groupName, "[rocketmq.producer.group] must not be
null");
DefaultMQProducer producer = new DefaultMQProducer(groupName);
producer.setNamesrvAddr(nameServer);
diff --git
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQProperties.java
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQProperties.java
index 07e9e06..9c8ce89 100644
---
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQProperties.java
+++
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQProperties.java
@@ -20,7 +20,7 @@
import org.springframework.boot.context.properties.ConfigurationProperties;
@SuppressWarnings("WeakerAccess")
-@ConfigurationProperties(prefix = "spring.rocketmq")
+@ConfigurationProperties(prefix = "rocketmq")
public class RocketMQProperties {
/**
diff --git
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/TransactionHandlerRegistry.java
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/TransactionHandlerRegistry.java
index 73a1244..4365e41 100644
---
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/TransactionHandlerRegistry.java
+++
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/TransactionHandlerRegistry.java
@@ -39,10 +39,12 @@ public void destroy() throws Exception {
}
public void registerTransactionHandler(TransactionHandler handler) throws
MQClientException {
- if (listenerContainers.contains(handler.getName()))
+ if (listenerContainers.contains(handler.getName())) {
throw new MQClientException(-1,
- String.format("The transaction name [%s] has been defined in
TransactionListener [%s]", handler.getName(),
- handler.getBeanName()));
+ String
+ .format("The transaction name [%s] has been defined in
TransactionListener [%s]", handler.getName(),
+ handler.getBeanName()));
+ }
listenerContainers.add(handler.getName());
rocketMQTemplate.createAndStartTransactionMQProducer(handler.getName(),
handler.getListener(), handler.getCheckExecutor());
diff --git
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/core/RocketMQTemplate.java
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/core/RocketMQTemplate.java
index f8c7c64..0eb1053 100644
---
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/core/RocketMQTemplate.java
+++
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/core/RocketMQTemplate.java
@@ -447,11 +447,13 @@ public void sendOneWayOrderly(String destination, Object
payload, String hashKey
sendOneWayOrderly(destination, message, hashKey);
}
+ @Override
public void afterPropertiesSet() throws Exception {
Assert.notNull(producer, "Property 'producer' is required");
producer.start();
}
+ @Override
protected void doSend(String destination, Message<?> message) {
SendResult sendResult = syncSend(destination, message);
log.debug("send message to `{}` finished. result:{}", destination,
sendResult);
diff --git
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java
index ce1b388..7031dce 100644
---
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java
+++
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java
@@ -69,7 +69,7 @@
private String charset = "UTF-8";
- private ObjectMapper objectMapper = new ObjectMapper();
+ private ObjectMapper objectMapper;
private RocketMQListener rocketMQListener;
@@ -194,6 +194,7 @@ public void setConsumer(DefaultMQPushConsumer consumer) {
this.consumer = consumer;
}
+ @Override
public void setupMessageListener(RocketMQListener rocketMQListener) {
this.rocketMQListener = rocketMQListener;
}
@@ -285,6 +286,7 @@ public String toString() {
public class DefaultMessageListenerConcurrently implements
MessageListenerConcurrently {
@SuppressWarnings("unchecked")
+ @Override
public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs,
ConsumeConcurrentlyContext context) {
for (MessageExt messageExt : msgs) {
log.debug("received msg: {}", messageExt);
@@ -307,6 +309,7 @@ public ConsumeConcurrentlyStatus
consumeMessage(List<MessageExt> msgs, ConsumeCo
public class DefaultMessageListenerOrderly implements
MessageListenerOrderly {
@SuppressWarnings("unchecked")
+ @Override
public ConsumeOrderlyStatus consumeMessage(List<MessageExt> msgs,
ConsumeOrderlyContext context) {
for (MessageExt messageExt : msgs) {
log.debug("received msg: {}", messageExt);
@@ -396,6 +399,8 @@ private void initRocketMQPushConsumer() throws
MQClientException {
case CLUSTERING:
consumer.setMessageModel(org.apache.rocketmq.common.protocol.heartbeat.MessageModel.CLUSTERING);
break;
+ default:
+ throw new IllegalArgumentException("Property 'messageModel'
was wrong.");
}
switch (selectorType) {
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 b819e3f..c3e2d00 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
@@ -50,8 +50,8 @@ public void testDefaultMQProducerNotCreatedByDefault() {
@Test
public void testDefaultMQProducerWithRelaxPropertyName() {
- runner.withPropertyValues("spring.rocketmq.nameServer=127.0.0.1:9876",
- "spring.rocketmq.producer.group=spring_rocketmq").
+ runner.withPropertyValues("rocketmq.nameServer=127.0.0.1:9876",
+ "rocketmq.producer.group=spring_rocketmq").
run((context) -> {
assertThat(context).hasSingleBean(DefaultMQProducer.class);
assertThat(context).hasSingleBean(RocketMQProperties.class);
@@ -61,8 +61,8 @@ public void testDefaultMQProducerWithRelaxPropertyName() {
@Test
public void testDefaultMQProducer() {
- runner.withPropertyValues("spring.rocketmq.name-server=127.0.0.1:9876",
- "spring.rocketmq.producer.group=spring_rocketmq").
+ runner.withPropertyValues("rocketmq.name-server=127.0.0.1:9876",
+ "rocketmq.producer.group=spring_rocketmq").
run((context) -> {
assertThat(context).hasSingleBean(DefaultMQProducer.class);
});
@@ -71,7 +71,7 @@ public void testDefaultMQProducer() {
@Test
public void testRocketMQListenerContainer() {
-
runner.withPropertyValues("spring.rocketmq.name-server=127.0.0.1:9876").
+ runner.withPropertyValues("rocketmq.name-server=127.0.0.1:9876").
withUserConfiguration(TestConfig.class).
run((context) -> {
// No producer on consume side
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
