fix:fix multi register and discovery bug. (#268) (#269)

Author: SkyeBeFreeman

polaris-common/polaris-config/src/main/java/com/tencent/polaris/factory/config/consumer/ConsumerConfigImpl.java

@@ -57,7 +57,7 @@ public class ConsumerConfigImpl implements ConsumerConfig {
     private List<DiscoveryConfigImpl> discoveries;
 
     @JsonIgnore
-    private Map<String, DiscoveryConfigImpl> discoveryConfigMap = new ConcurrentHashMap<>();
+    private final Map<String, DiscoveryConfigImpl> discoveryConfigMap = new ConcurrentHashMap<>();
 
     @Override
     public LocalCacheConfigImpl getLocalCache() {
@@ -96,7 +96,7 @@ public List<DiscoveryConfigImpl> getDiscoveries() {
         return discoveries;
     }
 
-    public void setDiscoveries(List<DiscoveryConfigImpl> discoveries) {
+    private void setDiscoveryConfigMap(List<DiscoveryConfigImpl> discoveries) {
         if (CollectionUtils.isNotEmpty(discoveries)) {
             for (DiscoveryConfigImpl discoveryConfig : discoveries) {
                 if (discoveryConfigMap.containsKey(discoveryConfig.getServerConnectorId())) {
@@ -107,7 +107,6 @@ public void setDiscoveries(List<DiscoveryConfigImpl> discoveries) {
                 }
             }
         }
-        this.discoveries = discoveries;
     }
 
     @Override
@@ -134,6 +133,7 @@ public void verify() {
                 discoveryConfig.verify();
             }
         }
+        setDiscoveryConfigMap(discoveries);
     }
 
     @Override

polaris-common/polaris-config/src/main/java/com/tencent/polaris/factory/config/provider/ProviderConfigImpl.java

@@ -47,7 +47,7 @@ public class ProviderConfigImpl implements ProviderConfig {
     private List<RegisterConfigImpl> registers;
 
     @JsonIgnore
-    private Map<String, RegisterConfigImpl> registerConfigMap = new ConcurrentHashMap<>();
+    private final Map<String, RegisterConfigImpl> registerConfigMap = new ConcurrentHashMap<>();
 
     @JsonProperty
     private long minRegisterInterval;
@@ -70,7 +70,7 @@ public List<RegisterConfigImpl> getRegisters() {
         return registers;
     }
 
-    public void setRegisters(List<RegisterConfigImpl> registers) {
+    private void setRegisterConfigMap(List<RegisterConfigImpl> registers) {
         if (CollectionUtils.isNotEmpty(registers)) {
             for (RegisterConfigImpl registerConfig : registers) {
                 if (registerConfigMap.containsKey(registerConfig.getServerConnectorId())) {
@@ -81,7 +81,6 @@ public void setRegisters(List<RegisterConfigImpl> registers) {
                 }
             }
         }
-        this.registers = registers;
     }
 
     @Override
@@ -99,6 +98,7 @@ public void verify() {
                 registerConfig.verify();
             }
         }
+        setRegisterConfigMap(registers);
     }
 
     @Override

pom.xml

@@ -64,7 +64,7 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>1.10.1</revision>
+        <revision>1.10.2</revision>
 
         <timestamp>${maven.build.timestamp}</timestamp>
         <skip.maven.deploy>false</skip.maven.deploy>