[ISSUE alibaba#8622] enhance derivative logic of NacosClientProperties

onewe · Oct 21, 2022 · bbfc723 · bbfc723
1 parent f78bcd4
commit bbfc723
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/client/src/main/java/com/alibaba/nacos/client/env/SearchableProperties.java b/client/src/main/java/com/alibaba/nacos/client/env/SearchableProperties.java
@@ -68,6 +68,11 @@ private SearchableProperties(PropertiesPropertySource propertiesPropertySource)
                 JVM_ARGS_PROPERTY_SOURCE, SYSTEM_ENV_PROPERTY_SOURCE, DEFAULT_SETTING_PROPERTY_SOURCE);
     }
 
+    private SearchableProperties(PropertiesPropertySource propertiesPropertySource, List<AbstractPropertySource> propertySources) {
+        this.propertiesPropertySource = propertiesPropertySource;
+        this.propertySources = propertySources;
+    }
+
     @Override
     public String getProperty(String key) {
         return getProperty(key, null);
@@ -216,7 +221,19 @@ private List<AbstractPropertySource> sortPropertySource(SourceType firstType,
 
     @Override
     public NacosClientProperties derive() {
-        return new SearchableProperties(new PropertiesPropertySource(this.propertiesPropertySource));
+        List<AbstractPropertySource> propertySources = new ArrayList<>(this.propertySources);
+        PropertiesPropertySource newPropertiesPropertySource = new PropertiesPropertySource(this.propertiesPropertySource);
+        int index = 0;
+        for (int i = 0; i < propertySources.size(); i++) {
+            final AbstractPropertySource abstractPropertySource = propertySources.get(i);
+            final SourceType type = abstractPropertySource.getType();
+            if (SourceType.PROPERTIES.equals(type)) {
+                index = i;
+            }
+        }
+        propertySources.set(index, newPropertiesPropertySource);
+
+        return new SearchableProperties(newPropertiesPropertySource, propertySources);
     }
 
     @Override