From 366ea48978377c27d7da54263aa60994073ce86f Mon Sep 17 00:00:00 2001
From: Liang Zhang <zhangliang@apache.org>
Date: Thu, 19 Sep 2024 23:39:53 +0800
Subject: [PATCH] Refactor YamlGlobalClockRuleConfigurationSwapper (#32929)

---
 .../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 01591fa1dc44a..f801eb96ce4d3 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 67e11b565da1f..30bc28763cb84 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.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 YamlGlobalClockRuleConfiguration swapToYamlConfiguration(final GlobalCloc
     
     @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