refactor(api): 🤖 修改部分构造方法名称（破坏性更新)

Bumps [maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.0.1 to 3.1.0.
- [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.0.1...maven-gpg-plugin-3.1.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-gpg-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.5.1</version>
+        <version>3.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

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

@@ -2,6 +2,7 @@ package cc.carm.lib.configuration.core.builder;
 
 import cc.carm.lib.configuration.core.builder.list.ConfigListBuilder;
 import cc.carm.lib.configuration.core.builder.map.ConfigMapBuilder;
+import cc.carm.lib.configuration.core.builder.map.ConfigMapCreator;
 import cc.carm.lib.configuration.core.builder.value.ConfigValueBuilder;
 import org.jetbrains.annotations.NotNull;
 
@@ -19,24 +20,24 @@ public class ConfigBuilder {
         return new ConfigListBuilder<>(valueClass);
     }
 
-    public <K, V> @NotNull ConfigMapBuilder<LinkedHashMap<K, V>, K, V> asMap(@NotNull Class<K> keyClass,
+    public <K, V> @NotNull ConfigMapCreator<K, V> asMap(@NotNull Class<K> keyClass,
                                                         @NotNull Class<V> valueClass) {
-        return new ConfigMapBuilder<>(LinkedHashMap::new, keyClass, valueClass);
+        return new ConfigMapCreator<>(keyClass, valueClass);
     }
 
     public <K, V> @NotNull ConfigMapBuilder<HashMap<K, V>, K, V> asHashMap(@NotNull Class<K> keyClass,
                                                                            @NotNull Class<V> valueClass) {
-        return asMap(keyClass, valueClass).supplier(HashMap::new);
+        return asMap(keyClass, valueClass).asHashMap();
     }
 
     public <K, V> @NotNull ConfigMapBuilder<LinkedHashMap<K, V>, K, V> asLinkedMap(@NotNull Class<K> keyClass,
                                                                                    @NotNull Class<V> valueClass) {
-        return asMap(keyClass, valueClass);
+        return asMap(keyClass, valueClass).asLinkedMap();
     }
 
     public <K extends Comparable<K>, V> @NotNull ConfigMapBuilder<TreeMap<K, V>, K, V> asTreeMap(@NotNull Class<K> keyClass,
                                                                                                  @NotNull Class<V> valueClass) {
-        return asMap(keyClass, valueClass).supplier(TreeMap::new);
+        return asMap(keyClass, valueClass).asTreeMap();
     }
 
 }

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

@@ -7,6 +7,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 public class SourceListBuilder<S, V> extends CommonConfigBuilder<List<V>, SourceListBuilder<S, V>> {
@@ -37,6 +38,10 @@ public class SourceListBuilder<S, V> extends CommonConfigBuilder<List<V>, Source
         return defaults(new ArrayList<>(Arrays.asList(values)));
     }
 
+    public final @NotNull SourceListBuilder<S, V> defaults(@NotNull Collection<V> values) {
+        return defaults(new ArrayList<>(values));
+    }
+
     public @NotNull SourceListBuilder<S, V> parseSource(ConfigDataFunction<Object, S> sourceParser) {
         this.sourceParser = sourceParser;
         return this;

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

@@ -0,0 +1,37 @@
+package cc.carm.lib.configuration.core.builder.map;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Supplier;
+
+public class ConfigMapCreator<K, V> {
+
+    protected final @NotNull Class<K> keyClass;
+    protected final @NotNull Class<V> valueClass;
+
+    public ConfigMapCreator(@NotNull Class<K> keyClass, @NotNull Class<V> valueClass) {
+        this.keyClass = keyClass;
+        this.valueClass = valueClass;
+    }
+
+    public <M extends Map<K, V>> @NotNull ConfigMapBuilder<M, K, V> asMap(Supplier<M> mapSuppler) {
+        return new ConfigMapBuilder<>(mapSuppler, keyClass, valueClass);
+    }
+
+    public @NotNull ConfigMapBuilder<HashMap<K, V>, K, V> asHashMap() {
+        return asMap(HashMap::new);
+    }
+
+    public @NotNull ConfigMapBuilder<LinkedHashMap<K, V>, K, V> asLinkedMap() {
+        return asMap(LinkedHashMap::new);
+    }
+
+    public @NotNull ConfigMapBuilder<TreeMap<K, V>, K, V> asTreeMap() {
+        return asMap(TreeMap::new);
+    }
+
+}

core/src/main/java/cc/carm/lib/configuration/core/source/ConfigurationProvider.java

@@ -11,11 +11,16 @@ import org.jetbrains.annotations.Unmodifiable;
 import java.util.List;
 import java.util.Optional;
 
+/**
+ * 配置文件提供者，用于为 {@link ConfigValue} 提供配置文件的源，以便实现读取、保存等操作。
+ *
+ * @param <W> 配置文件的原生功能类
+ */
 public abstract class ConfigurationProvider<W extends ConfigurationWrapper<?>> {
 
     protected long updateTime;
 
-    public ConfigurationProvider() {
+    protected ConfigurationProvider() {
         this.updateTime = System.currentTimeMillis();
     }
 

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

@@ -14,7 +14,7 @@ public abstract class FileConfigProvider<W extends ConfigurationWrapper<?>> exte
 
     protected final @NotNull File file;
 
-    public FileConfigProvider(@NotNull File file) {
+    protected FileConfigProvider(@NotNull File file) {
         this.file = file;
     }
 

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

@@ -15,12 +15,20 @@ public abstract class ConfigValue<T> extends ValueManifest<T> {
         return new ConfigBuilder();
     }
 
-    public ConfigValue(@NotNull ValueManifest<T> manifest) {
+    protected ConfigValue(@NotNull ValueManifest<T> manifest) {
         super(manifest.provider, manifest.configPath, manifest.headerComments, manifest.inlineComment, manifest.defaultValue);
     }
 
+    /**
+     * @param provider       配置文件提供者
+     * @param configPath     配置路径
+     * @param headerComments 头部注释内容
+     * @param inlineComments 行内注释内容
+     * @param defaultValue   默认参数值
+     * @deprecated 请使用 {@link #ConfigValue(ValueManifest)} 构造器。
+     */
     @Deprecated
-    public ConfigValue(@Nullable ConfigurationProvider<?> provider, @Nullable String configPath,
+    protected ConfigValue(@Nullable ConfigurationProvider<?> provider, @Nullable String configPath,
                           @Nullable List<String> headerComments, @Nullable String inlineComments,
                           @Nullable T defaultValue) {
         super(provider, configPath, headerComments, inlineComments, defaultValue);

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

@@ -1,5 +1,6 @@
 package cc.carm.lib.configuration.core.value;
 
+import cc.carm.lib.configuration.core.ConfigInitializer;
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
 import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
 import org.jetbrains.annotations.NotNull;
@@ -9,6 +10,12 @@ import org.jetbrains.annotations.Unmodifiable;
 import java.util.List;
 import java.util.Optional;
 
+/**
+ * 配置值描述清单。用于描述一个配置值的相关基础信息。
+ *
+ * @param <T> 配置值类型
+ * @author CarmJos
+ */
 public class ValueManifest<T> {
 
     public static <V> ValueManifest<V> of(@Nullable ConfigurationProvider<?> provider, @Nullable String configPath,
@@ -30,6 +37,13 @@ public class ValueManifest<T> {
 
     protected @Nullable T defaultValue;
 
+    /**
+     * @param provider       配置文件提供者
+     * @param configPath     配置路径
+     * @param headerComments 头部注释内容
+     * @param inlineComment  行内注释内容
+     * @param defaultValue   默认参数值
+     */
     public ValueManifest(@Nullable ConfigurationProvider<?> provider, @Nullable String configPath,
                          @Nullable List<String> headerComments, @Nullable String inlineComment,
                          @Nullable T defaultValue) {
@@ -40,12 +54,20 @@ public class ValueManifest<T> {
         this.defaultValue = defaultValue;
     }
 
+    /**
+     * 此方法提供给 {@link ConfigInitializer}，以便对配置值的相关信息进行统一初始化操作。
+     *
+     * @param provider       配置文件提供者
+     * @param configPath     配置路径
+     * @param headerComments 头部注释内容
+     * @param inlineComment  行内注释内容
+     */
     protected void initialize(@NotNull ConfigurationProvider<?> provider, @NotNull String configPath,
-                              @Nullable List<String> headerComments, @Nullable String inlineComments) {
+                              @Nullable List<String> headerComments, @Nullable String inlineComment) {
         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 (this.inlineComment == null) this.inlineComment = inlineComment;
 
         if (getHeaderComments() != null) {
             this.provider.setHeaderComment(getConfigPath(), getHeaderComments());

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

@@ -2,6 +2,7 @@ package cc.carm.lib.configuration.core.value.impl;
 
 import cc.carm.lib.configuration.core.value.ConfigValue;
 import cc.carm.lib.configuration.core.value.ValueManifest;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -11,7 +12,7 @@ public abstract class CachedConfigValue<T> extends ConfigValue<T> {
     protected @Nullable T cachedValue;
     protected long parsedTime = -1;
 
-    public CachedConfigValue(@NotNull ValueManifest<T> manifest) {
+    protected CachedConfigValue(@NotNull ValueManifest<T> manifest) {
         super(manifest);
     }
 
@@ -29,12 +30,19 @@ public abstract class CachedConfigValue<T> extends ConfigValue<T> {
         return this.parsedTime <= 0 || getProvider().isExpired(this.parsedTime);
     }
 
-    protected final T useDefault() {
+    protected final T getDefaultFirst(@Nullable T value) {
-        return useOrDefault(null);
-    }
-
-    protected final T useOrDefault(@Nullable T value) {
         return updateCache(this.defaultValue == null ? value : this.defaultValue);
     }
 
+    protected @Nullable T getCachedOrDefault() {
+        return getCachedOrDefault(null);
+    }
+
+    @Contract("!null->!null")
+    protected T getCachedOrDefault(@Nullable T emptyValue) {
+        if (getCachedValue() != null) return getCachedValue();
+        else if (getDefaultValue() != null) return getDefaultValue();
+        else return emptyValue;
+    }
+
 }

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

@@ -13,10 +13,19 @@ import java.util.function.Function;
 
 public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements List<V> {
 
-    public static <V> @NotNull ConfigListBuilder<V> builder(@NotNull Class<V> valueClass) {
+    public static <V> @NotNull ConfigListBuilder<V> builderOf(@NotNull Class<V> valueClass) {
         return builder().asList(valueClass);
     }
 
+    public static <V> @NotNull ConfiguredList<V> of(@NotNull Class<V> valueClass, @NotNull Collection<V> defaults) {
+        return builderOf(valueClass).fromObject().defaults(defaults).build();
+    }
+
+    @SafeVarargs
+    public static <V> @NotNull ConfiguredList<V> of(@NotNull Class<V> valueClass, @NotNull V... defaults) {
+        return builderOf(valueClass).fromObject().defaults(defaults).build();
+    }
+
     protected final @NotNull Class<V> valueClass;
 
     protected final @NotNull ConfigDataFunction<Object, V> parser;
@@ -33,11 +42,13 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
 
     @Override
     public @NotNull List<V> get() {
-        if (isExpired()) { // 已过时的数据，需要重新解析一次。
+        if (!isExpired()) return getCachedOrDefault(new ArrayList<>());
+
+        // 已过时的数据，需要重新解析一次。
         List<V> list = new ArrayList<>();
         List<?> data = getConfiguration().contains(getConfigPath()) ?
                 getConfiguration().getList(getConfigPath()) : null;
-            if (data == null) return useOrDefault(list);
+        if (data == null) return getDefaultFirst(list);
         for (Object dataVal : data) {
             if (dataVal == null) continue;
             try {
@@ -47,9 +58,6 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
             }
         }
         return updateCache(list);
-        } else if (getCachedValue() != null) return getCachedValue();
-        else if (getDefaultValue() != null) return getDefaultValue();
-        else return new ArrayList<>();
     }
 
     @Override
@@ -57,14 +65,14 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
         return get().get(index);
     }
 
-    public <T> @NotNull T modifyValue(Function<List<V>, T> function) {
+    public <T> @NotNull T handle(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) {
+    public @NotNull List<V> modify(Consumer<List<V>> consumer) {
         List<V> list = get();
         consumer.accept(list);
         set(list);
@@ -91,7 +99,7 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
 
     @Override
     public V set(int index, V element) {
-        return modifyValue(list -> list.set(index, element));
+        return handle(list -> list.set(index, element));
     }
 
     @Override
@@ -134,48 +142,48 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
 
     @Override
     public boolean add(V v) {
-        modifyValue(list -> list.add(v));
+        handle(list -> list.add(v));
         return true;
     }
 
     @Override
     public void add(int index, V element) {
-        modifyList(list -> list.add(index, element));
+        modify(list -> list.add(index, element));
     }
 
     @Override
     public boolean addAll(@NotNull Collection<? extends V> c) {
-        return modifyValue(list -> list.addAll(c));
+        return handle(list -> list.addAll(c));
     }
 
     @Override
     public boolean addAll(int index, @NotNull Collection<? extends V> c) {
-        return modifyValue(list -> list.addAll(index, c));
+        return handle(list -> list.addAll(index, c));
     }
 
     @Override
     public boolean remove(Object o) {
-        return modifyValue(list -> list.remove(o));
+        return handle(list -> list.remove(o));
     }
 
     @Override
     public V remove(int index) {
-        return modifyValue(list -> list.remove(index));
+        return handle(list -> list.remove(index));
     }
 
     @Override
     public boolean removeAll(@NotNull Collection<?> c) {
-        return modifyValue(list -> list.removeAll(c));
+        return handle(list -> list.removeAll(c));
     }
 
     @Override
     public boolean retainAll(@NotNull Collection<?> c) {
-        return modifyValue(list -> list.retainAll(c));
+        return handle(list -> list.retainAll(c));
     }
 
     @Override
     public void clear() {
-        modifyList(List::clear);
+        modify(List::clear);
     }
 
     @Override

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

@@ -1,6 +1,6 @@
 package cc.carm.lib.configuration.core.value.type;
 
-import cc.carm.lib.configuration.core.builder.map.ConfigMapBuilder;
+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;
@@ -19,7 +19,7 @@ import java.util.function.Supplier;
 
 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,
+    public static <K, V> @NotNull ConfigMapCreator<K, V> builderOf(@NotNull Class<K> keyClass,
                                                                    @NotNull Class<V> valueClass) {
         return builder().asMap(keyClass, valueClass);
     }
@@ -36,15 +36,13 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> implements
     protected final @NotNull ConfigDataFunction<V, Object> valueSerializer;
 
 
-    public ConfiguredMap(@NotNull ValueManifest<Map<K, V>> manifest
+    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(manifest
+        super(manifest);
-            );
         this.supplier = mapObjSupplier;
         this.keyClass = keyClass;
         this.valueClass = valueClass;
@@ -80,14 +78,16 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> implements
 
     @Override
     public @NotNull Map<K, V> get() {
-        if (isExpired()) { // 已过时的数据，需要重新解析一次。
+        if (!isExpired()) return getCachedOrDefault(supplier.get());
+
+        // 已过时的数据，需要重新解析一次。
         Map<K, V> map = supplier.get();
 
         ConfigurationWrapper<?> section = getConfiguration().getConfigurationSection(getConfigPath());
-            if (section == null) return useOrDefault(map);
+        if (section == null) return getDefaultFirst(map);
 
         Set<String> keys = section.getKeys(false);
-            if (keys.isEmpty()) return useOrDefault(map);
+        if (keys.isEmpty()) return getDefaultFirst(map);
 
         for (String dataKey : keys) {
             Object dataVal = section.get(dataKey);
@@ -102,9 +102,6 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> implements
         }
 
         return updateCache(map);
-        } else if (getCachedValue() != null) return getCachedValue();
-        else if (getDefaultValue() != null) return getDefaultValue();
-        else return supplier.get();
     }
 
     @Override

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

@@ -10,12 +10,10 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
-import java.util.Optional;
 
 public class ConfiguredSection<V> extends CachedConfigValue<V> {
 
-
+    public static <V> @NotNull SectionValueBuilder<V> builderOf(@NotNull Class<V> valueClass) {
-    public static <V> @NotNull SectionValueBuilder<V> builder(@NotNull Class<V> valueClass) {
         return builder().asValue(valueClass).fromSection();
     }
 
@@ -47,18 +45,21 @@ public class ConfiguredSection<V> extends CachedConfigValue<V> {
 
     @Override
     public @Nullable V get() {
-        if (isExpired()) { // 已过时的数据，需要重新解析一次。
+        if (!isExpired()) return getCachedOrDefault();
+        // 已过时的数据，需要重新解析一次。
+
         ConfigurationWrapper<?> section = getConfiguration().getConfigurationSection(getConfigPath());
-            if (section == null) return useDefault();
+        if (section == null) return getDefaultValue();
+
         try {
             // 若未出现错误，则直接更新缓存并返回。
             return updateCache(this.parser.parse(section, this.defaultValue));
         } catch (Exception e) {
             // 出现了解析错误，提示并返回默认值。
             e.printStackTrace();
-                return useDefault();
+            return getDefaultValue();
         }
-        } else return Optional.ofNullable(getCachedValue()).orElse(defaultValue);
+
     }
 
     @Override

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

@@ -8,11 +8,9 @@ import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Optional;
-
 public class ConfiguredValue<V> extends CachedConfigValue<V> {
 
-    public static <V> ConfigValueBuilder<V> builder(Class<V> valueClass) {
+    public static <V> ConfigValueBuilder<V> builderOf(Class<V> valueClass) {
         return builder().asValue(valueClass);
     }
 
@@ -21,7 +19,7 @@ public class ConfiguredValue<V> extends CachedConfigValue<V> {
     }
 
     public static <V> ConfiguredValue<V> of(Class<V> valueClass, @Nullable V defaultValue) {
-        return builder(valueClass).fromObject().defaults(defaultValue).build();
+        return builderOf(valueClass).fromObject().defaults(defaultValue).build();
     }
 
     protected final @NotNull Class<V> valueClass;
@@ -48,18 +46,20 @@ public class ConfiguredValue<V> extends CachedConfigValue<V> {
 
     @Override
     public V get() {
-        if (isExpired()) { // 已过时的数据，需要重新解析一次。
+        if (!isExpired()) return getCachedOrDefault();
+        // 已过时的数据，需要重新解析一次。
+
         Object value = getValue();
-            if (value == null) return useDefault(); // 获取的值不存在，直接使用默认值。
+        if (value == null) return getDefaultValue(); // 获取的值不存在，直接使用默认值。
         try {
             // 若未出现错误，则直接更新缓存并返回。
             return updateCache(this.parser.parse(value, this.defaultValue));
         } catch (Exception e) {
             // 出现了解析错误，提示并返回默认值。
             e.printStackTrace();
-                return useDefault();
+            return getDefaultValue();
         }
-        } else return Optional.ofNullable(getCachedValue()).orElse(defaultValue);
+
     }
 
     @Override

demo/pom.xml

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

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

@@ -42,7 +42,7 @@ public class ConfigurationTest {
 
         System.out.println("> Clear List:");
         System.out.println(" Before: size :" + DemoConfiguration.Sub.That.OPERATORS.size());
-        DemoConfiguration.Sub.That.OPERATORS.modifyList(List::clear);
+        DemoConfiguration.Sub.That.OPERATORS.modify(List::clear);
         System.out.println(" After size :" + DemoConfiguration.Sub.That.OPERATORS.size());
 
         System.out.println("> Test Section:");

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

@@ -36,14 +36,15 @@ public class DemoConfiguration extends ConfigurationRoot {
     @HeaderComment({"Section类型数据测试"}) // 通过注解给配置添加注释。
     @InlineComment("Section数据也支持InlineComment注释")
     public static final ConfigValue<TestModel> MODEL_TEST = ConfiguredSection
-            .builder(TestModel.class)
+            .builderOf(TestModel.class)
             .defaults(new TestModel("Carm", UUID.randomUUID()))
             .parseValue((section, defaultValue) -> TestModel.deserialize(section))
             .serializeValue(TestModel::serialize).build();
 
     @HeaderComment({"[ID - UUID]对照表", "", "用于测试Map类型的解析与序列化保存"})
     public static final ConfiguredMap<Integer, UUID> USERS = ConfiguredMap
-            .builder(Integer.class, UUID.class).fromString()
+            .builderOf(Integer.class, UUID.class)
+            .asLinkedMap().fromString()
             .parseKey(Integer::parseInt)
             .parseValue(v -> Objects.requireNonNull(UUID.fromString(v)))
             .build();
@@ -58,14 +59,14 @@ public class DemoConfiguration extends ConfigurationRoot {
         @ConfigPath(value = "uuid-value", root = true)
         @InlineComment("This is an inline comment")
         public static final ConfigValue<UUID> UUID_CONFIG_VALUE = ConfiguredValue
-                .builder(UUID.class).fromString()
+                .builderOf(UUID.class).fromString()
                 .parseValue((data, defaultValue) -> UUID.fromString(data))
                 .build();
 
         public static class That extends ConfigurationRoot {
 
             public static final ConfiguredList<UUID> OPERATORS = ConfiguredList
-                    .builder(UUID.class).fromString()
+                    .builderOf(UUID.class).fromString()
                     .parseValue(s -> Objects.requireNonNull(UUID.fromString(s)))
                     .build();
 

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

@@ -21,7 +21,7 @@ public class TestConfiguration extends ConfigurationRoot {
     @HeaderComment({"Section类型数据测试"}) // 通过注解给配置添加注释。
     @InlineComment("Section数据也支持InlineComment注释")
     public final ConfigValue<TestModel> TEST_MODEL = ConfiguredSection
-            .builder(TestModel.class)
+            .builderOf(TestModel.class)
             .defaults(new TestModel("Carm", UUID.randomUUID()))
             .parseValue((section, defaultValue) -> TestModel.deserialize(section))
             .serializeValue(TestModel::serialize).build();

impl/json/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.5.1</version>
+        <version>3.6.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.5.1</version>
+        <version>3.6.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.5.1</version>
+        <version>3.6.0</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.1</version>
+            <version>1.3.2</version>
             <scope>compile</scope>
         </dependency>
 

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

@@ -6,8 +6,6 @@ import org.bspfsystems.yamlconfiguration.serialization.ConfigurationSerializable
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Optional;
-
 public class ConfiguredSerializable<T extends ConfigurationSerializable> extends YAMLValue<T> {
 
     public static <V extends ConfigurationSerializable> ConfiguredSerializable<V> of(@NotNull Class<V> valueClass) {
@@ -28,16 +26,17 @@ public class ConfiguredSerializable<T extends ConfigurationSerializable> extends
 
     @Override
     public @Nullable T get() {
-        if (isExpired()) { // 已过时的数据，需要重新解析一次。
+        if (!isExpired()) return getCachedOrDefault();
+
         try {
             // 若未出现错误，则直接更新缓存并返回。
             return updateCache(getYAMLConfig().getSerializable(getConfigPath(), valueClass, getDefaultValue()));
         } catch (Exception e) {
             // 出现了解析错误，提示并返回默认值。
             e.printStackTrace();
-                return useDefault();
+            return getDefaultValue();
         }
-        } else return Optional.ofNullable(getCachedValue()).orElse(defaultValue);
+
     }
 
     @Override

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

@@ -41,6 +41,8 @@ public class DemoConfigTest {
         AbstractModel anyModel = ModelConfiguration.ANY_MODEL.get();
         if (anyModel != null) System.out.println(anyModel.getName());
 
+        ModelConfiguration.MODELS.forEach(System.out::println);
+
         System.out.println("----------------------------------------------------");
     }
 

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

@@ -4,11 +4,14 @@ import cc.carm.lib.configuration.core.ConfigurationRoot;
 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.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 {
@@ -21,4 +24,11 @@ public class ModelConfiguration extends ConfigurationRoot {
             AnyModel.class, AnyModel.random()
     );
 
+    public static final ConfiguredList<AnyModel> MODELS = ConfiguredList.builderOf(AnyModel.class)
+            .fromObject()
+            .parseValue((section) -> AnyModel.deserialize((Map<String, ?>) section))
+            .serializeValue(AnyModel::serialize)
+            .defaults(AnyModel.random(), AnyModel.random(), AnyModel.random())
+            .build();
+
 }

pom.xml

@@ -15,7 +15,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyconfiguration-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.5.1</version>
+    <version>3.6.0</version>
     <modules>
         <module>core</module>
         <module>demo</module>
@@ -122,7 +122,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
@@ -130,7 +130,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -150,7 +150,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
+                <version>3.0.0</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <useReleaseProfile>false</useReleaseProfile>