fix(type): 修复部分原生类型无法转换的问题。#54

Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

core/pom.xml

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

core/src/main/java/cc/carm/lib/configuration/core/builder/list/ConfigListBuilder.java

@@ -1,9 +1,10 @@
 package cc.carm.lib.configuration.core.builder.list;
 
-import cc.carm.lib.configuration.core.annotation.InlineComment;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Map;
+
 
 public class ConfigListBuilder<V> {
 
@@ -13,7 +14,7 @@ public class ConfigListBuilder<V> {
         this.valueClass = valueClass;
     }
 
-    public @NotNull <S> SourceListBuilder<S, V> from(@NotNull Class<S> sourceClass,
+    public @NotNull <S> SourceListBuilder<S, V> from(@NotNull Class<? super S> sourceClass,
                                                      @NotNull ConfigDataFunction<Object, S> sourceParser,
                                                      @NotNull ConfigDataFunction<S, V> valueParser,
                                                      @NotNull ConfigDataFunction<V, S> valueSerializer,
@@ -45,4 +46,13 @@ public class ConfigListBuilder<V> {
         );
     }
 
+    public @NotNull SourceListBuilder<Map<String, Object>, V> fromMap() {
+        return from(
+                Map.class, obj -> (Map<String, Object>) obj,
+                ConfigDataFunction.required(),
+                ConfigDataFunction.required(),
+                ConfigDataFunction.toObject()
+        );
+    }
+
 }

core/src/main/java/cc/carm/lib/configuration/core/builder/list/SourceListBuilder.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 public class SourceListBuilder<S, V> extends CommonConfigBuilder<List<V>, SourceListBuilder<S, V>> {
 
-    protected final @NotNull Class<S> sourceClass;
+    protected final @NotNull Class<? super S> sourceClass;
     protected @NotNull ConfigDataFunction<Object, S> sourceParser;
 
     protected final @NotNull Class<V> valueClass;
@@ -21,7 +21,7 @@ public class SourceListBuilder<S, V> extends CommonConfigBuilder<List<V>, Source
     protected @NotNull ConfigDataFunction<V, S> valueSerializer;
     protected @NotNull ConfigDataFunction<S, Object> sourceSerializer;
 
-    public SourceListBuilder(@NotNull Class<S> sourceClass, @NotNull ConfigDataFunction<Object, S> sourceParser,
+    public SourceListBuilder(@NotNull Class<? super S> sourceClass, @NotNull ConfigDataFunction<Object, S> sourceParser,
                              @NotNull Class<V> valueClass, @NotNull ConfigDataFunction<S, V> valueParser,
                              @NotNull ConfigDataFunction<V, S> valueSerializer,
                              @NotNull ConfigDataFunction<S, Object> sourceSerializer) {

core/src/main/java/cc/carm/lib/configuration/core/builder/map/ConfigMapBuilder.java

@@ -48,6 +48,14 @@ public class ConfigMapBuilder<M extends Map<K, V>, K, V> {
         return fromString(ConfigDataFunction.castFromString(this.valueClass));
     }
 
+    public SectionMapBuilder<M, K, V> fromSection() {
+        return new SectionMapBuilder<>(
+                supplier,
+                keyClass, ConfigDataFunction.castFromString(keyClass),
+                valueClass, ConfigDataFunction.required(),
+                ConfigDataFunction.castToString(), ConfigDataFunction.required());
+    }
+
     public SourceMapBuilder<M, Object, K, V> fromObject(@NotNull ConfigDataFunction<Object, V> valueParser) {
         return from(Object.class, valueParser, ConfigDataFunction.toObject());
     }

core/src/main/java/cc/carm/lib/configuration/core/builder/map/SectionMapBuilder.java

@@ -0,0 +1,99 @@
+package cc.carm.lib.configuration.core.builder.map;
+
+import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
+import cc.carm.lib.configuration.core.function.ConfigDataFunction;
+import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
+import cc.carm.lib.configuration.core.value.ValueManifest;
+import cc.carm.lib.configuration.core.value.type.ConfiguredSectionMap;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+public class SectionMapBuilder<M extends Map<K, V>, K, V> extends CommonConfigBuilder<M, SectionMapBuilder<M, K, V>> {
+
+    protected final @NotNull Supplier<@NotNull M> supplier;
+
+    protected final @NotNull Class<K> keyClass;
+    protected @NotNull ConfigDataFunction<String, K> keyParser;
+
+    protected final @NotNull Class<V> valueClass;
+    protected @NotNull ConfigDataFunction<ConfigurationWrapper<?>, V> valueParser;
+
+    protected @NotNull ConfigDataFunction<K, String> keySerializer;
+    protected @NotNull ConfigDataFunction<V, ? extends Map<String, Object>> valueSerializer;
+
+    public SectionMapBuilder(@NotNull Supplier<@NotNull M> supplier,
+                             @NotNull Class<K> keyClass, @NotNull ConfigDataFunction<String, K> keyParser,
+                             @NotNull Class<V> valueClass, @NotNull ConfigDataFunction<ConfigurationWrapper<?>, V> valueParser,
+                             @NotNull ConfigDataFunction<K, String> keySerializer,
+                             @NotNull ConfigDataFunction<V, ? extends Map<String, Object>> valueSerializer) {
+        this.supplier = supplier;
+        this.keyClass = keyClass;
+        this.keyParser = keyParser;
+        this.valueClass = valueClass;
+        this.valueParser = valueParser;
+        this.keySerializer = keySerializer;
+        this.valueSerializer = valueSerializer;
+    }
+
+    public <MAP extends Map<K, V>> SectionMapBuilder<MAP, K, V> supplier(@NotNull Supplier<MAP> supplier) {
+        return new SectionMapBuilder<>(supplier,
+                keyClass, keyParser, valueClass, valueParser, keySerializer, valueSerializer
+        );
+    }
+
+    public @NotNull SectionMapBuilder<M, K, V> defaults(@NotNull Consumer<M> factory) {
+        M map = supplier.get();
+        factory.accept(map);
+        return defaults(map);
+    }
+
+    public @NotNull SectionMapBuilder<M, K, V> parseKey(@NotNull ConfigDataFunction<String, K> parser) {
+        this.keyParser = parser;
+        return this;
+    }
+
+    public @NotNull SectionMapBuilder<M, K, V> parseValue(@NotNull ConfigDataFunction<ConfigurationWrapper<?>, V> parser) {
+        this.valueParser = parser;
+        return this;
+    }
+
+    public @NotNull SectionMapBuilder<M, K, V> serializeKey(@NotNull ConfigDataFunction<K, String> serializer) {
+        this.keySerializer = serializer;
+        return this;
+    }
+
+    public @NotNull SectionMapBuilder<M, K, V> serializeValue(@NotNull ConfigDataFunction<V, ? extends Map<String, Object>> serializer) {
+        this.valueSerializer = serializer;
+        return this;
+    }
+
+    public @NotNull SectionMapBuilder<M, K, V> serializeValue(@NotNull BiConsumer<V, Map<String, Object>> serializer) {
+        return serializeValue(v -> {
+            Map<String, Object> map = new LinkedHashMap<>();
+            serializer.accept(v, map);
+            return map;
+        });
+    }
+
+
+    @Override
+    protected @NotNull SectionMapBuilder<M, K, V> getThis() {
+        return this;
+    }
+
+    @Override
+    public @NotNull ConfiguredSectionMap<K, V> build() {
+        return new ConfiguredSectionMap<>(
+                new ValueManifest<>(provider, path, headerComments, inlineComment, defaultValue),
+                this.supplier, this.keyClass, this.keyParser,
+                this.valueClass, this.valueParser,
+                this.keySerializer, this.valueSerializer
+        );
+    }
+
+}

core/src/main/java/cc/carm/lib/configuration/core/builder/value/SectionValueBuilder.java

@@ -32,6 +32,10 @@ public class SectionValueBuilder<V>
         return this;
     }
 
+    public @NotNull SectionValueBuilder<V> parseValue(ConfigDataFunction<ConfigurationWrapper<?>, V> valueParser) {
+        return parseValue((section, path) -> valueParser.parse(section));
+    }
+
     public @NotNull SectionValueBuilder<V> parseValue(ConfigValueParser<ConfigurationWrapper<?>, V> valueParser) {
         this.parser = valueParser;
         return this;

core/src/main/java/cc/carm/lib/configuration/core/builder/value/SourceValueBuilder.java

@@ -39,6 +39,10 @@ public class SourceValueBuilder<S, V> extends CommonConfigBuilder<V, SourceValue
         return this;
     }
 
+    public @NotNull SourceValueBuilder<S, V> parseValue(ConfigDataFunction<S, V> valueParser) {
+        return parseValue((section, path) -> valueParser.parse(section));
+    }
+
     public @NotNull SourceValueBuilder<S, V> parseValue(@NotNull ConfigValueParser<S, V> valueParser) {
         this.valueParser = valueParser;
         return this;

core/src/main/java/cc/carm/lib/configuration/core/function/ConfigValueParser.java

@@ -50,22 +50,21 @@ public interface ConfigValueParser<T, R> {
     @Contract(pure = true)
     static <V> @NotNull ConfigValueParser<Object, V> castObject(Class<V> valueClass) {
         return (input, defaultValue) -> {
-
             if (Number.class.isAssignableFrom(valueClass)) {
-                if (Long.class.isAssignableFrom(valueClass)) {
+                if (Long.class.isAssignableFrom(valueClass) || long.class.isAssignableFrom(valueClass)) {
                     input = longValue().parse(input, (Long) defaultValue);
-                } else if (Integer.class.isAssignableFrom(valueClass)) {
+                } else if (Integer.class.isAssignableFrom(valueClass) || int.class.isAssignableFrom(valueClass)) {
                     input = intValue().parse(input, (Integer) defaultValue);
-                } else if (Float.class.isAssignableFrom(valueClass)) {
+                } else if (Float.class.isAssignableFrom(valueClass) || float.class.isAssignableFrom(valueClass)) {
                     input = floatValue().parse(input, (Float) defaultValue);
-                } else if (Double.class.isAssignableFrom(valueClass)) {
+                } else if (Double.class.isAssignableFrom(valueClass) || double.class.isAssignableFrom(valueClass)) {
                     input = doubleValue().parse(input, (Double) defaultValue);
-                } else if (Byte.class.isAssignableFrom(valueClass)) {
+                } else if (Byte.class.isAssignableFrom(valueClass) || byte.class.isAssignableFrom(valueClass)) {
                     input = byteValue().parse(input, (Byte) defaultValue);
-                } else if (Short.class.isAssignableFrom(valueClass)) {
+                } else if (Short.class.isAssignableFrom(valueClass) || short.class.isAssignableFrom(valueClass)) {
                     input = shortValue().parse(input, (Short) defaultValue);
                 }
-            } else if (Boolean.class.isAssignableFrom(valueClass)) {
+            } else if (Boolean.class.isAssignableFrom(valueClass) || boolean.class.isAssignableFrom(valueClass)) {
                 input = booleanValue().parse(input, (Boolean) defaultValue);
             } else if (Enum.class.isAssignableFrom(valueClass) && input instanceof String) {
                 String enumName = (String) input;

core/src/main/java/cc/carm/lib/configuration/core/source/impl/FileConfigProvider.java

@@ -5,9 +5,13 @@ import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLConnection;
+import java.nio.file.Files;
 import java.util.Objects;
 
 public abstract class FileConfigProvider<W extends ConfigurationWrapper<?>> extends ConfigurationProvider<W> {
@@ -37,39 +41,35 @@ public abstract class FileConfigProvider<W extends ConfigurationWrapper<?>> exte
         if (sourcePath != null) {
             try {
                 saveResource(sourcePath, true);
-            } catch (Exception ignored) {
+            } catch (IllegalArgumentException ignored) {
             }
         }
     }
 
     public void saveResource(@NotNull String resourcePath, boolean replace)
-            throws NullPointerException, IOException, IllegalArgumentException {
+            throws IOException, IllegalArgumentException {
         Objects.requireNonNull(resourcePath, "ResourcePath cannot be null");
-        if (resourcePath.equals("")) throw new IllegalArgumentException("ResourcePath cannot be empty");
+        if (resourcePath.isEmpty()) throw new IllegalArgumentException("ResourcePath cannot be empty");
 
         resourcePath = resourcePath.replace('\\', '/');
-        InputStream in = getResource(resourcePath);
-        if (in == null) throw new IllegalArgumentException("The resource '" + resourcePath + "' not exists");
 
+        URL url = this.getClass().getClassLoader().getResource(resourcePath);
+        if (url == null) throw new IllegalArgumentException("The resource '" + resourcePath + "' not exists");
 
-        int lastIndex = resourcePath.lastIndexOf('/');
-        File outDir = new File(file, resourcePath.substring(0, Math.max(lastIndex, 0)));
-
+        File outDir = file.getParentFile();
+        
         if (!outDir.exists() && !outDir.mkdirs()) throw new IOException("Failed to create directory " + outDir);
         if (!file.exists() || replace) {
-            try {
-
-                OutputStream out = new FileOutputStream(file);
-                byte[] buf = new byte[1024];
-                int len;
-                while ((len = in.read(buf)) > 0) {
-                    out.write(buf, 0, len);
+            try (OutputStream out = Files.newOutputStream(file.toPath())) {
+                URLConnection connection = url.openConnection();
+                connection.setUseCaches(false);
+                try (InputStream in = connection.getInputStream()) {
+                    byte[] buf = new byte[1024];
+                    int len;
+                    while ((len = in.read(buf)) > 0) {
+                        out.write(buf, 0, len);
+                    }
                 }
-                out.close();
-                in.close();
-
-            } catch (IOException ex) {
-                ex.printStackTrace();
             }
         }
     }

core/src/main/java/cc/carm/lib/configuration/core/value/impl/ConfigValueMap.java

@@ -0,0 +1,214 @@
+package cc.carm.lib.configuration.core.value.impl;
+
+import cc.carm.lib.configuration.core.builder.map.ConfigMapCreator;
+import cc.carm.lib.configuration.core.function.ConfigDataFunction;
+import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
+import cc.carm.lib.configuration.core.value.ValueManifest;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.*;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public abstract class ConfigValueMap<K, V, S> extends CachedConfigValue<Map<K, V>> implements Map<K, V> {
+
+    public static <K, V> @NotNull ConfigMapCreator<K, V> builderOf(@NotNull Class<K> keyClass,
+                                                                   @NotNull Class<V> valueClass) {
+        return builder().asMap(keyClass, valueClass);
+    }
+
+    protected final @NotNull Supplier<? extends Map<K, V>> supplier;
+
+    protected final @NotNull Class<? super S> sourceClass;
+    protected final @NotNull Class<K> keyClass;
+    protected final @NotNull Class<V> valueClass;
+
+    protected final @NotNull ConfigDataFunction<String, K> keyParser;
+    protected final @NotNull ConfigDataFunction<S, V> valueParser;
+
+    protected final @NotNull ConfigDataFunction<K, String> keySerializer;
+    protected final @NotNull ConfigDataFunction<V, Object> valueSerializer;
+
+
+    protected ConfigValueMap(@NotNull ValueManifest<Map<K, V>> manifest, @NotNull Class<? super S> sourceClass,
+                             @NotNull Supplier<? extends Map<K, V>> mapObjSupplier,
+                             @NotNull Class<K> keyClass, @NotNull ConfigDataFunction<String, K> keyParser,
+                             @NotNull Class<V> valueClass, @NotNull ConfigDataFunction<S, V> valueParser,
+                             @NotNull ConfigDataFunction<K, String> keySerializer,
+                             @NotNull ConfigDataFunction<V, Object> valueSerializer) {
+        super(manifest);
+        this.supplier = mapObjSupplier;
+        this.sourceClass = sourceClass;
+        this.keyClass = keyClass;
+        this.valueClass = valueClass;
+        this.keyParser = keyParser;
+        this.valueParser = valueParser;
+        this.keySerializer = keySerializer;
+        this.valueSerializer = valueSerializer;
+    }
+
+    public @NotNull Class<? super S> getSourceClass() {
+        return sourceClass;
+    }
+
+    public @NotNull Class<K> getKeyClass() {
+        return keyClass;
+    }
+
+    public @NotNull Class<V> getValueClass() {
+        return valueClass;
+    }
+
+    public @NotNull ConfigDataFunction<String, K> getKeyParser() {
+        return keyParser;
+    }
+
+    public @NotNull ConfigDataFunction<S, V> getValueParser() {
+        return valueParser;
+    }
+
+    public @NotNull ConfigDataFunction<K, String> getKeySerializer() {
+        return keySerializer;
+    }
+
+    public @NotNull ConfigDataFunction<V, Object> getValueSerializer() {
+        return valueSerializer;
+    }
+
+    public abstract S getSource(ConfigurationWrapper<?> section, String dataKey);
+
+    @Override
+    public @NotNull Map<K, V> get() {
+        if (!isExpired()) return getCachedOrDefault(supplier.get());
+
+        // 已过时的数据，需要重新解析一次。
+        Map<K, V> map = supplier.get();
+
+        ConfigurationWrapper<?> section = getConfiguration().getConfigurationSection(getConfigPath());
+        if (section == null) return getDefaultFirst(map);
+
+        Set<String> keys = section.getKeys(false);
+        if (keys.isEmpty()) return getDefaultFirst(map);
+
+        for (String dataKey : keys) {
+            S dataVal = getSource(section, dataKey);
+            if (dataVal == null) continue;
+            try {
+                K key = keyParser.parse(dataKey);
+                V value = valueParser.parse(dataVal);
+                map.put(key, value);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        return updateCache(map);
+    }
+
+    @Override
+    public V get(Object key) {
+        return get().get(key);
+    }
+
+    public V getNotNull(Object key) {
+        return Objects.requireNonNull(get(key));
+    }
+
+    @Override
+    public void set(@Nullable Map<K, V> value) {
+        updateCache(value);
+        if (value == null) setValue(null);
+        else {
+            Map<String, Object> data = new LinkedHashMap<>();
+            for (Map.Entry<K, V> entry : value.entrySet()) {
+                try {
+                    data.put(
+                            keySerializer.parse(entry.getKey()),
+                            valueSerializer.parse(entry.getValue())
+                    );
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            setValue(data);
+        }
+    }
+
+    public <T> @NotNull T modifyValue(Function<Map<K, V>, T> function) {
+        Map<K, V> m = get();
+        T result = function.apply(m);
+        set(m);
+        return result;
+    }
+
+    public @NotNull Map<K, V> modifyMap(Consumer<Map<K, V>> consumer) {
+        Map<K, V> m = get();
+        consumer.accept(m);
+        set(m);
+        return m;
+    }
+
+    @Override
+    public int size() {
+        return get().size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return get().isEmpty();
+    }
+
+    @Override
+    public boolean containsKey(Object key) {
+        return get().containsKey(key);
+    }
+
+    @Override
+    public boolean containsValue(Object value) {
+        return get().containsValue(value);
+    }
+
+    @Nullable
+    @Override
+    public V put(K key, V value) {
+        return modifyValue(m -> m.put(key, value));
+    }
+
+    @Override
+    public V remove(Object key) {
+        return modifyValue(m -> m.remove(key));
+    }
+
+    @Override
+    public void putAll(@NotNull Map<? extends K, ? extends V> m) {
+        modifyMap(map -> map.putAll(m));
+    }
+
+    @Override
+    public void clear() {
+        modifyMap(Map::clear);
+    }
+
+    @NotNull
+    @Override
+    public Set<K> keySet() {
+        return get().keySet();
+    }
+
+    @NotNull
+    @Override
+    public Collection<V> values() {
+        return get().values();
+    }
+
+    @NotNull
+    @Override
+    @Unmodifiable
+    public Set<Entry<K, V>> entrySet() {
+        return get().entrySet();
+    }
+
+}

core/src/main/java/cc/carm/lib/configuration/core/value/type/ConfiguredList.java

@@ -65,6 +65,10 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
         return get().get(index);
     }
 
+    public @NotNull List<V> copy() {
+        return new ArrayList<>(get());
+    }
+
     public <T> @NotNull T handle(Function<List<V>, T> function) {
         List<V> list = get();
         T result = function.apply(list);

core/src/main/java/cc/carm/lib/configuration/core/value/type/ConfiguredMap.java

@@ -1,40 +1,15 @@
 package cc.carm.lib.configuration.core.value.type;
 
-import cc.carm.lib.configuration.core.builder.map.ConfigMapCreator;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
 import cc.carm.lib.configuration.core.value.ValueManifest;
-import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
+import cc.carm.lib.configuration.core.value.impl.ConfigValueMap;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Unmodifiable;
 
-import java.util.Collection;
-import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
-public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> implements Map<K, V> {
-
-    public static <K, V> @NotNull ConfigMapCreator<K, V> builderOf(@NotNull Class<K> keyClass,
-                                                                   @NotNull Class<V> valueClass) {
-        return builder().asMap(keyClass, valueClass);
-    }
-
-    protected final @NotNull Supplier<? extends Map<K, V>> supplier;
-
-    protected final @NotNull Class<K> keyClass;
-    protected final @NotNull Class<V> valueClass;
-
-    protected final @NotNull ConfigDataFunction<String, K> keyParser;
-    protected final @NotNull ConfigDataFunction<Object, V> valueParser;
-
-    protected final @NotNull ConfigDataFunction<K, String> keySerializer;
-    protected final @NotNull ConfigDataFunction<V, Object> valueSerializer;
-
+public class ConfiguredMap<K, V> extends ConfigValueMap<K, V, Object> {
 
     public ConfiguredMap(@NotNull ValueManifest<Map<K, V>> manifest,
                          @NotNull Supplier<? extends Map<K, V>> mapObjSupplier,
@@ -42,165 +17,12 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> implements
                          @NotNull Class<V> valueClass, @NotNull ConfigDataFunction<Object, V> valueParser,
                          @NotNull ConfigDataFunction<K, String> keySerializer,
                          @NotNull ConfigDataFunction<V, Object> valueSerializer) {
-        super(manifest);
-        this.supplier = mapObjSupplier;
-        this.keyClass = keyClass;
-        this.valueClass = valueClass;
-        this.keyParser = keyParser;
-        this.valueParser = valueParser;
-        this.keySerializer = keySerializer;
-        this.valueSerializer = valueSerializer;
-    }
-
-    public @NotNull Class<K> getKeyClass() {
-        return keyClass;
-    }
-
-    public @NotNull Class<V> getValueClass() {
-        return valueClass;
-    }
-
-    public @NotNull ConfigDataFunction<String, K> getKeyParser() {
-        return keyParser;
-    }
-
-    public @NotNull ConfigDataFunction<Object, V> getValueParser() {
-        return valueParser;
-    }
-
-    public @NotNull ConfigDataFunction<K, String> getKeySerializer() {
-        return keySerializer;
-    }
-
-    public @NotNull ConfigDataFunction<V, Object> getValueSerializer() {
-        return valueSerializer;
+        super(manifest, Object.class, mapObjSupplier, keyClass, keyParser, valueClass, valueParser, keySerializer, valueSerializer);
     }
 
     @Override
-    public @NotNull Map<K, V> get() {
-        if (!isExpired()) return getCachedOrDefault(supplier.get());
-
-        // 已过时的数据，需要重新解析一次。
-        Map<K, V> map = supplier.get();
-
-        ConfigurationWrapper<?> section = getConfiguration().getConfigurationSection(getConfigPath());
-        if (section == null) return getDefaultFirst(map);
-
-        Set<String> keys = section.getKeys(false);
-        if (keys.isEmpty()) return getDefaultFirst(map);
-
-        for (String dataKey : keys) {
-            Object dataVal = section.get(dataKey);
-            if (dataVal == null) continue;
-            try {
-                K key = keyParser.parse(dataKey);
-                V value = valueParser.parse(dataVal);
-                map.put(key, value);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        return updateCache(map);
-    }
-
-    @Override
-    public V get(Object key) {
-        return get().get(key);
-    }
-
-    @Override
-    public void set(@Nullable Map<K, V> value) {
-        updateCache(value);
-        if (value == null) setValue(null);
-        else {
-            Map<String, Object> data = new LinkedHashMap<>();
-            for (Map.Entry<K, V> entry : value.entrySet()) {
-                try {
-                    data.put(
-                            keySerializer.parse(entry.getKey()),
-                            valueSerializer.parse(entry.getValue())
-                    );
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-            setValue(data);
-        }
-    }
-
-    public <T> @NotNull T modifyValue(Function<Map<K, V>, T> function) {
-        Map<K, V> m = get();
-        T result = function.apply(m);
-        set(m);
-        return result;
-    }
-
-    public @NotNull Map<K, V> modifyMap(Consumer<Map<K, V>> consumer) {
-        Map<K, V> m = get();
-        consumer.accept(m);
-        set(m);
-        return m;
-    }
-
-    @Override
-    public int size() {
-        return get().size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return get().isEmpty();
-    }
-
-    @Override
-    public boolean containsKey(Object key) {
-        return get().containsKey(key);
-    }
-
-    @Override
-    public boolean containsValue(Object value) {
-        return get().containsValue(value);
-    }
-
-    @Nullable
-    @Override
-    public V put(K key, V value) {
-        return modifyValue(m -> m.put(key, value));
-    }
-
-    @Override
-    public V remove(Object key) {
-        return modifyValue(m -> m.remove(key));
-    }
-
-    @Override
-    public void putAll(@NotNull Map<? extends K, ? extends V> m) {
-        modifyMap(map -> map.putAll(m));
-    }
-
-    @Override
-    public void clear() {
-        modifyMap(Map::clear);
-    }
-
-    @NotNull
-    @Override
-    public Set<K> keySet() {
-        return get().keySet();
-    }
-
-    @NotNull
-    @Override
-    public Collection<V> values() {
-        return get().values();
-    }
-
-    @NotNull
-    @Override
-    @Unmodifiable
-    public Set<Entry<K, V>> entrySet() {
-        return get().entrySet();
+    public Object getSource(ConfigurationWrapper<?> section, String dataKey) {
+        return section.get(dataKey);
     }
 
 }

core/src/main/java/cc/carm/lib/configuration/core/value/type/ConfiguredSectionMap.java

@@ -0,0 +1,32 @@
+package cc.carm.lib.configuration.core.value.type;
+
+import cc.carm.lib.configuration.core.function.ConfigDataFunction;
+import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
+import cc.carm.lib.configuration.core.value.ValueManifest;
+import cc.carm.lib.configuration.core.value.impl.ConfigValueMap;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.function.Supplier;
+
+public class ConfiguredSectionMap<K, V> extends ConfigValueMap<K, V, ConfigurationWrapper<?>> {
+
+    public ConfiguredSectionMap(@NotNull ValueManifest<Map<K, V>> manifest,
+                                @NotNull Supplier<? extends Map<K, V>> mapObjSupplier,
+                                @NotNull Class<K> keyClass, @NotNull ConfigDataFunction<String, K> keyParser,
+                                @NotNull Class<V> valueClass, @NotNull ConfigDataFunction<ConfigurationWrapper<?>, V> valueParser,
+                                @NotNull ConfigDataFunction<K, String> keySerializer,
+                                @NotNull ConfigDataFunction<V, ? extends Map<String, Object>> valueSerializer) {
+        super(
+                manifest, ConfigurationWrapper.class, mapObjSupplier,
+                keyClass, keyParser, valueClass, valueParser,
+                keySerializer, valueSerializer.andThen(s -> (Object) s)
+        );
+    }
+
+    @Override
+    public ConfigurationWrapper<?> getSource(ConfigurationWrapper<?> section, String dataKey) {
+        return section.getConfigurationSection(dataKey);
+    }
+
+}

demo/pom.xml

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

impl/hocon/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cc.carm.lib</groupId>
         <artifactId>easyconfiguration-parent</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.typesafe</groupId>
             <artifactId>config</artifactId>
-            <version>1.4.2</version>
+            <version>1.4.3</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

impl/json/pom.xml

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

impl/sql/pom.xml

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

impl/sql/table_schem.sql

@@ -1,14 +1,14 @@
 CREATE TABLE IF NOT EXISTS conf
 (
-    `namespace`       VARCHAR(255) NOT NULL, # 命名空间
-    `section`         VARCHAR(255) NOT NULL, # 配置路径 (ConfigPath)
-    `type`            VARCHAR(255) NOT NULL, # 数据类型 (Integer/Byte/List/Map/...)
-    `value`           MEDIUMTEXT,            # 配置项的值 (可能为JSON格式)
-    `inline_comments` TINYTEXT,              # 行内注释
-    `header_comments` TEXT,                  # 顶部注释
-    `created_at`      DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    `updated_at`      DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    PRIMARY KEY (`namespace`, `section`)
+    `namespace`       VARCHAR(255)     NOT NULL,                           # 命名空间
+    `path`            VARCHAR(255)     NOT NULL,                           # 配置路径 (ConfigPath)
+    `type`            TINYINT UNSIGNED NOT NULL DEFAULT 0,                 # 数据类型 (Integer/Byte/List/Map/...)
+    `value`           MEDIUMTEXT,                                          # 配置项的值 (可能为JSON格式)
+    `inline_comments` TEXT,                                                # 行内注释
+    `header_comments` MEDIUMTEXT,                                          # 顶部注释
+    `create_time`     DATETIME         NOT NULL DEFAULT CURRENT_TIMESTAMP, # 创建时间
+    `update_time`     DATETIME         NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    PRIMARY KEY (`namespace`, `path`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4;
 

impl/yaml/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.bspfsystems</groupId>
             <artifactId>yamlconfiguration</artifactId>
-            <version>1.3.3</version>
+            <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
 

impl/yaml/src/test/java/config/DemoConfigTest.java

@@ -10,6 +10,8 @@ import config.source.ModelConfiguration;
 import org.bspfsystems.yamlconfiguration.serialization.ConfigurationSerialization;
 import org.junit.Test;
 
+import java.io.IOException;
+
 public class DemoConfigTest {
 
     static {
@@ -17,7 +19,7 @@ public class DemoConfigTest {
         ConfigurationSerialization.registerClass(AnyModel.class);
     }
 
-    protected final YAMLConfigProvider provider = EasyConfiguration.from("target/config.yml", "config.yml");
+    protected final YAMLConfigProvider provider = EasyConfiguration.from("target/config.yml", "test/test2/config.yml");
 
     @Test
     public void onTest() {
@@ -42,6 +44,8 @@ public class DemoConfigTest {
         if (anyModel != null) System.out.println(anyModel.getName());
 
         ModelConfiguration.MODELS.forEach(System.out::println);
+        ModelConfiguration.MODEL_MAP.forEach((v, anyModel1) -> System.out.println(v + " -> " + anyModel1.toString()));
+
 
         System.out.println("----------------------------------------------------");
     }

impl/yaml/src/test/java/config/source/ModelConfiguration.java

@@ -5,13 +5,13 @@ import cc.carm.lib.configuration.core.annotation.ConfigPath;
 import cc.carm.lib.configuration.core.annotation.HeaderComment;
 import cc.carm.lib.configuration.core.value.ConfigValue;
 import cc.carm.lib.configuration.core.value.type.ConfiguredList;
+import cc.carm.lib.configuration.core.value.type.ConfiguredMap;
+import cc.carm.lib.configuration.core.value.type.ConfiguredSectionMap;
 import cc.carm.lib.configuration.demo.tests.model.AbstractModel;
 import cc.carm.lib.configuration.yaml.value.ConfiguredSerializable;
 import config.model.AnyModel;
 import config.model.SomeModel;
 
-import java.util.Map;
-
 @HeaderComment("以下内容用于测试序列化")
 @ConfigPath("model-test")
 public class ModelConfiguration extends ConfigurationRoot {
@@ -25,10 +25,19 @@ public class ModelConfiguration extends ConfigurationRoot {
     );
 
     public static final ConfiguredList<AnyModel> MODELS = ConfiguredList.builderOf(AnyModel.class)
-            .fromObject()
-            .parseValue((section) -> AnyModel.deserialize((Map<String, ?>) section))
-            .serializeValue(AnyModel::serialize)
+            .fromMap()
+            .parseValue(AnyModel::deserialize).serializeValue(AnyModel::serialize)
             .defaults(AnyModel.random(), AnyModel.random(), AnyModel.random())
             .build();
 
+    public static final ConfiguredSectionMap<String, AnyModel> MODEL_MAP = ConfiguredMap.builderOf(String.class, AnyModel.class)
+            .asLinkedMap().fromSection()
+            .parseValue(v -> new AnyModel(v.getString("name", "EMPTY"), v.getBoolean("state", false)))
+            .serializeValue(AnyModel::serialize)
+            .defaults(m -> {
+                m.put("a", AnyModel.random());
+                m.put("b", AnyModel.random());
+            })
+            .build();
+
 }

impl/yaml/src/test/resources/config.yml

@@ -1 +0,0 @@
-version: 1.0

impl/yaml/src/test/resources/test/test2/config.yml

@@ -0,0 +1,2 @@
+version: 1.0
+test-save: false

pom.xml

@@ -15,7 +15,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyconfiguration-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.7.0</version>
+    <version>3.8.1</version>
     <modules>
         <module>core</module>
         <module>demo</module>
@@ -110,7 +110,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.0.1</version>
+            <version>24.1.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -123,7 +123,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.2.3</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
@@ -167,7 +167,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.3</version>
                     <configuration>
                         <classifier>javadoc</classifier>
                         <detectJavaApiLink>false</detectJavaApiLink>
@@ -194,7 +194,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.12.0</version>
                     <configuration>
                         <source>${project.jdk.version}</source>
                         <target>${project.jdk.version}</target>
@@ -226,7 +226,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.5.1</version>
                     <executions>
                         <execution>
                             <phase>package</phase>