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
The following commit(s) were added to refs/heads/master by this push:
new 845b9d3 change StandardEnvironment to ConfigurableEnvironment (#478)
845b9d3 is described below
commit 845b9d3f04e7b9cd42b55ebce43768ca2fae8957
Author: fishautumn <[email protected]>
AuthorDate: Tue Aug 16 16:57:18 2022 +0800
change StandardEnvironment to ConfigurableEnvironment (#478)
Co-authored-by: yushouqiu <[email protected]>
---
.../spring/autoconfigure/ExtConsumerResetConfiguration.java | 8 ++++----
.../spring/autoconfigure/ExtProducerResetConfiguration.java | 8 ++++----
.../spring/autoconfigure/ListenerContainerConfiguration.java | 6 +++---
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtConsumerResetConfiguration.java
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtConsumerResetConfiguration.java
index b954ff9..7b74bb2 100644
---
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtConsumerResetConfiguration.java
+++
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtConsumerResetConfiguration.java
@@ -37,7 +37,7 @@ 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;
+import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -47,18 +47,18 @@ import java.util.stream.Collectors;
@Configuration
public class ExtConsumerResetConfiguration implements ApplicationContextAware,
SmartInitializingSingleton {
- private final static Logger log =
LoggerFactory.getLogger(ExtConsumerResetConfiguration.class);
+ private static final Logger log =
LoggerFactory.getLogger(ExtConsumerResetConfiguration.class);
private ConfigurableApplicationContext applicationContext;
- private StandardEnvironment environment;
+ private ConfigurableEnvironment environment;
private RocketMQProperties rocketMQProperties;
private RocketMQMessageConverter rocketMQMessageConverter;
public ExtConsumerResetConfiguration(RocketMQMessageConverter
rocketMQMessageConverter,
- StandardEnvironment environment, RocketMQProperties
rocketMQProperties) {
+ ConfigurableEnvironment environment, RocketMQProperties
rocketMQProperties) {
this.rocketMQMessageConverter = rocketMQMessageConverter;
this.environment = environment;
this.rocketMQProperties = rocketMQProperties;
diff --git
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java
index 9468f2e..4e3c1f5 100644
---
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java
+++
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ExtProducerResetConfiguration.java
@@ -37,23 +37,23 @@ 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;
+import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.util.StringUtils;
@Configuration
public class ExtProducerResetConfiguration implements ApplicationContextAware,
SmartInitializingSingleton {
- private final static Logger log =
LoggerFactory.getLogger(ExtProducerResetConfiguration.class);
+ private static final Logger log =
LoggerFactory.getLogger(ExtProducerResetConfiguration.class);
private ConfigurableApplicationContext applicationContext;
- private StandardEnvironment environment;
+ private ConfigurableEnvironment environment;
private RocketMQProperties rocketMQProperties;
private RocketMQMessageConverter rocketMQMessageConverter;
public ExtProducerResetConfiguration(RocketMQMessageConverter
rocketMQMessageConverter,
- StandardEnvironment environment, RocketMQProperties
rocketMQProperties) {
+ ConfigurableEnvironment environment, RocketMQProperties
rocketMQProperties) {
this.rocketMQMessageConverter = rocketMQMessageConverter;
this.environment = environment;
this.rocketMQProperties = rocketMQProperties;
diff --git
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java
index e4afd14..82093ed 100644
---
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java
+++
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/ListenerContainerConfiguration.java
@@ -41,7 +41,7 @@ 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;
+import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.util.StringUtils;
@Configuration
@@ -52,14 +52,14 @@ public class ListenerContainerConfiguration implements
ApplicationContextAware,
private AtomicLong counter = new AtomicLong(0);
- private StandardEnvironment environment;
+ private ConfigurableEnvironment environment;
private RocketMQProperties rocketMQProperties;
private RocketMQMessageConverter rocketMQMessageConverter;
public ListenerContainerConfiguration(RocketMQMessageConverter
rocketMQMessageConverter,
- StandardEnvironment environment, RocketMQProperties
rocketMQProperties) {
+ ConfigurableEnvironment environment, RocketMQProperties
rocketMQProperties) {
this.rocketMQMessageConverter = rocketMQMessageConverter;
this.environment = environment;
this.rocketMQProperties = rocketMQProperties;