From 80f03ec501e59dcfca63e54f08abf05676f712bc Mon Sep 17 00:00:00 2001 From: carm Date: Thu, 20 Feb 2025 02:52:19 +0800 Subject: [PATCH] feat: Split MapSection and MemorySection --- .../configuration/source/yaml/YAMLSource.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/providers/yaml/src/main/java/cc/carm/lib/configuration/source/yaml/YAMLSource.java b/providers/yaml/src/main/java/cc/carm/lib/configuration/source/yaml/YAMLSource.java index 4ce82bf..6e10a6b 100644 --- a/providers/yaml/src/main/java/cc/carm/lib/configuration/source/yaml/YAMLSource.java +++ b/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.MapSection; +import cc.carm.lib.configuration.source.section.MemorySection; 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, YAMLSource> + extends FileConfigSource, YAMLSource> implements CommentedSection { protected final @NotNull YamlConstructor yamlConstructor; protected final @NotNull YamlRepresenter yamlRepresenter; protected final @NotNull Yaml yaml; - protected @Nullable MapSection rootSection; + protected @Nullable MemorySection rootSection; protected YAMLSource(@NotNull ConfigurationHolder holder, @NotNull File file, @Nullable String resourcePath) { @@ -65,7 +65,7 @@ public class YAMLSource } @Override - public @NotNull MapSection section() { + public @NotNull MemorySection section() { return Objects.requireNonNull(this.rootSection, "Root section is not initialized."); } @@ -130,18 +130,18 @@ public class YAMLSource return this.saveToString(section()); } - public @NotNull MapSection loadFromString(@NotNull String data) throws Exception { + public @NotNull MemorySection 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 MapSection.root(this); + if (mappingNode == null) return MemorySection.root(this); Map map = new LinkedHashMap<>(); this.constructMap(mappingNode, map); - return MapSection.root(this, map); + return MemorySection.root(this, map); } private void constructMap(@NotNull MappingNode mappingNode, @NotNull Map section) { @@ -170,7 +170,7 @@ public class YAMLSource public String serializeValue(@NotNull String key, @NotNull Object value) { Map map = new LinkedHashMap<>(); map.put(key, value); - return saveToString(MapSection.root(this, map)); + return saveToString(MemorySection.root(this, map)); } @Override