feat: Split MapSection and MemorySection

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>4.0.2</version>
+        <version>4.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

demo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>4.0.2</version>
+        <version>4.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

features/commentable/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyconfiguration-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

features/file/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyconfiguration-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

features/section/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyconfiguration-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

features/section/src/main/java/cc/carm/lib/configuration/source/section/MapSection.java

@@ -0,0 +1,146 @@
+package cc.carm.lib.configuration.source.section;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+public abstract class MapSection<R extends MapSection<R>> implements ConfigureSection {
+
+    protected final @NotNull Map<String, Object> data;
+    protected final @Nullable R parent;
+
+    protected MapSection(@NotNull Map<?, ?> data, @Nullable R parent) {
+        this.parent = parent;
+        this.data = new LinkedHashMap<>();
+        for (Map.Entry<?, ?> entry : data.entrySet()) {
+            String key = (entry.getKey() == null) ? "null" : entry.getKey().toString();
+            if (entry.getValue() instanceof Map) {
+                this.data.put(key, createChild((Map<?, ?>) entry.getValue()));
+            } else if (entry.getValue() instanceof List) {
+                List<Object> list = new ArrayList<>();
+                for (Object obj : (List<?>) entry.getValue()) {
+                    if (obj instanceof Map) {
+                        list.add(createChild((Map<?, ?>) obj));
+                    } else {
+                        list.add(obj);
+                    }
+                }
+                this.data.put(key, list);
+            } else {
+                this.data.put(key, entry.getValue());
+            }
+        }
+    }
+
+    public abstract @NotNull R self();
+
+    protected abstract @NotNull R createChild(@NotNull Map<?, ?> data);
+
+    protected @NotNull R createChild() {
+        return createChild(new LinkedHashMap<>());
+    }
+
+    public @NotNull Map<String, Object> data() {
+        return this.data;
+    }
+
+    public @Nullable R parent() {
+        return this.parent;
+    }
+
+    /**
+     * Get the path separator for the section.
+     *
+     * @return The path separator
+     */
+    public char pathSeparator() {
+        return '.';
+    }
+
+    @Override
+    public @NotNull Map<String, Object> getValues(boolean deep) {
+        return Collections.unmodifiableMap(deep ? mappingValues(this, null, true) : data());
+    }
+
+    @Override
+    public void set(@NotNull String path, @Nullable Object value) {
+        if (value instanceof Map) value = createChild((Map<?, ?>) value);
+
+        R section = getSectionFor(path);
+        if (section == this) {
+            // Even this value is null, we still need to put it in the map
+            // to ensure that the path is marked as existing.
+            this.data.put(path, value);
+        } else {
+            section.set(childPath(path), value);
+        }
+    }
+
+    @Override
+    public void remove(@NotNull String path) {
+        R section = getSectionFor(path);
+        if (section != this) {
+            section.remove(childPath(path));
+        } else {
+            this.data.remove(path);
+        }
+    }
+
+    @Override
+    public boolean contains(@NotNull String path) {
+        return get(path) != null;
+    }
+
+    @Override
+    public @Nullable Object get(@NotNull String path) {
+        R section = getSectionFor(path);
+        return section == this ? data.get(path) : section.get(childPath(path));
+    }
+
+    @Override
+    public @Nullable List<?> getList(@NotNull String path) {
+        Object val = get(path);
+        return (val instanceof List<?>) ? (List<?>) val : null;
+    }
+
+    @Override
+    public @Nullable ConfigureSection getSection(@NotNull String path) {
+        Object val = get(path);
+        return (val instanceof ConfigureSection) ? (ConfigureSection) val : null;
+    }
+
+    @SuppressWarnings("unchecked")
+    private R getSectionFor(String path) {
+        int index = path.indexOf(pathSeparator());
+        if (index == -1) return self();
+
+        String root = path.substring(0, index);
+        return (R) data().computeIfAbsent(root, k -> createChild());
+    }
+
+    private String childPath(String path) {
+        int index = path.indexOf(pathSeparator());
+        return (index == -1) ? path : path.substring(index + 1);
+    }
+
+    /**
+     * Map the values of the children of the section to the output map.
+     *
+     * @param section The section to map the values from
+     * @param parent  The parent path
+     * @param deep    If the mapping should be deep
+     */
+    protected Map<String, Object> mappingValues(@NotNull MapSection<?> section, @Nullable String parent, boolean deep) {
+        Map<String, Object> output = new LinkedHashMap<>();
+        for (Map.Entry<String, Object> entry : section.data().entrySet()) {
+            String path = (parent == null ? "" : parent + pathSeparator()) + entry.getKey();
+            output.remove(path);
+            output.put(path, entry.getValue());
+            if (deep && entry.getValue() instanceof MapSection<?>) {
+                output.putAll(mappingValues((MapSection<?>) entry.getValue(), path, true));
+            }
+        }
+        return output;
+    }
+}

