feat(value): 单独提出 ”ValueManifest“ 以解决每个实现类中初始参数复杂的问题，方便后续开发。

Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 2.22.2 to 3.0.0.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-2.22.2...surefire-3.0.0)

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

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.3.3</version>
+        <version>3.5.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

core/src/main/java/cc/carm/lib/configuration/core/builder/AbstractConfigBuilder.java

@@ -1,6 +1,7 @@
 package cc.carm.lib.configuration.core.builder;
 
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import cc.carm.lib.configuration.core.value.ValueManifest;
 import cc.carm.lib.configuration.core.value.ConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -66,4 +67,11 @@ public abstract class AbstractConfigBuilder<T, B extends AbstractConfigBuilder<T
         return defaults(defaultValueSupplier.get());
     }
 
+    protected @NotNull ValueManifest<T> buildManifest() {
+        return ValueManifest.of(
+                this.provider, this.path,
+                this.headerComments, this.inlineComment, this.defaultValue
+        );
+    }
+
 }

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

@@ -65,9 +65,7 @@ public class SourceListBuilder<S, V> extends CommonConfigBuilder<List<V>, Source
     @Override
     public @NotNull ConfiguredList<V> build() {
         return new ConfiguredList<>(
-                this.provider, this.path,
-                this.headerComments, this.inlineComment,
-                this.valueClass, this.defaultValue,
+                buildManifest(), this.valueClass,
                 this.sourceParser.andThen(this.valueParser),
                 this.valueSerializer.andThen(sourceSerializer)
         );

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

@@ -2,6 +2,7 @@ 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.value.ValueManifest;
 import cc.carm.lib.configuration.core.value.type.ConfiguredMap;
 import org.jetbrains.annotations.NotNull;
 
@@ -96,10 +97,8 @@ public class SourceMapBuilder<M extends Map<K, V>, S, K, V> extends CommonConfig
     @Override
     public @NotNull ConfiguredMap<K, V> build() {
         return new ConfiguredMap<>(
-                this.provider, this.path,
-                this.headerComments, this.inlineComment,
-                this.defaultValue, this.supplier,
-                this.keyClass, this.keyParser,
+                new ValueManifest<>(provider, path, headerComments, inlineComment, defaultValue),
+                this.supplier, this.keyClass, this.keyParser,
                 this.valueClass, this.sourceParser.andThen(this.valueParser),
                 this.keySerializer, this.valueSerializer.andThen(this.sourceSerializer)
         );

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

@@ -44,12 +44,7 @@ public class SectionValueBuilder<V>
 
     @Override
     public @NotNull ConfiguredSection<V> build() {
-        return new ConfiguredSection<>(
-                this.provider, this.path,
-                this.headerComments, this.inlineComment,
-                this.valueClass, this.defaultValue,
-                this.parser, this.serializer
-        );
+        return new ConfiguredSection<>(buildManifest(), this.valueClass, this.parser, this.serializer);
     }
 
 }

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

@@ -57,9 +57,7 @@ public class SourceValueBuilder<S, V> extends CommonConfigBuilder<V, SourceValue
     @Override
     public @NotNull ConfiguredValue<V> build() {
         return new ConfiguredValue<>(
-                this.provider, this.path,
-                this.headerComments, this.inlineComment,
-                this.valueClass, this.defaultValue,
+                buildManifest(), this.valueClass,
                 this.valueParser.compose(this.sourceParser),
                 this.valueSerializer.andThen(sourceSerializer)
         );

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

@@ -62,6 +62,94 @@ public interface ConfigDataFunction<T, R> {
         };
     }
 
+    @Contract(pure = true)
+    static <V> @NotNull ConfigDataFunction<String, V> parseString(Class<V> valueClass) {
+        return (input) -> {
+            if (valueClass.isInstance(input)) return valueClass.cast(input);
+            else throw new IllegalArgumentException("Cannot cast string to " + valueClass.getName());
+        };
+    }
+
+    @Contract(pure = true)
+    static @NotNull ConfigDataFunction<Object, Integer> intValue() {
+        return (input) -> {
+            if (input instanceof Integer) {
+                return (Integer) input;
+            } else if (input instanceof Number) {
+                return ((Number) input).intValue();
+            } else throw new IllegalArgumentException("Cannot cast value to " + Integer.class.getName());
+        };
+    }
+
+    @Contract(pure = true)
+    static @NotNull ConfigDataFunction<Object, Short> shortValue() {
+        return (input) -> {
+            if (input instanceof Short) {
+                return (Short) input;
+            } else if (input instanceof Number) {
+                return ((Number) input).shortValue();
+            } else throw new IllegalArgumentException("Cannot cast value to " + Short.class.getName());
+        };
+    }
+
+    @Contract(pure = true)
+    static @NotNull ConfigDataFunction<Object, Double> doubleValue() {
+        return (input) -> {
+            if (input instanceof Double) {
+                return (Double) input;
+            } else if (input instanceof Number) {
+                return ((Number) input).doubleValue();
+            } else throw new IllegalArgumentException("Cannot cast value to " + Double.class.getName());
+        };
+    }
+
+    @Contract(pure = true)
+    static @NotNull ConfigDataFunction<Object, Byte> byteValue() {
+        return (input) -> {
+            if (input instanceof Byte) {
+                return (Byte) input;
+            } else if (input instanceof Number) {
+                return ((Number) input).byteValue();
+            } else throw new IllegalArgumentException("Cannot cast value to " + Byte.class.getName());
+        };
+    }
+
+    @Contract(pure = true)
+    static @NotNull ConfigDataFunction<Object, Float> floatValue() {
+        return (input) -> {
+            if (input instanceof Float) {
+                return (Float) input;
+            } else if (input instanceof Number) {
+                return ((Number) input).floatValue();
+            } else throw new IllegalArgumentException("Cannot cast value to " + Float.class.getName());
+        };
+    }
+
+    @Contract(pure = true)
+    static @NotNull ConfigDataFunction<Object, Long> longValue() {
+        return (input) -> {
+            if (input instanceof Long) {
+                return (Long) input;
+            } else if (input instanceof Number) {
+                return ((Number) input).longValue();
+            } else throw new IllegalArgumentException("Cannot cast value to " + Long.class.getName());
+        };
+    }
+
+    @Contract(pure = true)
+    static @NotNull ConfigDataFunction<Object, Boolean> booleanValue() {
+        return (input) -> {
+            if (input instanceof Boolean) {
+                return (Boolean) input;
+            } else if (input instanceof String) {
+                String s = (String) input;
+                return Boolean.parseBoolean(s) || "yes".equalsIgnoreCase(s);
+            } else if (input instanceof Integer) {
+                return ((Integer) input) == 1;
+            } else throw new IllegalArgumentException("Cannot cast value to " + Boolean.class.getName());
+        };
+    }
+
 
 }
 

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

