Optimize PropertiesConverter

apache · Nov 17, 2023 · 380e389 · 380e389
1 parent 2bb667f
commit 380e389
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/.../org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutorTest.java b/.../org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutorTest.java
@@ -58,7 +58,7 @@ void assertGetRowData() {
         assertThat(row.getCell(4), is("user_assisted"));
         assertThat(row.getCell(5), is("user_like"));
         assertThat(row.getCell(6), is("md5"));
-        assertThat(row.getCell(7), is("{}"));
+        assertThat(row.getCell(7), is(""));
         assertThat(row.getCell(8), is(""));
         assertThat(row.getCell(9), is(""));
         assertThat(row.getCell(10), is(""));

diff --git a/...t/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutorTest.java b/...t/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutorTest.java
@@ -55,7 +55,7 @@ void assertGetRowData() {
         assertThat(row.getCell(1), is("t_mask"));
         assertThat(row.getCell(2), is("user_id"));
         assertThat(row.getCell(3), is("md5"));
-        assertThat(row.getCell(4), is("{}"));
+        assertThat(row.getCell(4), is(""));
     }
 
     @Test

diff --git a/.../test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowRuleExecutorTest.java b/.../test/java/org/apache/shardingsphere/shadow/distsql/query/ShowShadowRuleExecutorTest.java
@@ -56,14 +56,14 @@ void assertGetRowData() {
         assertThat(row.getCell(3), is("source"));
         assertThat(row.getCell(4), is("shadow"));
         assertThat(row.getCell(5), is("REGEX_MATCH"));
-        assertThat(row.getCell(6), is("{}"));
+        assertThat(row.getCell(6), is(""));
         row = iterator.next();
         assertThat(row.getCell(1), is("t_order_item"));
         assertThat(row.getCell(2), is("shadow_rule"));
         assertThat(row.getCell(3), is("source"));
         assertThat(row.getCell(4), is("shadow"));
         assertThat(row.getCell(5), is("REGEX_MATCH"));
-        assertThat(row.getCell(6), is("{}"));
+        assertThat(row.getCell(6), is(""));
     }
 
     @Test

diff --git a/...a/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRuleExecutorTest.java b/...a/org/apache/shardingsphere/sharding/distsql/query/ShowShardingTableRuleExecutorTest.java
@@ -69,7 +69,7 @@ void assertGetRowData() {
         assertThat(row.getCell(11), is("{\"algorithm-expression\":\"t_order_${order_id % 2}\"}"));
         assertThat(row.getCell(12), is("order_id"));
         assertThat(row.getCell(13), is("SNOWFLAKE"));
-        assertThat(row.getCell(14), is("{}"));
+        assertThat(row.getCell(14), is(""));
         assertThat(row.getCell(15), is("DML_SHARDING_CONDITIONS"));
         assertThat(row.getCell(16), is("true"));
     }

diff --git a/...che/shardingsphere/sharding/distsql/query/ShowUnusedShardingKeyGeneratorExecutorTest.java b/...che/shardingsphere/sharding/distsql/query/ShowUnusedShardingKeyGeneratorExecutorTest.java
@@ -53,7 +53,7 @@ void assertGetRowData() {
         LocalDataQueryResultRow row = iterator.next();
         assertThat(row.getCell(1), is("uuid_key_generator"));
         assertThat(row.getCell(2), is("UUID"));
-        assertThat(row.getCell(3), is("{}"));
+        assertThat(row.getCell(3), is(""));
     }
 
     @Test

diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/props/PropertiesConverter.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/props/PropertiesConverter.java
@@ -21,6 +21,8 @@
 import lombok.NoArgsConstructor;
 import org.apache.shardingsphere.infra.util.json.JsonUtils;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Properties;
 
 /**
@@ -36,6 +38,8 @@ public final class PropertiesConverter {
      * @return converted string content
      */
     public static String convert(final Properties props) {
-        return JsonUtils.toJsonString(props);
+        Map<Object, Object> sortedProps = new LinkedHashMap<>();
+        props.keySet().stream().map(Object::toString).sorted().forEach(each -> sortedProps.put(each, props.get(each)));
+        return sortedProps.isEmpty() ? "" : JsonUtils.toJsonString(sortedProps);
     }
 }
diff --git a/...a/common/src/test/java/org/apache/shardingsphere/infra/props/PropertiesConverterTest.java b/...a/common/src/test/java/org/apache/shardingsphere/infra/props/PropertiesConverterTest.java
@@ -35,6 +35,6 @@ void assertConvert() {
 
     @Test
     void assertConvertEmptyProperties() {
-        assertThat(PropertiesConverter.convert(new Properties()), is("{}"));
+        assertThat(PropertiesConverter.convert(new Properties()), is(""));
     }
 }
diff --git a/.../org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutorTest.java b/.../org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutorTest.java
@@ -58,14 +58,14 @@ void assertExecute() {
         assertThat(row.getCell(3), is("SQL_MATCH"));
         assertThat(row.getCell(4), is("{\"sql\":\"select * from t_order\"}"));
         assertThat(row.getCell(5), is("RANDOM"));
-        assertThat(row.getCell(6), is("{}"));
+        assertThat(row.getCell(6), is(""));
         row = iterator.next();
         assertThat(row.getCell(1), is("rule_name_2"));
         assertThat(row.getCell(2), is("oltp"));
         assertThat(row.getCell(3), is("SQL_HINT"));
-        assertThat(row.getCell(4), is("{}"));
+        assertThat(row.getCell(4), is(""));
         assertThat(row.getCell(5), is("ROBIN"));
-        assertThat(row.getCell(6), is("{}"));
+        assertThat(row.getCell(6), is(""));
     }
 
     @Test