[shardingsphere] branch master updated: Refactor `NoneYamlTupleProcessor` (#24134)

[zh...@apache.org]

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

zhonghongsheng 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 7d1d1c3cc2b Refactor `NoneYamlTupleProcessor` (#24134)
7d1d1c3cc2b is described below

commit 7d1d1c3cc2bbdd56cb7c245f681fb6666cedaf78
Author: Zichao <57...@users.noreply.github.com>
AuthorDate: Mon Feb 13 22:37:00 2023 +0800

    Refactor `NoneYamlTupleProcessor` (#24134)
    
    * Refactor `NoneYamlTupleProcessor`
    
    * Refactor `NoneYamlTupleProcessor`
    
    * Refactor `NoneYamlTupleProcessor`
    
    * Refactor `NoneYamlTupleProcessor`
---
 .../yaml/engine/representer/processor/NoneYamlTupleProcessor.java  | 7 +------
 .../src/test/resources/expected/export-database-configuration.yaml | 2 ++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/engine/representer/processor/NoneYamlTupleProcessor.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/engine/representer/processor/NoneYamlTupleProcessor.java
index 29695788d9d..879c48a7cf9 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/engine/representer/processor/NoneYamlTupleProcessor.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/yaml/engine/representer/processor/NoneYamlTupleProcessor.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.sharding.yaml.engine.representer.processor;
 
 import org.apache.shardingsphere.infra.util.yaml.representer.processor.ShardingSphereYamlTupleProcessor;
 import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.nodes.MappingNode;
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.nodes.NodeTuple;
 import org.yaml.snakeyaml.nodes.ScalarNode;
@@ -37,17 +36,13 @@ public final class NoneYamlTupleProcessor implements ShardingSphereYamlTupleProc
     
     @Override
     public NodeTuple process(final NodeTuple nodeTuple) {
-        return (isNullNode(nodeTuple.getValueNode()) || isEmptyMappingNode(nodeTuple.getValueNode())) ? null : processNoneTuple(nodeTuple);
+        return isNullNode(nodeTuple.getValueNode()) ? null : processNoneTuple(nodeTuple);
     }
     
     private boolean isNullNode(final Node valueNode) {
         return Tag.NULL.equals(valueNode.getTag());
     }
     
-    private boolean isEmptyMappingNode(final Node valueNode) {
-        return Tag.MAP.equals(valueNode.getTag()) && ((MappingNode) valueNode).getValue().isEmpty();
-    }
-    
     private NodeTuple processNoneTuple(final NodeTuple noneTuple) {
         return new NodeTuple(noneTuple.getKeyNode(), new ScalarNode(Tag.STR, "", null, null, DumperOptions.ScalarStyle.PLAIN));
     }
diff --git a/proxy/backend/src/test/resources/expected/export-database-configuration.yaml b/proxy/backend/src/test/resources/expected/export-database-configuration.yaml
index 4122534d5e2..5fbe5ce9780 100644
--- a/proxy/backend/src/test/resources/expected/export-database-configuration.yaml
+++ b/proxy/backend/src/test/resources/expected/export-database-configuration.yaml
@@ -35,6 +35,8 @@ rules:
     standard:
       shardingAlgorithmName: ds_inline
       shardingColumn: order_id
+  defaultTableStrategy:
+    none: ''
   keyGenerators:
     snowflake:
       type: SNOWFLAKE