[servicecomb-pack] branch master updated: SCB-1282 Support for custom "omegaUniqueIdGenerator" bean.

[ni...@apache.org]

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/servicecomb-pack.git


The following commit(s) were added to refs/heads/master by this push:
     new 13bb9ef  SCB-1282 Support for custom "omegaUniqueIdGenerator" bean.
13bb9ef is described below

commit 13bb9ef8c58024c2c374c44414205f974a6e1621
Author: zengxiangjiang <53...@qq.com>
AuthorDate: Tue Dec 3 09:11:08 2019 +0800

    SCB-1282 Support for custom "omegaUniqueIdGenerator" bean.
---
 .../org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
index ec8c624..dc49309 100644
--- a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
+++ b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
@@ -45,6 +45,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -57,7 +58,7 @@ class OmegaSpringConfig {
 
   private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-
+  @ConditionalOnMissingBean
   @Bean(name = {"omegaUniqueIdGenerator"})
   IdGenerator<String> idGenerator() {
     return new UniqueIdGenerator();