@@ -90,92 +90,39 @@ public interface ConfigValueParser<T, R> {
         };
     }
 
-    @Contract(pure = true)
-    static @NotNull <T> ConfigValueParser<T, String> castToString(Class<T> clazz) {
-        return (input, defaultValue) -> {
-            if (input instanceof String) return (String) input;
-            else return input.toString();
-        };
-    }
-
     @Contract(pure = true)
     static @NotNull ConfigValueParser<Object, Integer> intValue() {
-        return (input, defaultValue) -> {
-            if (input instanceof Integer) {
-                return (Integer) input;
-            } else if (input instanceof Number) {
-                return ((Number) input).intValue();
-            } else throw new IllegalArgumentException("Cannot cast value to " + Integer.class.getName());
-        };
+        return (input, defaultValue) -> ConfigDataFunction.intValue().parse(input);
     }
 
     @Contract(pure = true)
     static @NotNull ConfigValueParser<Object, Short> shortValue() {
-        return (input, defaultValue) -> {
-            if (input instanceof Short) {
-                return (Short) input;
-            } else if (input instanceof Number) {
-                return ((Number) input).shortValue();
-            } else throw new IllegalArgumentException("Cannot cast value to " + Short.class.getName());
-        };
+        return (input, defaultValue) -> ConfigDataFunction.shortValue().parse(input);
     }
 
     @Contract(pure = true)
     static @NotNull ConfigValueParser<Object, Double> doubleValue() {
-        return (input, defaultValue) -> {
-            if (input instanceof Double) {
-                return (Double) input;
-            } else if (input instanceof Number) {
-                return ((Number) input).doubleValue();
-            } else throw new IllegalArgumentException("Cannot cast value to " + Double.class.getName());
-        };
+        return (input, defaultValue) -> ConfigDataFunction.doubleValue().parse(input);
     }
 
     @Contract(pure = true)
     static @NotNull ConfigValueParser<Object, Byte> byteValue() {
-        return (input, defaultValue) -> {
-            if (input instanceof Byte) {
-                return (Byte) input;
-            } else if (input instanceof Number) {
-                return ((Number) input).byteValue();
-            } else throw new IllegalArgumentException("Cannot cast value to " + Byte.class.getName());
-        };
+        return (input, defaultValue) -> ConfigDataFunction.byteValue().parse(input);
     }
 
     @Contract(pure = true)
     static @NotNull ConfigValueParser<Object, Float> floatValue() {
-        return (input, defaultValue) -> {
-            if (input instanceof Float) {
-                return (Float) input;
-            } else if (input instanceof Number) {
-                return ((Number) input).floatValue();
-            } else throw new IllegalArgumentException("Cannot cast value to " + Float.class.getName());
-        };
+        return (input, defaultValue) -> ConfigDataFunction.floatValue().parse(input);
     }
 
     @Contract(pure = true)
     static @NotNull ConfigValueParser<Object, Long> longValue() {
-        return (input, defaultValue) -> {
-            if (input instanceof Long) {
-                return (Long) input;
-            } else if (input instanceof Number) {
-                return ((Number) input).longValue();
-            } else throw new IllegalArgumentException("Cannot cast value to " + Long.class.getName());
-        };
+        return (input, defaultValue) -> ConfigDataFunction.longValue().parse(input);
     }
 
     @Contract(pure = true)
     static @NotNull ConfigValueParser<Object, Boolean> booleanValue() {
-        return (input, defaultValue) -> {
-            if (input instanceof Boolean) {
-                return (Boolean) input;
-            } else if (input instanceof String) {
-                String s = (String) input;
-                return Boolean.parseBoolean(s) || "yes".equalsIgnoreCase(s);
-            } else if (input instanceof Integer) {
-                return ((Integer) input) == 1;
-            } else throw new IllegalArgumentException("Cannot cast value to " + Boolean.class.getName());
-        };
+        return (input, defaultValue) -> ConfigDataFunction.booleanValue().parse(input);
     }
 
 }

