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 d57e78c [ISSUE #674] Remove duplicate validate (#730)
d57e78c is described below
commit d57e78c3b4f45b206690732127b46099e9e2cb53
Author: panzhi <[email protected]>
AuthorDate: Mon Jun 16 13:50:04 2025 +0800
[ISSUE #674] Remove duplicate validate (#730)
---
.../autoconfigure/ExtConsumerResetConfiguration.java | 14 --------------
.../autoconfigure/ExtProducerResetConfiguration.java | 12 ------------
.../autoconfigure/ExtConsumerResetConfiguration.java | 14 --------------
.../autoconfigure/ExtTemplateResetConfiguration.java | 13 -------------
4 files changed, 53 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 efe69ec..d09afbc 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
@@ -31,12 +31,10 @@ import org.springframework.aop.framework.AopProxyUtils;
import org.springframework.aop.scope.ScopedProxyUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.SmartInitializingSingleton;
-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.ConfigurableEnvironment;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -87,8 +85,6 @@ public class ExtConsumerResetConfiguration implements
ApplicationContextAware, S
}
ExtRocketMQConsumerConfiguration annotation =
clazz.getAnnotation(ExtRocketMQConsumerConfiguration.class);
- GenericApplicationContext genericApplicationContext =
(GenericApplicationContext) applicationContext;
- validate(annotation, genericApplicationContext);
DefaultLitePullConsumer consumer = null;
try {
@@ -142,14 +138,4 @@ public class ExtConsumerResetConfiguration implements
ApplicationContextAware, S
String value = environment.resolvePlaceholders(text);
return StringUtils.hasLength(value) ? value : defaultValue;
}
-
- private void validate(ExtRocketMQConsumerConfiguration annotation,
- GenericApplicationContext genericApplicationContext) {
- if (genericApplicationContext.isBeanNameInUse(annotation.value())) {
- throw new BeanDefinitionValidationException(
- String.format("Bean {} has been used in Spring Application
Context, " +
- "please check the
@ExtRocketMQConsumerConfiguration",
- annotation.value()));
- }
- }
}
\ No newline at end of file
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 0782587..737377e 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
@@ -36,7 +36,6 @@ 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.ConfigurableEnvironment;
import org.springframework.util.StringUtils;
@@ -81,8 +80,6 @@ public class ExtProducerResetConfiguration implements
ApplicationContextAware, S
}
ExtRocketMQTemplateConfiguration annotation =
clazz.getAnnotation(ExtRocketMQTemplateConfiguration.class);
- GenericApplicationContext genericApplicationContext =
(GenericApplicationContext) applicationContext;
- validate(annotation, genericApplicationContext);
DefaultMQProducer mqProducer = createProducer(annotation);
try {
@@ -134,13 +131,4 @@ public class ExtProducerResetConfiguration implements
ApplicationContextAware, S
producer.setInstanceName(annotation.instanceName());
return producer;
}
-
- private void validate(ExtRocketMQTemplateConfiguration annotation,
- GenericApplicationContext genericApplicationContext) {
- if (genericApplicationContext.isBeanNameInUse(annotation.value())) {
- throw new BeanDefinitionValidationException(String.format("Bean %s
has been used in Spring Application Context, " +
- "please check the @ExtRocketMQTemplateConfiguration",
- annotation.value()));
- }
- }
}
\ No newline at end of file
diff --git
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtConsumerResetConfiguration.java
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtConsumerResetConfiguration.java
index 5ec963c..a501e64 100644
---
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtConsumerResetConfiguration.java
+++
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtConsumerResetConfiguration.java
@@ -31,12 +31,10 @@ import org.springframework.aop.framework.AopProxyUtils;
import org.springframework.aop.scope.ScopedProxyUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.SmartInitializingSingleton;
-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.ConfigurableEnvironment;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -87,8 +85,6 @@ public class ExtConsumerResetConfiguration implements
ApplicationContextAware, S
throw new IllegalStateException(clazz + " is not instance of " +
RocketMQClientTemplate.class.getName());
}
org.apache.rocketmq.client.annotation.ExtConsumerResetConfiguration
annotation =
clazz.getAnnotation(org.apache.rocketmq.client.annotation.ExtConsumerResetConfiguration.class);
- GenericApplicationContext genericApplicationContext =
(GenericApplicationContext) applicationContext;
- validate(annotation, genericApplicationContext);
SimpleConsumerBuilder consumerBuilder = null;
SimpleConsumer simpleConsumer = null;
@@ -145,16 +141,6 @@ public class ExtConsumerResetConfiguration implements
ApplicationContextAware, S
return StringUtils.hasLength(value) ? value : defaultValue;
}
- private void
validate(org.apache.rocketmq.client.annotation.ExtConsumerResetConfiguration
annotation,
- GenericApplicationContext genericApplicationContext) {
- if (genericApplicationContext.isBeanNameInUse(annotation.value())) {
- throw new BeanDefinitionValidationException(
- String.format("Bean %s has been used in Spring Application
Context, " +
- "please check the @ExtRocketMQConsumerConfiguration",
- annotation.value()));
- }
- }
-
static class SimpleConsumerInfo {
String consumerGroup;
diff --git
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java
index fce9ee5..55fb9b0 100644
---
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java
+++
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java
@@ -30,12 +30,10 @@ import org.springframework.aop.framework.AopProxyUtils;
import org.springframework.aop.scope.ScopedProxyUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.SmartInitializingSingleton;
-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.ConfigurableEnvironment;
import org.springframework.util.StringUtils;
@@ -87,8 +85,6 @@ public class ExtTemplateResetConfiguration implements
ApplicationContextAware, S
}
ExtProducerResetConfiguration annotation =
clazz.getAnnotation(ExtProducerResetConfiguration.class);
- GenericApplicationContext genericApplicationContext =
(GenericApplicationContext) applicationContext;
- validate(annotation, genericApplicationContext);
ProducerBuilder producerBuilder = createProducer(annotation);
RocketMQClientTemplate rocketMQTemplate = (RocketMQClientTemplate)
bean;
@@ -124,13 +120,4 @@ public class ExtTemplateResetConfiguration implements
ApplicationContextAware, S
return producerBuilder;
}
- private void validate(ExtProducerResetConfiguration annotation,
- GenericApplicationContext genericApplicationContext)
{
- if (genericApplicationContext.isBeanNameInUse(annotation.value())) {
- throw new BeanDefinitionValidationException(String.format("Bean %s
has been used in Spring Application Context, " +
- "please check the @ExtTemplateConfiguration",
- annotation.value()));
- }
- }
-
}
