You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2025/02/26 09:13:48 UTC

(shardingsphere) branch master updated: Refactor YamlRuleRepositoryTupleSwapperEngine to support qualified rule item key (#34794)

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

menghaoran 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 ab979ad5f97 Refactor YamlRuleRepositoryTupleSwapperEngine to support qualified rule item key (#34794)
ab979ad5f97 is described below

commit ab979ad5f97225a649c4349c7eac43230bba2002
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Wed Feb 26 17:13:42 2025 +0800

    Refactor YamlRuleRepositoryTupleSwapperEngine to support qualified rule item key (#34794)
---
 .../mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngine.java    | 4 ++--
 .../mode/node/rule/YamlRuleRepositoryTupleSwapperEngineTest.java      | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngine.java b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngine.java
index 548eb206d65..03379f1d3ac 100644
--- a/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngine.java
+++ b/mode/node/src/main/java/org/apache/shardingsphere/mode/node/rule/tuple/YamlRuleRepositoryTupleSwapperEngine.java
@@ -206,14 +206,14 @@ public final class YamlRuleRepositoryTupleSwapperEngine {
         RuleRepositoryTupleKeyListNameGenerator tupleKeyListNameGenerator = field.getAnnotation(RuleRepositoryTupleKeyListNameGenerator.class);
         if (null != tupleKeyListNameGenerator && fieldValue instanceof Collection) {
             DatabaseRuleNodePath databaseRuleNodePath = new DatabaseRuleNodePath(
-                    NodePathPattern.IDENTIFIER, databaseRuleNode.getRuleType(), new DatabaseRuleItem(tupleName, NodePathPattern.IDENTIFIER));
+                    NodePathPattern.IDENTIFIER, databaseRuleNode.getRuleType(), new DatabaseRuleItem(tupleName, NodePathPattern.QUALIFIED_IDENTIFIER));
             NodePathSearcher.find(tuple.getKey(), new NodePathSearchCriteria(databaseRuleNodePath, false, true, 2)).ifPresent(optional -> ((Collection) fieldValue).add(tuple.getValue()));
             return;
         }
         if (fieldValue instanceof Map) {
             Class<?> valueClass = (Class) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[1];
             DatabaseRuleNodePath databaseRuleNodePath = new DatabaseRuleNodePath(
-                    NodePathPattern.IDENTIFIER, databaseRuleNode.getRuleType(), new DatabaseRuleItem(tupleName, NodePathPattern.IDENTIFIER));
+                    NodePathPattern.IDENTIFIER, databaseRuleNode.getRuleType(), new DatabaseRuleItem(tupleName, NodePathPattern.QUALIFIED_IDENTIFIER));
             NodePathSearcher.find(tuple.getKey(), new NodePathSearchCriteria(databaseRuleNodePath, false, true, 2))
                     .ifPresent(optional -> ((Map) fieldValue).put(optional, YamlEngine.unmarshal(tuple.getValue(), valueClass)));
             return;
diff --git a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/YamlRuleRepositoryTupleSwapperEngineTest.java b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/YamlRuleRepositoryTupleSwapperEngineTest.java
index c4ecdda837f..1fe04165aef 100644
--- a/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/YamlRuleRepositoryTupleSwapperEngineTest.java
+++ b/mode/node/src/test/java/org/apache/shardingsphere/mode/node/rule/YamlRuleRepositoryTupleSwapperEngineTest.java
@@ -145,6 +145,7 @@ class YamlRuleRepositoryTupleSwapperEngineTest {
     void assertSwapToYamlRuleConfigurationWithNodeYamlRuleConfiguration() {
         Optional<YamlRuleConfiguration> actual = new YamlRuleRepositoryTupleSwapperEngine().swapToYamlRuleConfiguration(Arrays.asList(
                 new RuleRepositoryTuple("/metadata/foo_db/rules/node/map_value/k", "v"),
+                new RuleRepositoryTuple("/metadata/foo_db/rules/node/map_value/k:qualified", "k:qualified"),
                 new RuleRepositoryTuple("/metadata/foo_db/rules/node/collection_value", "- !LEAF" + System.lineSeparator() + "  value: foo"),
                 new RuleRepositoryTuple("/metadata/foo_db/rules/node/string_value", "str"),
                 new RuleRepositoryTuple("/metadata/foo_db/rules/node/boolean_value", "true"),
@@ -153,8 +154,9 @@ class YamlRuleRepositoryTupleSwapperEngineTest {
                 new RuleRepositoryTuple("/metadata/foo_db/rules/node/enum_value", "FOO")), NodeYamlRuleConfiguration.class);
         assertTrue(actual.isPresent());
         NodeYamlRuleConfiguration actualYamlConfig = (NodeYamlRuleConfiguration) actual.get();
-        assertThat(actualYamlConfig.getMapValue().size(), is(1));
+        assertThat(actualYamlConfig.getMapValue().size(), is(2));
         assertThat(actualYamlConfig.getMapValue().get("k").getValue(), is("v"));
+        assertThat(actualYamlConfig.getMapValue().get("k:qualified").getValue(), is("k:qualified"));
         assertThat(actualYamlConfig.getCollectionValue().size(), is(1));
         assertThat(actualYamlConfig.getCollectionValue().iterator().next().getValue(), is("foo"));
         assertThat(actualYamlConfig.getStringValue(), is("str"));