1. Use Spring bean factory to resolve the placeholder values

2. Support XML config placeholders 3. Add more tests to cover all kinds of cases 4. Update apollo demo to adapt for auto update functionality
apolloconfig · Feb 23, 2018 · 3efd4a3 · 3efd4a3
1 parent 21a8d3b
commit 3efd4a3
Show file tree

Hide file tree

Showing 49 changed files with 2,794 additions and 594 deletions.
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultInjector.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultInjector.java
@@ -7,6 +7,8 @@
 import com.ctrip.framework.apollo.spi.DefaultConfigFactory;
 import com.ctrip.framework.apollo.spi.DefaultConfigFactoryManager;
 import com.ctrip.framework.apollo.spi.DefaultConfigRegistry;
+import com.ctrip.framework.apollo.spring.config.ConfigPropertySourceFactory;
+import com.ctrip.framework.apollo.spring.property.PlaceholderHelper;
 import com.ctrip.framework.apollo.tracer.Tracer;
 import com.ctrip.framework.apollo.util.ConfigUtil;
 import com.ctrip.framework.apollo.util.http.HttpUtil;
@@ -60,6 +62,8 @@ protected void configure() {
  bind(HttpUtil.class).in(Singleton.class);
  bind(ConfigServiceLocator.class).in(Singleton.class);
  bind(RemoteConfigLongPollService.class).in(Singleton.class);
+ bind(PlaceholderHelper.class).in(Singleton.class);
+ bind(ConfigPropertySourceFactory.class).in(Singleton.class);
  }
  }
 }
diff --git a/...ent/src/main/java/com/ctrip/framework/apollo/spring/annotation/ApolloConfigRegistrar.java b/...ent/src/main/java/com/ctrip/framework/apollo/spring/annotation/ApolloConfigRegistrar.java
@@ -1,5 +1,6 @@
 package com.ctrip.framework.apollo.spring.annotation;
 
+import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
@@ -31,6 +32,7 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
  BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, ApolloAnnotationProcessor.class.getName(),
  ApolloAnnotationProcessor.class);
 
- BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueProcessor.class.getName(),SpringValueProcessor.class);
+ BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueProcessor.class.getName(), SpringValueProcessor.class);
+ BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueDefinitionProcessor.class.getName(), SpringValueDefinitionProcessor.class);
  }
 }