This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
The following commit(s) were added to refs/heads/master by this push:
new 9d57ce6 修改idGenerator 的bean 名称为omegaUniquaIdGenerator
9d57ce6 is described below
commit 9d57ce6ec21b8e0de909f3fec86f38f88dd27ecf
Author: CMonkey <[email protected]>
AuthorDate: Fri Mar 23 11:54:02 2018 +0800
修改idGenerator 的bean 名称为omegaUniquaIdGenerator
在spring boot 项目中存在不同业务的IdGenerator Bean
避免在引入omega 时，导致IdGenerator 冲突
---
.../org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
index fa4027b..1422025 100644
---
a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
+++
b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
@@ -27,6 +27,8 @@ import
org.apache.servicecomb.saga.omega.format.KryoMessageFormat;
import org.apache.servicecomb.saga.omega.format.MessageFormat;
import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
import org.apache.servicecomb.saga.omega.transaction.MessageSender;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -35,13 +37,13 @@ import org.springframework.context.annotation.Lazy;
@Configuration
class OmegaSpringConfig {
- @Bean
+ @Bean(name = {"omegaUniqueIdGenerator"})
IdGenerator<String> idGenerator() {
return new UniqueIdGenerator();
}
@Bean
- OmegaContext omegaContext(IdGenerator<String> idGenerator) {
+ OmegaContext omegaContext(@Qualifier("omegaUniqueIdGenerator")
IdGenerator<String> idGenerator) {
return new OmegaContext(idGenerator);
}
--
To stop receiving notification emails like this one, please contact
[email protected].
