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:35 UTC
[rocketmq-spring] 29/37: Merge branch 'master' into master
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 d0f973f41b779f5d045f97e4629b82aa88b4fa39
Merge: 9db9c38 07598bf
Author: von gosling <vo...@apache.org>
AuthorDate: Wed Dec 19 15:37:54 2018 +0800
Merge branch 'master' into master
.../config/JacksonFallbackConfiguration.java | 34 +++++++++++++++
.../config/ListenerContainerConfiguration.java | 6 +--
.../spring/config/RocketMQAutoConfiguration.java | 34 ++++-----------
.../config/RocketMQAutoConfigurationTest.java | 48 ++++++++++++++++++++++
4 files changed, 92 insertions(+), 30 deletions(-)
diff --cc rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQAutoConfiguration.java
index 10dfb5e,a2efeb6..c031335
--- 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
@@@ -34,12 -35,12 +35,12 @@@ import org.springframework.context.anno
import org.springframework.context.annotation.Role;
import org.springframework.util.Assert;
- import java.util.Objects;
-
@Configuration
@EnableConfigurationProperties(RocketMQProperties.class)
+ @ConditionalOnClass({ MQAdmin.class, ObjectMapper.class })
-@ConditionalOnProperty(prefix = "spring.rocketmq", value = "name-server")
+@ConditionalOnProperty(prefix = "rocketmq", value = "name-server")
- @Import(ListenerContainerConfiguration.class)
+ @Import({ JacksonFallbackConfiguration.class, ListenerContainerConfiguration.class })
+ @AutoConfigureAfter(JacksonAutoConfiguration.class)
public class RocketMQAutoConfiguration {
@Bean