[apache#4560]change return type of create method in DynamicProperties…

…Source(apache#4561)
chengyouling · Oct 17, 2024 · 664d314 · 664d314
1 parent b41c208
commit 664d314
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/...llo/src/main/java/org/apache/servicecomb/config/apollo/ApolloDynamicPropertiesSource.java b/...llo/src/main/java/org/apache/servicecomb/config/apollo/ApolloDynamicPropertiesSource.java
@@ -29,6 +29,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.PropertySource;
 
 public class ApolloDynamicPropertiesSource implements DynamicPropertiesSource {
   public static final String SOURCE_NAME = "apollo";
@@ -75,7 +76,7 @@ public void handle(ConfigurationAction action, Map<String, Object> config) {
   }
 
   @Override
-  public MapPropertySource create(Environment environment) {
+  public PropertySource<?> create(Environment environment) {
     init(environment);
     return new MapPropertySource(SOURCE_NAME, valueCache);
   }

diff --git a/...c/src/main/java/org/apache/servicecomb/config/cc/ConfigCenterDynamicPropertiesSource.java b/...c/src/main/java/org/apache/servicecomb/config/cc/ConfigCenterDynamicPropertiesSource.java
@@ -49,6 +49,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.PropertySource;
 
 import com.google.common.eventbus.Subscribe;
 
@@ -181,7 +182,7 @@ private ConfigCenterAddressManager configCenterAddressManager(ConfigCenterConfig
   }
 
   @Override
-  public MapPropertySource create(Environment environment) {
+  public PropertySource<?> create(Environment environment) {
     init(environment);
     return new MapPropertySource(SOURCE_NAME, data);
   }

diff --git a/...onfig-kie/src/main/java/org/apache/servicecomb/config/kie/KieDynamicPropertiesSource.java b/...onfig-kie/src/main/java/org/apache/servicecomb/config/kie/KieDynamicPropertiesSource.java
@@ -48,6 +48,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.PropertySource;
 
 import com.google.common.eventbus.Subscribe;
 
@@ -163,7 +164,7 @@ private KieAddressManager configKieAddressManager(KieConfig kieConfig) {
   }
 
   @Override
-  public MapPropertySource create(Environment environment) {
+  public PropertySource<?> create(Environment environment) {
     init(environment);
     return new MapPropertySource(SOURCE_NAME, data);
   }

diff --git a/...nacos/src/main/java/org/apache/servicecomb/config/nacos/NacosDynamicPropertiesSource.java b/...nacos/src/main/java/org/apache/servicecomb/config/nacos/NacosDynamicPropertiesSource.java
@@ -26,6 +26,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.PropertySource;
 
 public class NacosDynamicPropertiesSource implements DynamicPropertiesSource {
   public static final String SOURCE_NAME = "nacos";
@@ -60,7 +61,7 @@ public void handle(Map<String, Object> current, Map<String, Object> last) {
   }
 
   @Override
-  public MapPropertySource create(Environment environment) {
+  public PropertySource<?> create(Environment environment) {
     init(environment);
     return new MapPropertySource(SOURCE_NAME, valueCache);
   }

diff --git a/...c/main/java/org/apache/servicecomb/config/zookeeper/ZookeeperDynamicPropertiesSource.java b/...c/main/java/org/apache/servicecomb/config/zookeeper/ZookeeperDynamicPropertiesSource.java
@@ -26,6 +26,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.PropertySource;
 
 public class ZookeeperDynamicPropertiesSource implements DynamicPropertiesSource {
   public static final String SOURCE_NAME = "zookeeper";
@@ -60,7 +61,7 @@ public void handle(Map<String, Object> current, Map<String, Object> last) {
   }
 
   @Override
-  public MapPropertySource create(Environment environment) {
+  public PropertySource<?> create(Environment environment) {
     init(environment);
     return new MapPropertySource(SOURCE_NAME, valueCache);
   }

diff --git a/...oundation-config/src/main/java/org/apache/servicecomb/config/DynamicPropertiesSource.java b/...oundation-config/src/main/java/org/apache/servicecomb/config/DynamicPropertiesSource.java
@@ -18,11 +18,11 @@
 
 import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
-import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.PropertySource;
 
 /**
  * SPI to add new DynamicPropertiesSource.
  */
 public interface DynamicPropertiesSource extends Ordered {
-  MapPropertySource create(Environment environment);
+  PropertySource<?> create(Environment environment);
 }
diff --git a/...n-config/src/main/java/org/apache/servicecomb/config/InMemoryDynamicPropertiesSource.java b/...n-config/src/main/java/org/apache/servicecomb/config/InMemoryDynamicPropertiesSource.java
@@ -22,6 +22,7 @@
 import org.apache.servicecomb.foundation.common.event.EventManager;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.PropertySource;
 
 /**
  * This DynamicPropertiesSource is created for easier system tests.
@@ -32,7 +33,7 @@ public class InMemoryDynamicPropertiesSource implements DynamicPropertiesSource
   private static final Map<String, Object> DYNAMIC = new HashMap<>();
 
   @Override
-  public MapPropertySource create(Environment environment) {
+  public PropertySource<?> create(Environment environment) {
     return new MapPropertySource(SOURCE_NAME, DYNAMIC);
   }