(shardingsphere) branch master updated: Refactor YamlGlobalClockRuleConfigurationSwapper (#32929)

[jianglongtao]

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

jianglongtao 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 366ea489783 Refactor YamlGlobalClockRuleConfigurationSwapper (#32929)
366ea489783 is described below

commit 366ea48978377c27d7da54263aa60994073ce86f
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Sep 19 23:39:53 2024 +0800

    Refactor YamlGlobalClockRuleConfigurationSwapper (#32929)
---
 .../globalclock/yaml/config/YamlGlobalClockRuleConfiguration.java     | 2 +-
 .../yaml/swapper/YamlGlobalClockRuleConfigurationSwapper.java         | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/config/YamlGlobalClockRuleConfiguration.java
 
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/config/YamlGlobalClockRuleConfiguration.java
index 01591fa1dc4..f801eb96ce4 100644
--- 
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/config/YamlGlobalClockRuleConfiguration.java
+++ 
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/config/YamlGlobalClockRuleConfiguration.java
@@ -39,7 +39,7 @@ public final class YamlGlobalClockRuleConfiguration 
implements YamlGlobalRuleCon
     
     private boolean enabled;
     
-    private Properties props;
+    private Properties props = new Properties();
     
     @Override
     public Class<GlobalClockRuleConfiguration> getRuleConfigurationType() {
diff --git 
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/swapper/YamlGlobalClockRuleConfigurationSwapper.java
 
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/swapper/YamlGlobalClockRuleConfigurationSwapper.java
index 67e11b565da..30bc28763cb 100644
--- 
a/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/swapper/YamlGlobalClockRuleConfigurationSwapper.java
+++ 
b/kernel/global-clock/core/src/main/java/org/apache/shardingsphere/globalclock/yaml/swapper/YamlGlobalClockRuleConfigurationSwapper.java
@@ -22,8 +22,6 @@ import 
org.apache.shardingsphere.globalclock.rule.constant.GlobalClockOrder;
 import 
org.apache.shardingsphere.globalclock.yaml.config.YamlGlobalClockRuleConfiguration;
 import 
org.apache.shardingsphere.infra.yaml.config.swapper.rule.YamlRuleConfigurationSwapper;
 
-import java.util.Properties;
-
 /**
  * YAML global clock rule configuration swapper.
  */
@@ -41,7 +39,7 @@ public final class YamlGlobalClockRuleConfigurationSwapper 
implements YamlRuleCo
     
     @Override
     public GlobalClockRuleConfiguration swapToObject(final 
YamlGlobalClockRuleConfiguration yamlConfig) {
-        return new GlobalClockRuleConfiguration(yamlConfig.getType(), 
yamlConfig.getProvider(), yamlConfig.isEnabled(), null == yamlConfig.getProps() 
? new Properties() : yamlConfig.getProps());
+        return new GlobalClockRuleConfiguration(yamlConfig.getType(), 
yamlConfig.getProvider(), yamlConfig.isEnabled(), yamlConfig.getProps());
     }
     
     @Override