Refactor RepositoryTupleSwapper's impl

apache · Apr 29, 2024 · 9c59104 · 9c59104
1 parent 1b5076d
commit 9c59104
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...e/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java b/...e/shardingsphere/encrypt/yaml/swapper/EncryptRuleConfigurationRepositoryTupleSwapper.java
@@ -65,6 +65,7 @@ public Optional<EncryptRuleConfiguration> swapToObject(final Collection<Reposito
         if (validTuples.isEmpty()) {
             return Optional.empty();
         }
+        YamlEncryptRuleConfiguration yamlRuleConfig = new YamlEncryptRuleConfiguration();
         Map<String, YamlEncryptTableRuleConfiguration> tables = new LinkedHashMap<>();
         Map<String, YamlAlgorithmConfiguration> encryptors = new LinkedHashMap<>();
         for (RepositoryTuple each : validTuples) {
@@ -73,7 +74,6 @@ public Optional<EncryptRuleConfiguration> swapToObject(final Collection<Reposito
             encryptRuleNodePath.getNamedItem(EncryptRuleNodePathProvider.ENCRYPTORS).getName(each.getKey())
                     .ifPresent(optional -> encryptors.put(optional, YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class)));
         }
-        YamlEncryptRuleConfiguration yamlRuleConfig = new YamlEncryptRuleConfiguration();
         yamlRuleConfig.setTables(tables);
         yamlRuleConfig.setEncryptors(encryptors);
         return Optional.of(ruleConfigSwapper.swapToObject(yamlRuleConfig));

diff --git a/.../apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java b/.../apache/shardingsphere/mask/yaml/swapper/MaskRuleConfigurationRepositoryTupleSwapper.java
@@ -50,12 +50,12 @@ public final class MaskRuleConfigurationRepositoryTupleSwapper implements Reposi
     public Collection<RepositoryTuple> swapToRepositoryTuples(final MaskRuleConfiguration data) {
         Collection<RepositoryTuple> result = new LinkedList<>();
         YamlMaskRuleConfiguration yamlRuleConfig = ruleConfigSwapper.swapToYamlConfiguration(data);
-        for (Entry<String, YamlAlgorithmConfiguration> entry : yamlRuleConfig.getMaskAlgorithms().entrySet()) {
-            result.add(new RepositoryTuple(maskRuleNodePath.getNamedItem(MaskRuleNodePathProvider.MASK_ALGORITHMS).getPath(entry.getKey()), YamlEngine.marshal(entry.getValue())));
-        }
         for (YamlMaskTableRuleConfiguration each : yamlRuleConfig.getTables().values()) {
             result.add(new RepositoryTuple(maskRuleNodePath.getNamedItem(MaskRuleNodePathProvider.TABLES).getPath(each.getName()), YamlEngine.marshal(each)));
         }
+        for (Entry<String, YamlAlgorithmConfiguration> entry : yamlRuleConfig.getMaskAlgorithms().entrySet()) {
+            result.add(new RepositoryTuple(maskRuleNodePath.getNamedItem(MaskRuleNodePathProvider.MASK_ALGORITHMS).getPath(entry.getKey()), YamlEngine.marshal(entry.getValue())));
+        }
         return result;
     }
 
@@ -65,6 +65,7 @@ public Optional<MaskRuleConfiguration> swapToObject(final Collection<RepositoryT
         if (validTuples.isEmpty()) {
             return Optional.empty();
         }
+        YamlMaskRuleConfiguration yamlRuleConfig = new YamlMaskRuleConfiguration();
         Map<String, YamlMaskTableRuleConfiguration> tables = new LinkedHashMap<>();
         Map<String, YamlAlgorithmConfiguration> maskAlgorithms = new LinkedHashMap<>();
         for (RepositoryTuple each : validTuples) {
@@ -73,7 +74,6 @@ public Optional<MaskRuleConfiguration> swapToObject(final Collection<RepositoryT
             maskRuleNodePath.getNamedItem(MaskRuleNodePathProvider.MASK_ALGORITHMS).getName(each.getKey())
                     .ifPresent(optional -> maskAlgorithms.put(optional, YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class)));
         }
-        YamlMaskRuleConfiguration yamlRuleConfig = new YamlMaskRuleConfiguration();
         yamlRuleConfig.setTables(tables);
         yamlRuleConfig.setMaskAlgorithms(maskAlgorithms);
         return Optional.of(ruleConfigSwapper.swapToObject(yamlRuleConfig));

diff --git a/...ritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java b/...ritesplitting/yaml/swapper/ReadwriteSplittingRuleConfigurationRepositoryTupleSwapper.java
@@ -67,6 +67,7 @@ public Optional<ReadwriteSplittingRuleConfiguration> swapToObject(final Collecti
         if (validRepositoryTuples.isEmpty()) {
             return Optional.empty();
         }
+        YamlReadwriteSplittingRuleConfiguration yamlRuleConfig = new YamlReadwriteSplittingRuleConfiguration();
         Map<String, YamlReadwriteSplittingDataSourceGroupRuleConfiguration> dataSourceGroups = new LinkedHashMap<>();
         Map<String, YamlAlgorithmConfiguration> loadBalancers = new LinkedHashMap<>();
         for (RepositoryTuple each : validRepositoryTuples) {
@@ -75,7 +76,6 @@ public Optional<ReadwriteSplittingRuleConfiguration> swapToObject(final Collecti
             readwriteSplittingRuleNodePath.getNamedItem(ReadwriteSplittingRuleNodePathProvider.LOAD_BALANCERS).getName(each.getKey())
                     .ifPresent(optional -> loadBalancers.put(optional, YamlEngine.unmarshal(each.getValue(), YamlAlgorithmConfiguration.class)));
         }
-        YamlReadwriteSplittingRuleConfiguration yamlRuleConfig = new YamlReadwriteSplittingRuleConfiguration();
         yamlRuleConfig.setDataSourceGroups(dataSourceGroups);
         yamlRuleConfig.setLoadBalancers(loadBalancers);
         return Optional.of(ruleConfigSwapper.swapToObject(yamlRuleConfig));