[shardingsphere] branch master updated: Refactor MetaDataPersistService (#15210)

[duanzhengqiang]

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new b02a53a  Refactor MetaDataPersistService (#15210)
b02a53a is described below

commit b02a53ac46039e4a57f25da086cad36b3c5a8b72
Author: Liang Zhang <terrym...@163.com>
AuthorDate: Sun Jan 30 15:05:12 2022 +0800

    Refactor MetaDataPersistService (#15210)
---
 .../mode/metadata/persist/MetaDataPersistService.java              | 6 +++---
 .../mode/metadata/persist/MetaDataPersistServiceTest.java          | 7 +++----
 .../mode/manager/cluster/ClusterContextManagerBuilder.java         | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git 
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
 
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
index 5f1b27e..1b4a3e8 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistService.java
@@ -95,13 +95,13 @@ public final class MetaDataPersistService {
     }
     
     /**
-     * Persist instance configurations.
+     * Persist instance labels.
      * 
      * @param instanceId instance id
-     * @param labels collection of label
+     * @param labels labels
      * @param isOverwrite whether overwrite registry center's configuration if 
existed
      */
-    public void persistInstanceConfigurations(final String instanceId, final 
Collection<String> labels, final boolean isOverwrite) {
+    public void persistInstanceLabels(final String instanceId, final 
Collection<String> labels, final boolean isOverwrite) {
         computeNodePersistService.persistInstanceLabels(instanceId, labels, 
isOverwrite);
     }
 }
diff --git 
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
 
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
index beee100..593cef0 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/MetaDataPersistServiceTest.java
@@ -52,7 +52,6 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.stream.Collectors;
 
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -114,9 +113,9 @@ public final class MetaDataPersistServiceTest {
     }
     
     @Test
-    public void assertPersistInstanceConfigurations() {
-        metaDataPersistService.persistInstanceConfigurations("127.0.0.1@3307", 
Collections.singletonList("foo_label"), false);
-        
verify(computeNodePersistService).persistInstanceLabels(eq("127.0.0.1@3307"), 
eq(Collections.singletonList("foo_label")), eq(false));
+    public void assertPersistInstanceLabels() {
+        metaDataPersistService.persistInstanceLabels("127.0.0.1@3307", 
Collections.singletonList("foo_label"), false);
+        
verify(computeNodePersistService).persistInstanceLabels("127.0.0.1@3307", 
Collections.singletonList("foo_label"), false);
     }
     
     private Map<String, DataSource> createDataSourceMap() {
diff --git 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 7b82c27..114ff58 100644
--- 
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++ 
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -91,7 +91,7 @@ public final class ClusterContextManagerBuilder implements 
ContextManagerBuilder
         if (!isEmptyLocalConfiguration(parameter)) {
             
metaDataPersistService.persistConfigurations(parameter.getSchemaConfigs(), 
parameter.getGlobalRuleConfigs(), parameter.getProps(), isOverwrite);
         }
-        
metaDataPersistService.persistInstanceConfigurations(parameter.getInstanceDefinition().getInstanceId().getId(),
 parameter.getLabels(), isOverwrite);
+        
metaDataPersistService.persistInstanceLabels(parameter.getInstanceDefinition().getInstanceId().getId(),
 parameter.getLabels(), isOverwrite);
     }
     
     private boolean isEmptyLocalConfiguration(final 
ContextManagerBuilderParameter parameter) {