This is an automated email from the ASF dual-hosted git repository.
jinrongtong 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 5a82c22 [ISSUE #512] Go back and keep versions compatible (#513)
5a82c22 is described below
commit 5a82c22c699959509c2ff981a46756c153ee7f82
Author: panzhi <[email protected]>
AuthorDate: Fri Jan 13 10:38:27 2023 +0800
[ISSUE #512] Go back and keep versions compatible (#513)
* [ISSUE #512]Go back and keep versions compatible
* [ISSUE #512]Go back and keep versions compatible
---
.../apache/rocketmq/samples/springboot/ACLStringConsumer.java | 4 ++--
.../samples/springboot/ACLStringTransactionalConsumer.java | 4 ++--
.../spring/annotation/ExtRocketMQConsumerConfiguration.java | 10 +++++-----
.../rocketmq/spring/annotation/RocketMQMessageListener.java | 6 +++---
.../spring/autoconfigure/ListenerContainerConfiguration.java | 4 ++--
.../rocketmq/spring/autoconfigure/RocketMQProperties.java | 10 +++++-----
.../spring/autoconfigure/RocketMQAutoConfigurationTest.java | 8 ++++----
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java
b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java
index e1353f0..d2d654f 100644
---
a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java
+++
b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringConsumer.java
@@ -28,8 +28,8 @@ import org.springframework.stereotype.Service;
@RocketMQMessageListener(
topic = "normal_topic_define_in_Aliware_MQ",
consumerGroup = "group_define_in_Aliware_MQ"
- //accessKey = "AK" // It will read by `rocketmq.push-consumer.access-key`
key
- //secretKey = "SK" // It will read by `rocketmq.push-consumer.secret-key`
key
+ //accessKey = "AK" // It will read by `rocketmq.consumer.access-key` key
+ //secretKey = "SK" // It will read by `rocketmq.consumer.secret-key` key
)
public class ACLStringConsumer implements RocketMQListener<String> {
@Override
diff --git
a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java
b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java
index bd75895..342f44b 100644
---
a/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java
+++
b/rocketmq-spring-boot-samples/rocketmq-consume-acl-demo/src/main/java/org/apache/rocketmq/samples/springboot/ACLStringTransactionalConsumer.java
@@ -28,8 +28,8 @@ import org.springframework.stereotype.Service;
@RocketMQMessageListener(
topic = "${demo.rocketmq.transTopic}",
consumerGroup = "group_define_in_Aliware_MQ",
- accessKey = "AK", // if accessKey is empty, it will read by
`rocketmq.push-consumer.access-key` key
- secretKey = "SK" // if accessKey is empty, it will read by
`rocketmq.push-consumer.secret-key` key
+ accessKey = "AK", // if accessKey is empty, it will read by
`rocketmq.consumer.access-key` key
+ secretKey = "SK" // if accessKey is empty, it will read by
`rocketmq.consumer.secret-key` key
)
public class ACLStringTransactionalConsumer implements
RocketMQListener<String> {
@Override
diff --git
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/ExtRocketMQConsumerConfiguration.java
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/ExtRocketMQConsumerConfiguration.java
index d905fa6..64a261f 100644
---
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/ExtRocketMQConsumerConfiguration.java
+++
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/ExtRocketMQConsumerConfiguration.java
@@ -32,12 +32,12 @@ import java.lang.annotation.Target;
public @interface ExtRocketMQConsumerConfiguration {
String NAME_SERVER_PLACEHOLDER = "${rocketmq.name-server:}";
- String GROUP_PLACEHOLDER = "${rocketmq.push-consumer.group:}";
- String TOPIC_PLACEHOLDER = "${rocketmq.push-consumer.topic:}";
+ String GROUP_PLACEHOLDER = "${rocketmq.pull-consumer.group:}";
+ String TOPIC_PLACEHOLDER = "${rocketmq.pull-consumer.topic:}";
String ACCESS_CHANNEL_PLACEHOLDER = "${rocketmq.access-channel:}";
- String ACCESS_KEY_PLACEHOLDER = "${rocketmq.push-consumer.access-key:}";
- String SECRET_KEY_PLACEHOLDER = "${rocketmq.push-consumer.secret-key:}";
- String TRACE_TOPIC_PLACEHOLDER =
"${rocketmq.push-consumer.customized-trace-topic:}";
+ String ACCESS_KEY_PLACEHOLDER = "${rocketmq.pull-consumer.access-key:}";
+ String SECRET_KEY_PLACEHOLDER = "${rocketmq.pull-consumer.secret-key:}";
+ String TRACE_TOPIC_PLACEHOLDER =
"${rocketmq.pull-consumer.customized-trace-topic:}";
/**
* The component name of the Producer configuration.
diff --git
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/RocketMQMessageListener.java
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/RocketMQMessageListener.java
index bea1e9e..3647864 100644
---
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/RocketMQMessageListener.java
+++
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/annotation/RocketMQMessageListener.java
@@ -30,9 +30,9 @@ import java.util.concurrent.LinkedBlockingQueue;
public @interface RocketMQMessageListener {
String NAME_SERVER_PLACEHOLDER = "${rocketmq.name-server:}";
- String ACCESS_KEY_PLACEHOLDER = "${rocketmq.push-consumer.access-key:}";
- String SECRET_KEY_PLACEHOLDER = "${rocketmq.push-consumer.secret-key:}";
- String TRACE_TOPIC_PLACEHOLDER =
"${rocketmq.push-consumer.customized-trace-topic:}";
+ String ACCESS_KEY_PLACEHOLDER = "${rocketmq.consumer.access-key:}";
+ String SECRET_KEY_PLACEHOLDER = "${rocketmq.consumer.secret-key:}";
+ String TRACE_TOPIC_PLACEHOLDER =
"${rocketmq.consumer.customized-trace-topic:}";
String ACCESS_CHANNEL_PLACEHOLDER = "${rocketmq.access-channel:}";
/**
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 33fe5b7..a4a762a 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
@@ -82,7 +82,7 @@ public class ListenerContainerConfiguration implements
ApplicationContextAware {
String topic =
this.environment.resolvePlaceholders(annotation.topic());
boolean listenerEnabled =
- (boolean)
rocketMQProperties.getPushConsumer().getListeners().getOrDefault(consumerGroup,
Collections.EMPTY_MAP)
+ (boolean)
rocketMQProperties.getConsumer().getListeners().getOrDefault(consumerGroup,
Collections.EMPTY_MAP)
.getOrDefault(topic, true);
if (!listenerEnabled) {
@@ -143,7 +143,7 @@ public class ListenerContainerConfiguration implements
ApplicationContextAware {
String namespace =
environment.resolvePlaceholders(annotation.namespace());
container.setNamespace(RocketMQUtil.getNamespace(namespace,
- rocketMQProperties.getPushConsumer().getNamespace()));
+ rocketMQProperties.getConsumer().getNamespace()));
return container;
}
diff --git
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQProperties.java
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQProperties.java
index d0f82cf..e1b26a7 100644
---
a/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQProperties.java
+++
b/rocketmq-spring-boot/src/main/java/org/apache/rocketmq/spring/autoconfigure/RocketMQProperties.java
@@ -54,7 +54,7 @@ public class RocketMQProperties {
* the listener is enabled by default.
*
*/
- private PushConsumer pushConsumer = new PushConsumer();
+ private PushConsumer consumer = new PushConsumer();
public String getNameServer() {
return nameServer;
@@ -88,12 +88,12 @@ public class RocketMQProperties {
this.pullConsumer = pullConsumer;
}
- public PushConsumer getPushConsumer() {
- return pushConsumer;
+ public PushConsumer getConsumer() {
+ return consumer;
}
- public void setPushConsumer(PushConsumer pushConsumer) {
- this.pushConsumer = pushConsumer;
+ public void setConsumer(PushConsumer consumer) {
+ this.consumer = consumer;
}
public static class Producer {
diff --git
a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
index df81773..51c4ba1 100644
---
a/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
+++
b/rocketmq-spring-boot/src/test/java/org/apache/rocketmq/spring/autoconfigure/RocketMQAutoConfigurationTest.java
@@ -153,12 +153,12 @@ public class RocketMQAutoConfigurationTest {
public void testConsumerListener() {
runner.withPropertyValues("rocketmq.name-server=127.0.0.1:9876",
"rocketmq.producer.group=spring_rocketmq",
-
"rocketmq.push-consumer.listeners.spring_rocketmq.FOO_TEST_TOPIC=false",
-
"rocketmq.push-consumer.listeners.spring_rocketmq.FOO_TEST_TOPIC2=true").
+ "rocketmq.consumer.listeners.spring_rocketmq.FOO_TEST_TOPIC=false",
+
"rocketmq.consumer.listeners.spring_rocketmq.FOO_TEST_TOPIC2=true").
run((context) -> {
RocketMQProperties rocketMQProperties =
context.getBean(RocketMQProperties.class);
-
assertThat(rocketMQProperties.getPushConsumer().getListeners().get("spring_rocketmq").get("FOO_TEST_TOPIC").booleanValue()).isEqualTo(false);
-
assertThat(rocketMQProperties.getPushConsumer().getListeners().get("spring_rocketmq").get("FOO_TEST_TOPIC2").booleanValue()).isEqualTo(true);
+
assertThat(rocketMQProperties.getConsumer().getListeners().get("spring_rocketmq").get("FOO_TEST_TOPIC").booleanValue()).isEqualTo(false);
+
assertThat(rocketMQProperties.getConsumer().getListeners().get("spring_rocketmq").get("FOO_TEST_TOPIC2").booleanValue()).isEqualTo(true);
});
}
