[3.1.0] fix(api): configuration reload problem

BREAKING CHANGES: Now we override "onReload()" method to define ConfigurationProvider how to reload the configs. Fix the problem that when the configuration file is read, the "reload()" method not working.
CarmJos · May 20, 2022 · d6f4970 · d6f4970
1 parent 85bacb2
commit d6f4970
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

diff --git a/core/src/main/java/cc/carm/lib/configuration/core/source/ConfigurationProvider.java b/core/src/main/java/cc/carm/lib/configuration/core/source/ConfigurationProvider.java
@@ -26,10 +26,15 @@ public boolean isExpired(long time) {
 
     public abstract @NotNull W getConfiguration();
 
-    public abstract void reload() throws Exception;
+    public void reload() throws Exception {
+        onReload(); // 调用重写的Reload方法
+        this.updateTime = System.currentTimeMillis();
+    }
 
     public abstract void save() throws Exception;
 
+    protected abstract void onReload() throws Exception;
+
     public abstract void setHeaderComment(@Nullable String path, @Nullable List<String> comments);
 
     public abstract void setInlineComment(@NotNull String path, @Nullable String comment);

diff --git a/impl/json/pom.xml b/impl/json/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/impl/json/src/main/java/cc/carm/lib/configuration/json/JSONConfigProvider.java b/impl/json/src/main/java/cc/carm/lib/configuration/json/JSONConfigProvider.java
@@ -49,7 +49,6 @@ public void initializeConfig() {
         if (map == null) map = new LinkedHashMap<>();
 
         this.configuration = new JSONConfigWrapper(map);
-        this.initializer = new ConfigInitializer<>(this);
     }
 
     @Override
@@ -58,7 +57,8 @@ public void initializeConfig() {
     }
 
     @Override
-    public void reload() {
+    protected void onReload() throws Exception {
+        super.reload();
         initializeConfig();
     }
 

diff --git a/impl/yaml/pom.xml b/impl/yaml/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/impl/yaml/src/main/java/cc/carm/lib/configuration/yaml/YAMLConfigProvider.java b/impl/yaml/src/main/java/cc/carm/lib/configuration/yaml/YAMLConfigProvider.java
@@ -38,7 +38,7 @@ public void initializeConfig() {
     }
 
     @Override
-    public void reload() throws Exception {
+    protected void onReload() throws Exception {
         configuration.load(getFile());
     }
 

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyconfiguration-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.0</version>
+    <version>3.1.0</version>
     <modules>
         <module>core</module>
         <module>impl/yaml</module>