features/section/src/main/java/cc/carm/lib/configuration/source/section/MemorySection.java

@@ -3,9 +3,11 @@ package cc.carm.lib.configuration.source.section;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class MemorySection extends MapSection<MemorySection> {
 
-public class MemorySection implements ConfigureSection {
 
     public static @NotNull MemorySection root(@NotNull ConfigureSource<? extends MemorySection, ?, ?> source) {
         return new MemorySection(source, new LinkedHashMap<>(), null);
@@ -17,147 +19,30 @@ public class MemorySection implements ConfigureSection {
     }
 
     protected final @NotNull ConfigureSource<? extends MemorySection, ?, ?> source;
-    protected final @NotNull Map<String, Object> data;
-    protected final @Nullable MemorySection parent;
 
-    public MemorySection(@NotNull ConfigureSource<? extends MemorySection, ?, ?> source,
+    protected MemorySection(@NotNull ConfigureSource<? extends MemorySection, ?, ?> source,
-                         @NotNull Map<?, ?> data, @Nullable MemorySection parent) {
+                            @NotNull Map<?, ?> data, @Nullable MemorySection parent) {
+        super(data, parent);
         this.source = source;
-        this.parent = parent;
-        this.data = new LinkedHashMap<>();
-        for (Map.Entry<?, ?> entry : data.entrySet()) {
-            String key = (entry.getKey() == null) ? "null" : entry.getKey().toString();
-            if (entry.getValue() instanceof Map) {
-                this.data.put(key, createChild((Map<?, ?>) entry.getValue()));
-            } else if (entry.getValue() instanceof List) {
-                List<Object> list = new ArrayList<>();
-                for (Object obj : (List<?>) entry.getValue()) {
-                    if (obj instanceof Map) {
-                        list.add(createChild((Map<?, ?>) obj));
-                    } else {
-                        list.add(obj);
-                    }
-                }
-                this.data.put(key, list);
-            } else {
-                this.data.put(key, entry.getValue());
-            }
-        }
-    }
-
-    protected @NotNull MemorySection createChild(@NotNull Map<?, ?> data) {
-        return new MemorySection(source(), data, this);
-    }
-
-    protected @NotNull MemorySection createChild() {
-        return createChild(new LinkedHashMap<>());
     }
 
     public @NotNull ConfigureSource<? extends MemorySection, ?, ?> source() {
-        return this.source;
+        return source;
-    }
-
-    public @NotNull Map<String, Object> data() {
-        return this.data;
-    }
-
-    public @Nullable MemorySection parent() {
-        return this.parent;
     }
 
+    @Override
     public char pathSeparator() {
         return source.pathSeparator();
     }
 
     @Override
-    public @NotNull Map<String, Object> getValues(boolean deep) {
+    public @NotNull MemorySection self() {
-        return Collections.unmodifiableMap(deep ? mapChildrenValues(this, null, true) : data());
+        return this;
     }
 
     @Override
-    public void set(@NotNull String path, @Nullable Object value) {
+    protected @NotNull MemorySection createChild(@NotNull Map<?, ?> data) {
-        if (value instanceof Map) value = createChild((Map<?, ?>) value);
+        return new MemorySection(source, data, this);
-
-        MemorySection section = getSectionFor(path);
-        if (section == this) {
-            // Even this value is null, we still need to put it in the map
-            // to ensure that the path is marked as existing.
-            this.data.put(path, value);
-        } else {
-            section.set(childPath(path), value);
-        }
     }
 
-    @Override
-    public void remove(@NotNull String path) {
-        MemorySection section = getSectionFor(path);
-        if (section != this) {
-            section.remove(childPath(path));
-        } else {
-            this.data.remove(path);
-        }
-    }
-
-    @Override
-    public boolean contains(@NotNull String path) {
-        return get(path) != null;
-    }
-
-    @Override
-    public @Nullable Object get(@NotNull String path) {
-        MemorySection section = getSectionFor(path);
-        return section == this ? data.get(path) : section.get(childPath(path));
-    }
-
-    @Override
-    public @Nullable List<?> getList(@NotNull String path) {
-        Object val = get(path);
-        return (val instanceof List<?>) ? (List<?>) val : null;
-    }
-
-    @Override
-    public @Nullable ConfigureSection getSection(@NotNull String path) {
-        Object val = get(path);
-        return (val instanceof ConfigureSection) ? (ConfigureSection) val : null;
-    }
-
-    private MemorySection getSectionFor(String path) {
-        int index = path.indexOf(pathSeparator());
-        if (index == -1) return this;
-
-        String root = path.substring(0, index);
-        Object section = this.data.get(root);
-        if (section == null) {
-            section = createChild();
-            this.data.put(root, section);
-        }
-
-        return (MemorySection) section;
-    }
-
-    private String childPath(String path) {
-        int index = path.indexOf(pathSeparator());
-        return (index == -1) ? path : path.substring(index + 1);
-    }
-
-    /**
-     * Map the values of the children of the section to the output map.
-     *
-     * @param section The section to map the values from
-     * @param parent  The parent path
-     * @param deep    If the mapping should be deep
-     */
-    protected Map<String, Object> mapChildrenValues(@NotNull MemorySection section,
-                                                    @Nullable String parent, boolean deep) {
-        Map<String, Object> output = new LinkedHashMap<>();
-        for (Map.Entry<String, Object> entry : section.data().entrySet()) {
-            String path = (parent == null ? "" : parent + pathSeparator()) + entry.getKey();
-            output.remove(path);
-            output.put(path, entry.getValue());
-            if (deep && entry.getValue() instanceof MemorySection) {
-                output.putAll(mapChildrenValues((MemorySection) entry.getValue(), path, true));
-            }
-        }
-        return output;
-    }
 }

features/text/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyconfiguration-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

features/versioned/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyconfiguration-parent</artifactId>
-        <version>4.0.2</version>
+        <version>4.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

pom.xml

@@ -15,7 +15,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyconfiguration-parent</artifactId>
     <packaging>pom</packaging>
-    <version>4.0.2</version>
+    <version>4.0.3</version>
     <modules>
         <module>core</module>
         <module>features/section</module>

providers/gson/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>4.0.2</version>
+        <version>4.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

providers/gson/src/main/java/cc/carm/lib/configuration/source/json/JSONSource.java

@@ -2,7 +2,7 @@ package cc.carm.lib.configuration.source.json;
 
 import cc.carm.lib.configuration.source.ConfigurationHolder;
 import cc.carm.lib.configuration.source.file.FileConfigSource;
-import cc.carm.lib.configuration.source.section.MemorySection;
+import cc.carm.lib.configuration.source.section.MapSection;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSerializer;
@@ -14,17 +14,17 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
 
-public class JSONSource extends FileConfigSource<MemorySection, Map<String, Object>, JSONSource> {
+public class JSONSource extends FileConfigSource<MapSection, Map<String, Object>, JSONSource> {
 
     public static final @NotNull Gson DEFAULT_GSON = new GsonBuilder()
             .serializeNulls().disableHtmlEscaping().setPrettyPrinting()
             .registerTypeAdapter(
-                    MemorySection.class,
+                    MapSection.class,
-                    (JsonSerializer<MemorySection>) (src, t, c) -> c.serialize(src.data())
+                    (JsonSerializer<MapSection>) (src, t, c) -> c.serialize(src.data())
             ).create();
 
     protected final @NotNull Gson gson;
-    protected @Nullable MemorySection rootSection;
+    protected @Nullable MapSection rootSection;
 
     protected JSONSource(@NotNull ConfigurationHolder<? extends JSONSource> holder,
                          @NotNull File file, @Nullable String resourcePath) {
@@ -58,7 +58,7 @@ public class JSONSource extends FileConfigSource<MemorySection, Map<String, Obje
     }
 
     @Override
-    public @NotNull MemorySection section() {
+    public @NotNull MapSection section() {
         return Objects.requireNonNull(this.rootSection, "Root section is not initialized");
     }
 
@@ -70,7 +70,7 @@ public class JSONSource extends FileConfigSource<MemorySection, Map<String, Obje
     @Override
     protected void onReload() throws Exception {
         Map<?, ?> data = fileReader(reader -> gson.fromJson(reader, LinkedHashMap.class));
-        this.rootSection = MemorySection.root(this, data);
+        this.rootSection = MapSection.root(this, data);
         this.lastUpdateMillis = System.currentTimeMillis(); // 更新时间
     }
 

providers/yaml/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>4.0.2</version>
+        <version>4.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>

providers/yaml/src/main/java/cc/carm/lib/configuration/source/yaml/YAMLSource.java

@@ -5,7 +5,7 @@ import cc.carm.lib.configuration.commentable.CommentableOptions;
 import cc.carm.lib.configuration.source.ConfigurationHolder;
 import cc.carm.lib.configuration.source.file.FileConfigSource;
 import cc.carm.lib.configuration.source.section.ConfigureSection;
-import cc.carm.lib.configuration.source.section.MemorySection;
+import cc.carm.lib.configuration.source.section.MapSection;
 import cc.carm.lib.yamlcommentupdater.CommentedSection;
 import cc.carm.lib.yamlcommentupdater.CommentedYAMLWriter;
 import org.jetbrains.annotations.NotNull;
@@ -26,14 +26,14 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 public class YAMLSource
-        extends FileConfigSource<MemorySection, Map<String, Object>, YAMLSource>
+        extends FileConfigSource<MapSection, Map<String, Object>, YAMLSource>
         implements CommentedSection {
 
     protected final @NotNull YamlConstructor yamlConstructor;
     protected final @NotNull YamlRepresenter yamlRepresenter;
     protected final @NotNull Yaml yaml;
 
-    protected @Nullable MemorySection rootSection;
+    protected @Nullable MapSection rootSection;
 
     protected YAMLSource(@NotNull ConfigurationHolder<? extends YAMLSource> holder,
                          @NotNull File file, @Nullable String resourcePath) {
@@ -65,7 +65,7 @@ public class YAMLSource
     }
 
     @Override
-    public @NotNull MemorySection section() {
+    public @NotNull MapSection section() {
         return Objects.requireNonNull(this.rootSection, "Root section is not initialized.");
     }
 
@@ -130,18 +130,18 @@ public class YAMLSource
         return this.saveToString(section());
     }
 
-    public @NotNull MemorySection loadFromString(@NotNull String data) throws Exception {
+    public @NotNull MapSection loadFromString(@NotNull String data) throws Exception {
         MappingNode mappingNode;
         try (Reader reader = new UnicodeReader(new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8)))) {
             Node rawNode = this.yaml.compose(reader);
             mappingNode = (MappingNode) rawNode;
         }
-        if (mappingNode == null) return MemorySection.root(this);
+        if (mappingNode == null) return MapSection.root(this);
 
 
         Map<String, Object> map = new LinkedHashMap<>();
         this.constructMap(mappingNode, map);
-        return MemorySection.root(this, map);
+        return MapSection.root(this, map);
     }
 
     private void constructMap(@NotNull MappingNode mappingNode, @NotNull Map<String, Object> section) {
@@ -170,7 +170,7 @@ public class YAMLSource
     public String serializeValue(@NotNull String key, @NotNull Object value) {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put(key, value);
-        return saveToString(MemorySection.root(this, map));
+        return saveToString(MapSection.root(this, map));
     }
 
     @Override