bugfix: fix configuration center can't read configuration using SpringCloudConfig

config/seata-config-spring-cloud/pom.xml

@@ -18,8 +18,9 @@
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-spring</artifactId>
+            <version>${project.parent.version}</version>
         </dependency>
     </dependencies>
 </project>

config/seata-config-spring-cloud/src/main/java/io/seata/config/springcloud/EnableSeataSpringConfig.java

@@ -15,15 +15,16 @@
  */
 package io.seata.config.springcloud;
 
-import org.springframework.context.annotation.Import;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import io.seata.spring.context.SeataSpringApplicationContextHolderRegistrar;
+import org.springframework.context.annotation.Import;
+
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
-@Import({SpringContextProvider.class})
+@Import({SeataSpringApplicationContextHolderRegistrar.class})
 public @interface EnableSeataSpringConfig {
 }

config/seata-config-spring-cloud/src/main/java/io/seata/config/springcloud/SpringCloudConfiguration.java

@@ -20,6 +20,8 @@
 import io.seata.common.util.StringUtils;
 import io.seata.config.AbstractConfiguration;
 import io.seata.config.ConfigurationChangeListener;
+import io.seata.spring.context.SeataSpringApplicationContextHolder;
+import org.springframework.context.ApplicationContext;
 
 public class SpringCloudConfiguration extends AbstractConfiguration {
 
@@ -49,10 +51,11 @@ public String getTypeName() {
 
     @Override
     public String getConfig(String dataId, String defaultValue, long timeoutMills) {
-        if (null == SpringContextProvider.getEnvironment()) {
+        ApplicationContext applicationContext = SeataSpringApplicationContextHolder.getApplicationContext();
+        if (null == applicationContext || null == applicationContext.getEnvironment()) {
             return defaultValue;
         }
-        String conf = SpringContextProvider.getEnvironment().getProperty(PREFIX + dataId);
+        String conf = applicationContext.getEnvironment().getProperty(PREFIX + dataId);
         return StringUtils.isNotBlank(conf) ? conf : defaultValue;
     }
 

seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/SeataAutoConfiguration.java

@@ -18,7 +18,7 @@
 import io.seata.spring.annotation.GlobalTransactionScanner;
 import io.seata.spring.annotation.datasource.SeataDataSourceBeanPostProcessor;
 import io.seata.spring.boot.autoconfigure.properties.SeataProperties;
-import io.seata.spring.boot.autoconfigure.util.SpringUtils;
+import io.seata.spring.context.SeataSpringApplicationContextHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -29,6 +29,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
+import static io.seata.spring.context.SeataSpringApplicationContextHolderRegistrar.BEAN_NAME_SEATA_SPRING_APPLICATION_CONTEXT_HOLDER;
 import static io.seata.spring.annotation.datasource.AutoDataSourceProxyRegistrar.BEAN_NAME_SEATA_DATA_SOURCE_BEAN_POST_PROCESSOR;
 
 /**
@@ -41,13 +42,14 @@
 public class SeataAutoConfiguration {
     private static final Logger LOGGER = LoggerFactory.getLogger(SeataAutoConfiguration.class);
 
-    @Bean
-    public SpringUtils springUtils() {
-        return new SpringUtils();
+    @Bean(BEAN_NAME_SEATA_SPRING_APPLICATION_CONTEXT_HOLDER)
+    @ConditionalOnMissingBean(SeataSpringApplicationContextHolder.class)
+    public SeataSpringApplicationContextHolder applicationContextHolder() {
+        return new SeataSpringApplicationContextHolder();
     }
 
     @Bean
-    @DependsOn({"springUtils"})
+    @DependsOn({BEAN_NAME_SEATA_SPRING_APPLICATION_CONTEXT_HOLDER})
     @ConditionalOnMissingBean(GlobalTransactionScanner.class)
     public GlobalTransactionScanner globalTransactionScanner(SeataProperties seataProperties) {
         if (LOGGER.isInfoEnabled()) {

seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java

@@ -24,8 +24,8 @@
 import io.seata.config.Configuration;
 import io.seata.config.ExtConfigurationProvider;
 import io.seata.spring.boot.autoconfigure.StarterConstants;
-import io.seata.spring.boot.autoconfigure.util.SpringUtils;
 import io.seata.spring.boot.autoconfigure.util.StringFormatUtils;
+import io.seata.spring.context.SeataSpringApplicationContextHolder;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.cglib.proxy.Enhancer;
 import org.springframework.cglib.proxy.MethodInterceptor;
@@ -94,7 +94,7 @@ private Object get(String dataId) throws IllegalAccessException {
         String propertySuffix = getPropertySuffix(dataId);
         Class propertyClass = getPropertyClass(getPropertyPrefix(dataId));
         if (null != propertyClass) {
-            Object propertyObject = SpringUtils.getBean(propertyClass);
+            Object propertyObject = SeataSpringApplicationContextHolder.getApplicationContext().getBean(propertyClass);
             Optional<Field> fieldOptional = Stream.of(propertyObject.getClass().getDeclaredFields()).filter(
                 f -> f.getName().equalsIgnoreCase(propertySuffix)).findAny();
             if (fieldOptional.isPresent()) {

seata-spring-boot-starter/src/test/java/io/seata/spring/boot/autoconfigure/RedisAutoInjectionTypeConvertTest.java

@@ -5,33 +5,47 @@
 import io.seata.config.ExtConfigurationProvider;
 import io.seata.config.FileConfiguration;
 import io.seata.spring.boot.autoconfigure.properties.registry.RegistryRedisProperties;
-import org.junit.jupiter.api.Assertions;
+import io.seata.spring.context.SeataSpringApplicationContextHolder;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
 /**
- * @Author zhangheng
+ * @author zhangheng
  **/
+@Import(SeataSpringApplicationContextHolder.class)
+@org.springframework.context.annotation.Configuration
 public class RedisAutoInjectionTypeConvertTest {
-
+    private static AnnotationConfigApplicationContext applicationContex;
 
     @BeforeAll
-    public static void initApplicationContext() {
-        ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:spring/redis_auto_injectio_test.xml");
-        applicationContext.getBeansOfType(RegistryRedisProperties.class);
+    public static void initContext() {
+        applicationContex = new AnnotationConfigApplicationContext(RedisAutoInjectionTypeConvertTest.class);
+    }
+
+    @Bean
+    RegistryRedisProperties registryRedisProperties() {
+        return new RegistryRedisProperties().setPassword("123456").setDb(1).setServerAddr("localhost:123456");
     }
 
-    @Test
-    public void testRegister() throws Exception {
 
+    @Test
+    public void testReadConfigurationItems() {
         FileConfiguration configuration = mock(FileConfiguration.class);
         Configuration currentConfiguration = EnhancedServiceLoader.load(ExtConfigurationProvider.class).provide(configuration);
-        int db = currentConfiguration.getInt("registry.redis.db");
-        Assertions.assertEquals(1,db);
+        assertEquals(1, currentConfiguration.getInt("registry.redis.db"));
+        assertEquals("123456", currentConfiguration.getConfig("registry.redis.password"));
+        assertEquals("localhost:123456", currentConfiguration.getConfig("registry.redis.serverAddr"));
+    }
+
+    @AfterAll
+    public static void closeContext() {
+        applicationContex.close();
     }
 }

config/seata-config-spring-cloud/src/main/java/io/seata/config/springcloud/SpringContextProvider.java → spring/src/main/java/io/seata/spring/context/SeataSpringApplicationContextHolder.java

@@ -13,27 +13,29 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package io.seata.config.springcloud;
+package io.seata.spring.context;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.env.Environment;
 
-public class SpringContextProvider implements ApplicationContextAware {
+/**
+ * @author xingfudeshi@gmail.com
+ * The type application context holder
+ */
+public class SeataSpringApplicationContextHolder implements ApplicationContextAware {
     private static ApplicationContext applicationContext;
-    private static Environment environment;
 
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        SpringContextProvider.applicationContext = applicationContext;
-        SpringContextProvider.environment = applicationContext.getEnvironment();
-    }
-
-    public static Environment getEnvironment() {
-        return environment;
+        SeataSpringApplicationContextHolder.applicationContext = applicationContext;
     }
 
+    /**
+     * get application context
+     *
+     * @return applicationContext
+     */
     public static ApplicationContext getApplicationContext() {
         return applicationContext;
     }

spring/src/main/java/io/seata/spring/context/SeataSpringApplicationContextHolderRegistrar.java

@@ -0,0 +1,38 @@
+/*
+ *  Copyright 1999-2019 Seata.io Group.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package io.seata.spring.context;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.core.type.AnnotationMetadata;
+
+/**
+ * @author xingfudeshi@gmail.com
+ * The type application context registrar
+ */
+public class SeataSpringApplicationContextHolderRegistrar implements ImportBeanDefinitionRegistrar {
+    public static final String BEAN_NAME_SEATA_SPRING_APPLICATION_CONTEXT_HOLDER = "seataSpringApplicationContextHolder";
+
+    @Override
+    public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
+        if (!registry.containsBeanDefinition(BEAN_NAME_SEATA_SPRING_APPLICATION_CONTEXT_HOLDER)) {
+            AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(SeataSpringApplicationContextHolder.class).getBeanDefinition();
+            registry.registerBeanDefinition(BEAN_NAME_SEATA_SPRING_APPLICATION_CONTEXT_HOLDER, beanDefinition);
+        }
+    }
+}