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:40 UTC
[rocketmq-spring] 34/37: Polish
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 34388b86d23c3d5a9b3bff059cb01112aa1bba36
Author: Stephane Nicoll <sn...@pivotal.io>
AuthorDate: Fri Dec 21 16:31:38 2018 +0100
Polish
---
.../{config => autoconfigure}/JacksonFallbackConfiguration.java | 2 +-
.../{config => autoconfigure}/ListenerContainerConfiguration.java | 4 ++--
.../spring/{config => autoconfigure}/RocketMQAutoConfiguration.java | 5 ++++-
.../spring/{config => autoconfigure}/RocketMQProperties.java | 2 +-
rocketmq-spring-boot/src/main/resources/META-INF/spring.factories | 2 +-
.../{config => autoconfigure}/RocketMQAutoConfigurationTest.java | 2 +-
6 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/JacksonFallbackConfiguration.java b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/JacksonFallbackConfiguration.java
similarity index 96%
rename from rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/JacksonFallbackConfiguration.java
rename to rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/JacksonFallbackConfiguration.java
index a66887a..d25ca8d 100644
--- a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/JacksonFallbackConfiguration.java
+++ b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/JacksonFallbackConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.rocketmq.spring.config;
+package org.apache.rocketmq.spring.autoconfigure;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
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/autoconfigure/ListenerContainerConfiguration.java
similarity index 97%
rename from rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/ListenerContainerConfiguration.java
rename to rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java
index 506369e..da66132 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/autoconfigure/ListenerContainerConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.rocketmq.spring.config;
+package org.apache.rocketmq.spring.autoconfigure;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.rocketmq.spring.annotation.ConsumeMode;
@@ -43,7 +43,7 @@ import java.util.concurrent.atomic.AtomicLong;
@Configuration
public class ListenerContainerConfiguration implements ApplicationContextAware, SmartInitializingSingleton {
- private final static Logger log = LoggerFactory.getLogger(RocketMQAutoConfiguration.class);
+ private final static Logger log = LoggerFactory.getLogger(ListenerContainerConfiguration.class);
private ConfigurableApplicationContext applicationContext;
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/autoconfigure/RocketMQAutoConfiguration.java
similarity index 94%
rename from rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQAutoConfiguration.java
rename to rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfiguration.java
index ee35f81..78a6eba 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/autoconfigure/RocketMQAutoConfiguration.java
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.rocketmq.spring.config;
+package org.apache.rocketmq.spring.autoconfigure;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.rocketmq.client.MQAdmin;
import org.apache.rocketmq.client.producer.DefaultMQProducer;
+import org.apache.rocketmq.spring.config.RocketMQConfigUtils;
+import org.apache.rocketmq.spring.config.RocketMQTransactionAnnotationProcessor;
+import org.apache.rocketmq.spring.config.TransactionHandlerRegistry;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
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/autoconfigure/RocketMQProperties.java
similarity index 98%
rename from rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/config/RocketMQProperties.java
rename to rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQProperties.java
index 778ba77..88495e5 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/autoconfigure/RocketMQProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.rocketmq.spring.config;
+package org.apache.rocketmq.spring.autoconfigure;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/rocketmq-spring-boot/src/main/resources/META-INF/spring.factories b/rocketmq-spring-boot/src/main/resources/META-INF/spring.factories
index 92ff818..d976354 100644
--- a/rocketmq-spring-boot/src/main/resources/META-INF/spring.factories
+++ b/rocketmq-spring-boot/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.rocketmq.spring.config.RocketMQAutoConfiguration
\ No newline at end of file
+org.apache.rocketmq.spring.autoconfigure.RocketMQAutoConfiguration
\ No newline at end of file
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/autoconfigure/RocketMQAutoConfigurationTest.java
similarity index 99%
rename from rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/config/RocketMQAutoConfigurationTest.java
rename to rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
index c719e8c..f78251e 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/autoconfigure/RocketMQAutoConfigurationTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.rocketmq.spring.config;
+package org.apache.rocketmq.spring.autoconfigure;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.rocketmq.client.producer.DefaultMQProducer;