core/src/main/java/cc/carm/lib/configuration/core/value/ConfigValue.java

@@ -2,62 +2,34 @@ package cc.carm.lib.configuration.core.value;
 
 import cc.carm.lib.configuration.core.builder.ConfigBuilder;
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
-import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-public abstract class ConfigValue<T> {
+public abstract class ConfigValue<T> extends ValueManifest<T> {
 
     public static @NotNull ConfigBuilder builder() {
         return new ConfigBuilder();
     }
 
-    protected @Nullable ConfigurationProvider<?> provider;
-    protected @Nullable String configPath;
-
-    protected @Nullable List<String> headerComments;
-    protected @Nullable String inlineComments;
-
-    protected @Nullable T defaultValue;
+    public ConfigValue(@NotNull ValueManifest<T> manifest) {
+        super(manifest.provider, manifest.configPath, manifest.headerComments, manifest.inlineComment, manifest.defaultValue);
+    }
 
+    @Deprecated
     public ConfigValue(@Nullable ConfigurationProvider<?> provider, @Nullable String configPath,
                        @Nullable List<String> headerComments, @Nullable String inlineComments,
                        @Nullable T defaultValue) {
-        this.provider = provider;
-        this.configPath = configPath;
-        this.headerComments = headerComments;
-        this.inlineComments = inlineComments;
-        this.defaultValue = defaultValue;
+        super(provider, configPath, headerComments, inlineComments, defaultValue);
     }
 
     public void initialize(@NotNull ConfigurationProvider<?> provider, boolean saveDefault, @NotNull String configPath,
                            @Nullable List<String> headerComments, @Nullable String inlineComments) {
-        if (this.provider == null) this.provider = provider;
-        if (this.configPath == null) this.configPath = configPath;
-        if (this.headerComments == null) this.headerComments = headerComments;
-        if (this.inlineComments == null) this.inlineComments = inlineComments;
+        this.initialize(provider, configPath, headerComments, inlineComments);
         if (saveDefault) setDefault();
-
-        if (getHeaderComments() != null) {
-            this.provider.setHeaderComment(getConfigPath(), getHeaderComments());
-        }
-        if (getInlineComments() != null) {
-            this.provider.setInlineComment(getConfigPath(), getInlineComments());
-        }
-
-    }
-
-    public @Nullable T getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(@Nullable T defaultValue) {
-        this.defaultValue = defaultValue;
     }
 
     /**
@@ -131,39 +103,4 @@ public abstract class ConfigValue<T> {
         else return false;
     }
 
-    public @NotNull ConfigurationProvider<?> getProvider() {
-        return Optional.ofNullable(this.provider)
-                .orElseThrow(() -> new IllegalStateException("Value(" + configPath + ") does not have a provider."));
-    }
-
-    public final @NotNull ConfigurationWrapper<?> getConfiguration() {
-        try {
-            return getProvider().getConfiguration();
-        } catch (Exception ex) {
-            throw new IllegalStateException("Value(" + configPath + ") has not been initialized", ex);
-        }
-    }
-
-    public @NotNull String getConfigPath() {
-        return Optional.ofNullable(this.configPath)
-                .orElseThrow(() -> new IllegalStateException("No section path provided."));
-    }
-
-    protected Object getValue() {
-        return getConfiguration().get(getConfigPath());
-    }
-
-    protected void setValue(@Nullable Object value) {
-        getConfiguration().set(getConfigPath(), value);
-    }
-
-    public @Nullable String getInlineComments() {
-        return inlineComments;
-    }
-
-    @Unmodifiable
-    public @Nullable List<String> getHeaderComments() {
-        return headerComments;
-    }
-
 }

core/src/main/java/cc/carm/lib/configuration/core/value/ValueManifest.java

@@ -0,0 +1,103 @@
+package cc.carm.lib.configuration.core.value;
+
+import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.List;
+import java.util.Optional;
+
+public class ValueManifest<T> {
+
+    public static <V> ValueManifest<V> of(@Nullable ConfigurationProvider<?> provider, @Nullable String configPath,
+                                          @Nullable List<String> headerComments, @Nullable String inlineComments) {
+        return new ValueManifest<>(provider, configPath, headerComments, inlineComments, null);
+    }
+
+    public static <V> ValueManifest<V> of(@Nullable ConfigurationProvider<?> provider, @Nullable String configPath,
+                                          @Nullable List<String> headerComments, @Nullable String inlineComments,
+                                          @Nullable V defaultValue) {
+        return new ValueManifest<>(provider, configPath, headerComments, inlineComments, defaultValue);
+    }
+
+    protected @Nullable ConfigurationProvider<?> provider;
+    protected @Nullable String configPath;
+
+    protected @Nullable List<String> headerComments;
+    protected @Nullable String inlineComment;
+
+    protected @Nullable T defaultValue;
+
+    public ValueManifest(@Nullable ConfigurationProvider<?> provider, @Nullable String configPath,
+                         @Nullable List<String> headerComments, @Nullable String inlineComment,
+                         @Nullable T defaultValue) {
+        this.provider = provider;
+        this.configPath = configPath;
+        this.headerComments = headerComments;
+        this.inlineComment = inlineComment;
+        this.defaultValue = defaultValue;
+    }
+
+    protected void initialize(@NotNull ConfigurationProvider<?> provider, @NotNull String configPath,
+                              @Nullable List<String> headerComments, @Nullable String inlineComments) {
+        if (this.provider == null) this.provider = provider;
+        if (this.configPath == null) this.configPath = configPath;
+        if (this.headerComments == null) this.headerComments = headerComments;
+        if (this.inlineComment == null) this.inlineComment = inlineComments;
+
+        if (getHeaderComments() != null) {
+            this.provider.setHeaderComment(getConfigPath(), getHeaderComments());
+        }
+        if (getInlineComment() != null) {
+            this.provider.setInlineComment(getConfigPath(), getInlineComment());
+        }
+    }
+
+    public @Nullable T getDefaultValue() {
+        return this.defaultValue;
+    }
+
+    public void setDefaultValue(@Nullable T defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public @NotNull ConfigurationProvider<?> getProvider() {
+        return Optional.ofNullable(this.provider)
+                .orElseThrow(() -> new IllegalStateException("Value(" + configPath + ") does not have a provider."));
+    }
+
+    public final @NotNull ConfigurationWrapper<?> getConfiguration() {
+        try {
+            return getProvider().getConfiguration();
+        } catch (Exception ex) {
+            throw new IllegalStateException("Value(" + configPath + ") has not been initialized", ex);
+        }
+    }
+
+    public @NotNull String getConfigPath() {
+        return Optional.ofNullable(this.configPath)
+                .orElseThrow(() -> new IllegalStateException("No section path provided."));
+    }
+
+    protected Object getValue() {
+        String path = getConfigPath(); // 当未指定路径时，优先抛出异常
+        return getConfiguration().get(path);
+    }
+
+    protected void setValue(@Nullable Object value) {
+        getConfiguration().set(getConfigPath(), value);
+    }
+
+    public @Nullable String getInlineComment() {
+        return inlineComment;
+    }
+
+    @Unmodifiable
+    public @Nullable List<String> getHeaderComments() {
+        return headerComments;
+    }
+
+
+}

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

@@ -1,21 +1,18 @@
 package cc.carm.lib.configuration.core.value.impl;
 
-import cc.carm.lib.configuration.core.source.ConfigurationProvider;
 import cc.carm.lib.configuration.core.value.ConfigValue;
+import cc.carm.lib.configuration.core.value.ValueManifest;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-
 public abstract class CachedConfigValue<T> extends ConfigValue<T> {
 
 
     protected @Nullable T cachedValue;
     protected long parsedTime = -1;
 
-    public CachedConfigValue(@Nullable ConfigurationProvider<?> provider, @Nullable String sectionPath,
-                             @Nullable List<String> headerComments, @Nullable String inlineComments,
-                             @Nullable T defaultValue) {
-        super(provider, sectionPath, headerComments, inlineComments, defaultValue);
+    public CachedConfigValue(@NotNull ValueManifest<T> manifest) {
+        super(manifest);
     }
 
     protected T updateCache(T value) {

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

@@ -1,34 +1,31 @@
 package cc.carm.lib.configuration.core.value.type;
 
-import cc.carm.lib.configuration.core.annotation.HeaderComment;
 import cc.carm.lib.configuration.core.builder.list.ConfigListBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
-import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import cc.carm.lib.configuration.core.value.ValueManifest;
 import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
-public class ConfiguredList<V> extends CachedConfigValue<List<V>> {
+public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements List<V> {
 
     public static <V> @NotNull ConfigListBuilder<V> builder(@NotNull Class<V> valueClass) {
         return builder().asList(valueClass);
     }
 
-    @HeaderComment
     protected final @NotNull Class<V> valueClass;
 
     protected final @NotNull ConfigDataFunction<Object, V> parser;
     protected final @NotNull ConfigDataFunction<V, Object> serializer;
 
-    public ConfiguredList(@Nullable ConfigurationProvider<?> provider, @Nullable String sectionPath,
-                          @Nullable List<String> headerComments, @Nullable String inlineComments,
-                          @NotNull Class<V> valueClass, @Nullable List<V> defaultValue,
+    public ConfiguredList(@NotNull ValueManifest<List<V>> manifest, @NotNull Class<V> valueClass,
                           @NotNull ConfigDataFunction<Object, V> parser,
                           @NotNull ConfigDataFunction<V, Object> serializer) {
-        super(provider, sectionPath, headerComments, inlineComments, defaultValue);
+        super(manifest);
         this.valueClass = valueClass;
         this.parser = parser;
         this.serializer = serializer;
@@ -38,8 +35,9 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> {
     public @NotNull List<V> get() {
         if (isExpired()) { // 已过时的数据，需要重新解析一次。
             List<V> list = new ArrayList<>();
-            List<?> data = getConfiguration().getList(getConfigPath());
-            if (data == null || data.isEmpty()) return useOrDefault(list);
+            List<?> data = getConfiguration().contains(getConfigPath()) ?
+                    getConfiguration().getList(getConfigPath()) : null;
+            if (data == null) return useOrDefault(list);
             for (Object dataVal : data) {
                 if (dataVal == null) continue;
                 try {
@@ -54,6 +52,25 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> {
         else return new ArrayList<>();
     }
 
+    @Override
+    public V get(int index) {
+        return get().get(index);
+    }
+
+    public <T> @NotNull T modifyValue(Function<List<V>, T> function) {
+        List<V> list = get();
+        T result = function.apply(list);
+        set(list);
+        return result;
+    }
+
+    public @NotNull List<V> modifyList(Consumer<List<V>> consumer) {
+        List<V> list = get();
+        consumer.accept(list);
+        set(list);
+        return list;
+    }
+
     @Override
     public void set(@Nullable List<V> value) {
         updateCache(value);
@@ -72,5 +89,121 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> {
         }
     }
 
+    @Override
+    public V set(int index, V element) {
+        return modifyValue(list -> list.set(index, element));
+    }
+
+    @Override
+    public int size() {
+        return get().size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return get().isEmpty();
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return get().contains(o);
+    }
+
+    @NotNull
+    @Override
+    public Iterator<V> iterator() {
+        return get().iterator();
+    }
+
+    @NotNull
+    @Override
+    public Object @NotNull [] toArray() {
+        return get().toArray();
+    }
+
+    @NotNull
+    @Override
+    public <T> T @NotNull [] toArray(@NotNull T[] a) {
+        return get().toArray(a);
+    }
+
+    @Override
+    public boolean containsAll(@NotNull Collection<?> c) {
+        return new HashSet<>(get()).containsAll(c);
+    }
+
+    @Override
+    public boolean add(V v) {
+        modifyValue(list -> list.add(v));
+        return true;
+    }
+
+    @Override
+    public void add(int index, V element) {
+        modifyList(list -> list.add(index, element));
+    }
+
+    @Override
+    public boolean addAll(@NotNull Collection<? extends V> c) {
+        return modifyValue(list -> list.addAll(c));
+    }
+
+    @Override
+    public boolean addAll(int index, @NotNull Collection<? extends V> c) {
+        return modifyValue(list -> list.addAll(index, c));
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return modifyValue(list -> list.remove(o));
+    }
+
+    @Override
+    public V remove(int index) {
+        return modifyValue(list -> list.remove(index));
+    }
+
+    @Override
+    public boolean removeAll(@NotNull Collection<?> c) {
+        return modifyValue(list -> list.removeAll(c));
+    }
+
+    @Override
+    public boolean retainAll(@NotNull Collection<?> c) {
+        return modifyValue(list -> list.retainAll(c));
+    }
+
+    @Override
+    public void clear() {
+        modifyList(List::clear);
+    }
+
+    @Override
+    public int indexOf(Object o) {
+        return get().indexOf(o);
+    }
+
+    @Override
+    public int lastIndexOf(Object o) {
+        return get().lastIndexOf(o);
+    }
+
+    @NotNull
+    @Override
+    public ListIterator<V> listIterator() {
+        return get().listIterator();
+    }
+
+    @NotNull
+    @Override
+    public ListIterator<V> listIterator(int index) {
+        return get().listIterator(index);
+    }
+
+    @NotNull
+    @Override
+    public List<V> subList(int fromIndex, int toIndex) {
+        return get().subList(fromIndex, toIndex);
+    }
 
 }

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

@@ -2,19 +2,22 @@ package cc.carm.lib.configuration.core.value.type;
 
 import cc.carm.lib.configuration.core.builder.map.ConfigMapBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
-import cc.carm.lib.configuration.core.source.ConfigurationProvider;
 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 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.List;
 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>> {
+public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> implements Map<K, V> {
 
     public static <K, V> @NotNull ConfigMapBuilder<LinkedHashMap<K, V>, K, V> builder(@NotNull Class<K> keyClass,
                                                                                       @NotNull Class<V> valueClass) {
@@ -32,15 +35,17 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> {
     protected final @NotNull ConfigDataFunction<K, String> keySerializer;
     protected final @NotNull ConfigDataFunction<V, Object> valueSerializer;
 
-    public ConfiguredMap(@Nullable ConfigurationProvider<?> provider, @Nullable String sectionPath,
-                         @Nullable List<String> headerComments, @Nullable String inlineComments,
-                         @Nullable Map<K, V> defaultValue, @NotNull Supplier<? extends Map<K, V>> supplier,
+
+    public ConfiguredMap(@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<Object, V> valueParser,
                          @NotNull ConfigDataFunction<K, String> keySerializer,
                          @NotNull ConfigDataFunction<V, Object> valueSerializer) {
-        super(provider, sectionPath, headerComments, inlineComments, defaultValue);
-        this.supplier = supplier;
+        super(manifest
+            );
+        this.supplier = mapObjSupplier;
         this.keyClass = keyClass;
         this.valueClass = valueClass;
         this.keyParser = keyParser;
@@ -103,7 +108,12 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> {
     }
 
     @Override
-    public void set(Map<K, V> value) {
+    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 {
@@ -122,5 +132,78 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> {
         }
     }
 
+    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/ConfiguredSection.java

@@ -3,18 +3,18 @@ package cc.carm.lib.configuration.core.value.type;
 import cc.carm.lib.configuration.core.builder.value.SectionValueBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.function.ConfigValueParser;
-import cc.carm.lib.configuration.core.source.ConfigurationProvider;
 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 org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
 public class ConfiguredSection<V> extends CachedConfigValue<V> {
 
+
     public static <V> @NotNull SectionValueBuilder<V> builder(@NotNull Class<V> valueClass) {
         return builder().asValue(valueClass).fromSection();
     }
@@ -24,12 +24,10 @@ public class ConfiguredSection<V> extends CachedConfigValue<V> {
     protected final @NotNull ConfigValueParser<ConfigurationWrapper<?>, V> parser;
     protected final @NotNull ConfigDataFunction<V, ? extends Map<String, Object>> serializer;
 
-    public ConfiguredSection(@Nullable ConfigurationProvider<?> provider, @Nullable String sectionPath,
-                             @Nullable List<String> headerComments, @Nullable String inlineComments,
-                             @NotNull Class<V> valueClass, @Nullable V defaultValue,
+    public ConfiguredSection(@NotNull ValueManifest<V> manifest, @NotNull Class<V> valueClass,
                              @NotNull ConfigValueParser<ConfigurationWrapper<?>, V> parser,
                              @NotNull ConfigDataFunction<V, ? extends Map<String, Object>> serializer) {
-        super(provider, sectionPath, headerComments, inlineComments, defaultValue);
+        super(manifest);
         this.valueClass = valueClass;
         this.parser = parser;
         this.serializer = serializer;

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

@@ -3,12 +3,11 @@ package cc.carm.lib.configuration.core.value.type;
 import cc.carm.lib.configuration.core.builder.value.ConfigValueBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.function.ConfigValueParser;
-import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import cc.carm.lib.configuration.core.value.ValueManifest;
 import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
 import java.util.Optional;
 
 public class ConfiguredValue<V> extends CachedConfigValue<V> {
@@ -30,13 +29,10 @@ public class ConfiguredValue<V> extends CachedConfigValue<V> {
     protected final @NotNull ConfigValueParser<Object, V> parser;
     protected final @NotNull ConfigDataFunction<V, Object> serializer;
 
-    public ConfiguredValue(@Nullable ConfigurationProvider<?> provider, @Nullable String sectionPath,
-                           @Nullable List<String> headerComments, @Nullable String inlineComments,
-                           @NotNull Class<V> valueClass, @Nullable V defaultValue,
+    public ConfiguredValue(@NotNull ValueManifest<V> manifest, @NotNull Class<V> valueClass,
                            @NotNull ConfigValueParser<Object, V> parser,
                            @NotNull ConfigDataFunction<V, Object> serializer) {
-
-        super(provider, sectionPath, headerComments, inlineComments, defaultValue);
+        super(manifest);
         this.valueClass = valueClass;
         this.parser = parser;
         this.serializer = serializer;

demo/pom.xml

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

demo/src/main/java/cc/carm/lib/configuration/demo/tests/ConfigurationTest.java

@@ -1,9 +1,10 @@
 package cc.carm.lib.configuration.demo.tests;
 
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
-import cc.carm.lib.configuration.demo.tests.model.TestModel;
 import cc.carm.lib.configuration.demo.tests.conf.DemoConfiguration;
 import cc.carm.lib.configuration.demo.tests.conf.TestConfiguration;
+import cc.carm.lib.configuration.demo.tests.model.TestModel;
+import org.jetbrains.annotations.TestOnly;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -13,6 +14,7 @@ import java.util.stream.IntStream;
 
 public class ConfigurationTest {
 
+    @TestOnly
     public static void testDemo(ConfigurationProvider<?> provider) {
         provider.initialize(DemoConfiguration.class);
 
@@ -30,16 +32,25 @@ public class ConfigurationTest {
         System.out.println("after: " + DemoConfiguration.Sub.UUID_CONFIG_VALUE.get());
 
         System.out.println("> Test List:");
-        DemoConfiguration.Sub.That.OPERATORS.getNotNull().forEach(System.out::println);
+
+        System.out.println(" Before:");
+        DemoConfiguration.Sub.That.OPERATORS.forEach(System.out::println);
         List<UUID> operators = IntStream.range(0, 5).mapToObj(i -> UUID.randomUUID()).collect(Collectors.toList());
         DemoConfiguration.Sub.That.OPERATORS.set(operators);
+        System.out.println(" After:");
+        DemoConfiguration.Sub.That.OPERATORS.forEach(System.out::println);
+
+        System.out.println("> Clear List:");
+        System.out.println(" Before: size :" + DemoConfiguration.Sub.That.OPERATORS.size());
+        DemoConfiguration.Sub.That.OPERATORS.modifyList(List::clear);
+        System.out.println(" After size :" + DemoConfiguration.Sub.That.OPERATORS.size());
 
         System.out.println("> Test Section:");
         System.out.println(DemoConfiguration.MODEL_TEST.get());
         DemoConfiguration.MODEL_TEST.set(TestModel.random());
 
         System.out.println("> Test Maps:");
-        DemoConfiguration.USERS.getNotNull().forEach((k, v) -> System.out.println(k + ": " + v));
+        DemoConfiguration.USERS.forEach((k, v) -> System.out.println(k + ": " + v));
         LinkedHashMap<Integer, UUID> data = new LinkedHashMap<>();
         for (int i = 1; i <= 5; i++) {
             data.put(i, UUID.randomUUID());

demo/src/main/java/cc/carm/lib/configuration/demo/tests/conf/DemoConfiguration.java

@@ -12,8 +12,6 @@ import cc.carm.lib.configuration.core.value.type.ConfiguredSection;
 import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
 import cc.carm.lib.configuration.demo.tests.model.TestModel;
 
-import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 
@@ -47,7 +45,7 @@ public class DemoConfiguration extends ConfigurationRoot {
             .serializeValue(TestModel::serialize).build();
 
     @HeaderComment({"", "[ID - UUID]对照表", "", "用于测试Map类型的解析与序列化保存"})
-    public static final ConfigValue<Map<Integer, UUID>> USERS = ConfiguredMap
+    public static final ConfiguredMap<Integer, UUID> USERS = ConfiguredMap
             .builder(Integer.class, UUID.class).fromString()
             .parseKey(Integer::parseInt)
             .parseValue(v -> Objects.requireNonNull(UUID.fromString(v)))
@@ -69,7 +67,7 @@ public class DemoConfiguration extends ConfigurationRoot {
 
         public static class That extends ConfigurationRoot {
 
-            public static final ConfigValue<List<UUID>> OPERATORS = ConfiguredList
+            public static final ConfiguredList<UUID> OPERATORS = ConfiguredList
                     .builder(UUID.class).fromString()
                     .parseValue(s -> Objects.requireNonNull(UUID.fromString(s)))
                     .build();

impl/json/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.3.3</version>
+        <version>3.5.0</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.3.3</version>
+        <version>3.5.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

impl/yaml/pom.xml

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

impl/yaml/src/main/java/cc/carm/lib/configuration/yaml/YAMLValue.java

@@ -1,12 +1,10 @@
 package cc.carm.lib.configuration.yaml;
 
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import cc.carm.lib.configuration.core.value.ValueManifest;
 import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
 import cc.carm.lib.configuration.yaml.builder.YAMLConfigBuilder;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
 
 public abstract class YAMLValue<T> extends CachedConfigValue<T> {
 
@@ -14,10 +12,8 @@ public abstract class YAMLValue<T> extends CachedConfigValue<T> {
         return new YAMLConfigBuilder();
     }
 
-    public YAMLValue(@Nullable YAMLConfigProvider provider, @Nullable String configPath,
-                     @Nullable List<String> headerComments, @Nullable String inlineComments,
-                     @Nullable T defaultValue) {
-        super(provider, configPath, headerComments, inlineComments, defaultValue);
+    public YAMLValue(@NotNull ValueManifest<T> manifest) {
+        super(manifest);
     }
 
     public YAMLConfigProvider getYAMLProvider() {

impl/yaml/src/main/java/cc/carm/lib/configuration/yaml/builder/serializable/SerializableBuilder.java

@@ -21,7 +21,7 @@ public class SerializableBuilder<T extends ConfigurationSerializable>
 
     @Override
     public @NotNull ConfiguredSerializable<T> build() {
-        return new ConfiguredSerializable<>(this.provider, this.path, this.headerComments, this.inlineComment, this.valueClass, this.defaultValue);
+        return new ConfiguredSerializable<>(buildManifest(), this.valueClass);
     }
 
 

impl/yaml/src/main/java/cc/carm/lib/configuration/yaml/value/ConfiguredSerializable.java

@@ -1,12 +1,11 @@
 package cc.carm.lib.configuration.yaml.value;
 
-import cc.carm.lib.configuration.yaml.YAMLConfigProvider;
+import cc.carm.lib.configuration.core.value.ValueManifest;
 import cc.carm.lib.configuration.yaml.YAMLValue;
 import org.bspfsystems.yamlconfiguration.serialization.ConfigurationSerializable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
 import java.util.Optional;
 
 public class ConfiguredSerializable<T extends ConfigurationSerializable> extends YAMLValue<T> {
@@ -22,10 +21,8 @@ public class ConfiguredSerializable<T extends ConfigurationSerializable> extends
 
     protected final @NotNull Class<T> valueClass;
 
-    public ConfiguredSerializable(@Nullable YAMLConfigProvider provider, @Nullable String configPath,
-                                  @Nullable List<String> headerComments, @Nullable String inlineComments,
-                                  @NotNull Class<T> valueClass, @Nullable T defaultValue) {
-        super(provider, configPath, headerComments, inlineComments, defaultValue);
+    public ConfiguredSerializable(@NotNull ValueManifest<T> manifest, @NotNull Class<T> valueClass) {
+        super(manifest);
         this.valueClass = valueClass;
     }
 

pom.xml

@@ -15,7 +15,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyconfiguration-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.3.3</version>
+    <version>3.5.0</version>
     <modules>
         <module>core</module>
         <module>demo</module>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.0.0</version>
+            <version>24.0.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -122,7 +122,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.0.0</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
@@ -166,7 +166,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.5.0</version>
                     <configuration>
                         <classifier>javadoc</classifier>
                         <detectJavaApiLink>false</detectJavaApiLink>
@@ -193,7 +193,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.11.0</version>
                     <configuration>
                         <source>${java.version}</source>
                         <target>${java.version}</target>