You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rocketmq.apache.org by GitBox <gi...@apache.org> on 2018/12/14 03:41:31 UTC
[GitHub] vongosling closed pull request #3: Polish
vongosling closed pull request #3: Polish
URL: https://github.com/apache/rocketmq-spring/pull/3
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/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/MessageModel.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/MessageModel.java
index 9bdaa64..7de2187 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/MessageModel.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/MessageModel.java
@@ -21,7 +21,7 @@
BROADCASTING("BROADCASTING"),
CLUSTERING("CLUSTERING");
- private String modeCN;
+ private final String modeCN;
MessageModel(String modeCN) {
this.modeCN = modeCN;
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 e1fab88..9f78a19 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
@@ -28,12 +28,12 @@
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.SmartInitializingSingleton;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.support.BeanDefinitionValidationException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.env.StandardEnvironment;
@@ -42,6 +42,7 @@
import java.util.concurrent.atomic.AtomicLong;
+@Configuration
public class ListenerContainerConfiguration implements ApplicationContextAware, SmartInitializingSingleton {
private final static Logger log = LoggerFactory.getLogger(RocketMQAutoConfiguration.class);
@@ -55,10 +56,6 @@
private ObjectMapper objectMapper;
- public ListenerContainerConfiguration() {
- }
-
- @Autowired
public ListenerContainerConfiguration(
@Qualifier("rocketMQMessageObjectMapper") ObjectMapper objectMapper,
StandardEnvironment environment,
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..5eb97a5 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 @@
@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);
@@ -64,13 +64,6 @@ public DefaultMQProducer defaultMQProducer(RocketMQProperties rocketMQProperties
return producer;
}
- @Bean
- @ConditionalOnClass(name = "com.fasterxml.jackson.databind.ObjectMapper")
- @ConditionalOnMissingBean(ObjectMapper.class)
- public ObjectMapper rocketMQMessageObjectMapper() {
- return new ObjectMapper();
- }
-
@Bean(destroyMethod = "destroy")
@ConditionalOnBean(DefaultMQProducer.class)
@ConditionalOnMissingBean(RocketMQTemplate.class)
@@ -101,4 +94,17 @@ public TransactionHandlerRegistry transactionHandlerRegistry(RocketMQTemplate te
public static RocketMQTransactionAnnotationProcessor transactionAnnotationProcessor(TransactionHandlerRegistry transactionHandlerRegistry) {
return new RocketMQTransactionAnnotationProcessor(transactionHandlerRegistry);
}
+
+ @Configuration
+ @ConditionalOnClass(ObjectMapper.class)
+ static class JacksonConfiguration {
+
+ @Bean
+ @ConditionalOnMissingBean(ObjectMapper.class)
+ public ObjectMapper rocketMQMessageObjectMapper() {
+ return new ObjectMapper();
+ }
+
+ }
+
}
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..fd4056f 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
@@ -49,7 +49,7 @@ public void testDefaultMQProducerNotCreatedByDefault() {
@Test
public void testDefaultMQProducer() {
- runner.withPropertyValues("spring.rocketmq.nameServer=127.0.0.1:9876",
+ runner.withPropertyValues("spring.rocketmq.name-server=127.0.0.1:9876",
"spring.rocketmq.producer.group=spring_rocketmq").
run((context) -> {
assertThat(context).hasSingleBean(DefaultMQProducer.class);
@@ -60,7 +60,7 @@ public void testDefaultMQProducer() {
@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
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services