修复路径截取错误导致无法拥有内部object类型的问题 (#38)

* 修复路径截取错误导致无法拥有内部object类型的问题

* 移除测试输出

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.5.1</version>
+        <version>3.7.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,
-                                                                                    @NotNull Class<V> valueClass) {
-        return new ConfigMapBuilder<>(LinkedHashMap::new, keyClass, valueClass);
+    public <K, V> @NotNull ConfigMapCreator<K, V> asMap(@NotNull Class<K> keyClass,
+                                                        @NotNull Class<V> 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);
+                                                                           @NotNull Class<V> valueClass) {
+        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);
+                                                                                   @NotNull Class<V> 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);
+                                                                                                 @NotNull Class<V> valueClass) {
+        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/builder/value/ConfigValueBuilder.java

@@ -46,7 +46,10 @@ public class ConfigValueBuilder<V> {
         return from(
                 Object.class, ConfigDataFunction.identity(),
                 ConfigValueParser.castObject(valueClass),
-                ConfigDataFunction.toObject(), ConfigDataFunction.toObject()
+                s -> {
+                    if (s instanceof Enum<?>) return ((Enum<?>) s).name();
+                    else return s;
+                }, ConfigDataFunction.toObject()
         );
     }
 

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

@@ -13,34 +13,34 @@ public interface ConfigDataFunction<T, R> {
 
     default <V> @NotNull ConfigDataFunction<T, V> andThen(@NotNull ConfigDataFunction<? super R, V> after) {
         Objects.requireNonNull(after);
-        return ((data) -> after.parse(parse(data)));
+        return data -> after.parse(parse(data));
     }
 
     @Contract(pure = true)
     static <T> @NotNull ConfigDataFunction<T, T> identity() {
-        return (input) -> input;
+        return input -> input;
     }
 
     @Contract(pure = true)
     static <T> @NotNull ConfigDataFunction<T, T> identity(Class<T> type) {
-        return (input) -> input;
+        return input -> input;
     }
 
     @Contract(pure = true)
     static <T, V> @NotNull ConfigDataFunction<T, V> required() {
-        return (input) -> {
+        return input -> {
             throw new IllegalArgumentException("Please specify the value parser.");
         };
     }
 
     @Contract(pure = true)
     static <T> @NotNull ConfigDataFunction<T, Object> toObject() {
-        return (input) -> input;
+        return input -> input;
     }
 
     @Contract(pure = true)
     static <V> @NotNull ConfigDataFunction<Object, V> castObject(Class<V> valueClass) {
-        return (input) -> {
+        return input -> {
             if (valueClass.isInstance(input)) return valueClass.cast(input);
             else throw new IllegalArgumentException("Cannot cast value to " + valueClass.getName());
         };
@@ -48,7 +48,7 @@ public interface ConfigDataFunction<T, R> {
 
     @Contract(pure = true)
     static <V> @NotNull ConfigDataFunction<String, V> castFromString(Class<V> valueClass) {
-        return (input) -> {
+        return input -> {
             if (valueClass.isInstance(input)) return valueClass.cast(input);
             else throw new IllegalArgumentException("Cannot cast string to " + valueClass.getName());
         };
@@ -56,15 +56,16 @@ public interface ConfigDataFunction<T, R> {
 
     @Contract(pure = true)
     static <T> @NotNull ConfigDataFunction<T, String> castToString() {
-        return (input) -> {
+        return input -> {
             if (input instanceof String) return (String) input;
+            else if (input instanceof Enum<?>) return ((Enum<?>) input).name();
             else return input.toString();
         };
     }
 
     @Contract(pure = true)
     static <V> @NotNull ConfigDataFunction<String, V> parseString(Class<V> valueClass) {
-        return (input) -> {
+        return input -> {
             if (valueClass.isInstance(input)) return valueClass.cast(input);
             else throw new IllegalArgumentException("Cannot cast string to " + valueClass.getName());
         };
@@ -72,7 +73,7 @@ public interface ConfigDataFunction<T, R> {
 
     @Contract(pure = true)
     static @NotNull ConfigDataFunction<Object, Integer> intValue() {
-        return (input) -> {
+        return input -> {
             if (input instanceof Integer) {
                 return (Integer) input;
             } else if (input instanceof Number) {
@@ -83,7 +84,7 @@ public interface ConfigDataFunction<T, R> {
 
     @Contract(pure = true)
     static @NotNull ConfigDataFunction<Object, Short> shortValue() {
-        return (input) -> {
+        return input -> {
             if (input instanceof Short) {
                 return (Short) input;
             } else if (input instanceof Number) {
@@ -94,7 +95,7 @@ public interface ConfigDataFunction<T, R> {
 
     @Contract(pure = true)
     static @NotNull ConfigDataFunction<Object, Double> doubleValue() {
-        return (input) -> {
+        return input -> {
             if (input instanceof Double) {
                 return (Double) input;
             } else if (input instanceof Number) {
@@ -105,7 +106,7 @@ public interface ConfigDataFunction<T, R> {
 
     @Contract(pure = true)
     static @NotNull ConfigDataFunction<Object, Byte> byteValue() {
-        return (input) -> {
+        return input -> {
             if (input instanceof Byte) {
                 return (Byte) input;
             } else if (input instanceof Number) {
@@ -116,7 +117,7 @@ public interface ConfigDataFunction<T, R> {
 
     @Contract(pure = true)
     static @NotNull ConfigDataFunction<Object, Float> floatValue() {
-        return (input) -> {
+        return input -> {
             if (input instanceof Float) {
                 return (Float) input;
             } else if (input instanceof Number) {
@@ -127,7 +128,7 @@ public interface ConfigDataFunction<T, R> {
 
     @Contract(pure = true)
     static @NotNull ConfigDataFunction<Object, Long> longValue() {
-        return (input) -> {
+        return input -> {
             if (input instanceof Long) {
                 return (Long) input;
             } else if (input instanceof Number) {
@@ -138,14 +139,14 @@ public interface ConfigDataFunction<T, R> {
 
     @Contract(pure = true)
     static @NotNull ConfigDataFunction<Object, Boolean> booleanValue() {
-        return (input) -> {
+        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;
+                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

@@ -67,6 +67,9 @@ public interface ConfigValueParser<T, R> {
                 }
             } else if (Boolean.class.isAssignableFrom(valueClass)) {
                 input = booleanValue().parse(input, (Boolean) defaultValue);
+            } else if (Enum.class.isAssignableFrom(valueClass) && input instanceof String) {
+                String enumName = (String) input;
+                input = valueClass.getDeclaredMethod("valueOf", String.class).invoke(null, enumName);
             }
 
             if (valueClass.isInstance(input)) return valueClass.cast(input);
@@ -125,6 +128,21 @@ public interface ConfigValueParser<T, R> {
         return (input, defaultValue) -> ConfigDataFunction.booleanValue().parse(input);
     }
 
+    @Contract(pure = true)
+    static @NotNull <E extends Enum<E>> ConfigValueParser<Object, E> enumValue(Class<E> enumClass) {
+        return (input, defaultValue) -> {
+            if (input instanceof Enum) {
+                return enumClass.cast(input);
+            } else if (input instanceof String) {
+                return Enum.valueOf(enumClass, (String) input);
+            } else if (input instanceof Number) {
+                return enumClass.getEnumConstants()[((Number) input).intValue()];
+            } else {
+                throw new IllegalArgumentException("Cannot cast value to " + enumClass.getName());
+            }
+        };
+    }
+
 }
 
 

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,14 +15,22 @@ 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,
-                       @Nullable List<String> headerComments, @Nullable String inlineComments,
-                       @Nullable T defaultValue) {
+    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() {
-        return useOrDefault(null);
-    }
-
-    protected final T useOrDefault(@Nullable T value) {
+    protected final T getDefaultFirst(@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,23 +42,22 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
 
     @Override
     public @NotNull List<V> get() {
-        if (isExpired()) { // 已过时的数据，需要重新解析一次。
-            List<V> list = new ArrayList<>();
-            List<?> data = getConfiguration().contains(getConfigPath()) ?
-                    getConfiguration().getList(getConfigPath()) : null;
-            if (data == null) return useOrDefault(list);
-            for (Object dataVal : data) {
-                if (dataVal == null) continue;
-                try {
-                    list.add(parser.parse(dataVal));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+        if (!isExpired()) return getCachedOrDefault(new ArrayList<>());
+
+        // 已过时的数据，需要重新解析一次。
+        List<V> list = new ArrayList<>();
+        List<?> data = getConfiguration().contains(getConfigPath()) ?
+                getConfiguration().getList(getConfigPath()) : null;
+        if (data == null) return getDefaultFirst(list);
+        for (Object dataVal : data) {
+            if (dataVal == null) continue;
+            try {
+                list.add(parser.parse(dataVal));
+            } catch (Exception e) {
+                e.printStackTrace();
             }
-            return updateCache(list);
-        } else if (getCachedValue() != null) return getCachedValue();
-        else if (getDefaultValue() != null) return getDefaultValue();
-        else return new ArrayList<>();
+        }
+        return updateCache(list);
     }
 
     @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,8 +19,8 @@ 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,
-                                                                                      @NotNull Class<V> valueClass) {
+    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,31 +78,30 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> implements
 
     @Override
     public @NotNull Map<K, V> get() {
-        if (isExpired()) { // 已过时的数据，需要重新解析一次。
-            Map<K, V> map = supplier.get();
+        if (!isExpired()) return getCachedOrDefault(supplier.get());
 
-            ConfigurationWrapper<?> section = getConfiguration().getConfigurationSection(getConfigPath());
-            if (section == null) return useOrDefault(map);
+        // 已过时的数据，需要重新解析一次。
+        Map<K, V> map = supplier.get();
 
-            Set<String> keys = section.getKeys(false);
-            if (keys.isEmpty()) return useOrDefault(map);
+        ConfigurationWrapper<?> section = getConfiguration().getConfigurationSection(getConfigPath());
+        if (section == null) 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();
-                }
+        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);
-        } else if (getCachedValue() != null) return getCachedValue();
-        else if (getDefaultValue() != null) return getDefaultValue();
-        else return supplier.get();
+        return updateCache(map);
     }
 
     @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> builder(@NotNull Class<V> valueClass) {
+    public static <V> @NotNull SectionValueBuilder<V> builderOf(@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()) { // 已过时的数据，需要重新解析一次。
-            ConfigurationWrapper<?> section = getConfiguration().getConfigurationSection(getConfigPath());
-            if (section == null) return useDefault();
-            try {
-                // 若未出现错误，则直接更新缓存并返回。
-                return updateCache(this.parser.parse(section, this.defaultValue));
-            } catch (Exception e) {
-                // 出现了解析错误，提示并返回默认值。
-                e.printStackTrace();
-                return useDefault();
-            }
-        } else return Optional.ofNullable(getCachedValue()).orElse(defaultValue);
+        if (!isExpired()) return getCachedOrDefault();
+        // 已过时的数据，需要重新解析一次。
+
+        ConfigurationWrapper<?> section = getConfiguration().getConfigurationSection(getConfigPath());
+        if (section == null) return getDefaultValue();
+
+        try {
+            // 若未出现错误，则直接更新缓存并返回。
+            return updateCache(this.parser.parse(section, this.defaultValue));
+        } catch (Exception e) {
+            // 出现了解析错误，提示并返回默认值。
+            e.printStackTrace();
+            return getDefaultValue();
+        }
+
     }
 
     @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()) { // 已过时的数据，需要重新解析一次。
-            Object value = getValue();
-            if (value == null) return useDefault(); // 获取的值不存在，直接使用默认值。
-            try {
-                // 若未出现错误，则直接更新缓存并返回。
-                return updateCache(this.parser.parse(value, this.defaultValue));
-            } catch (Exception e) {
-                // 出现了解析错误，提示并返回默认值。
-                e.printStackTrace();
-                return useDefault();
-            }
-        } else return Optional.ofNullable(getCachedValue()).orElse(defaultValue);
+        if (!isExpired()) return getCachedOrDefault();
+        // 已过时的数据，需要重新解析一次。
+
+        Object value = getValue();
+        if (value == null) return getDefaultValue(); // 获取的值不存在，直接使用默认值。
+        try {
+            // 若未出现错误，则直接更新缓存并返回。
+            return updateCache(this.parser.parse(value, this.defaultValue));
+        } catch (Exception e) {
+            // 出现了解析错误，提示并返回默认值。
+            e.printStackTrace();
+            return getDefaultValue();
+        }
+
     }
 
     @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.7.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

@@ -12,6 +12,7 @@ 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.time.temporal.ChronoUnit;
 import java.util.Objects;
 import java.util.UUID;
 
@@ -25,6 +26,8 @@ public class DemoConfiguration extends ConfigurationRoot {
     @ConfigPath(root = true)
     public static final ConfigValue<Long> TEST_NUMBER = ConfiguredValue.of(Long.class, 1000000L);
 
+    public static final ConfigValue<ChronoUnit> TEST_ENUM = ConfiguredValue.of(ChronoUnit.class, ChronoUnit.DAYS);
+
     // 支持通过 Class<?> 变量标注子配置，一并注册。
     // 注意： 若对应类也有注解，则优先使用类的注解。
     @ConfigPath("other-class-config") //支持通过注解修改子配置的主路径，若不修改则以变量名自动生成。
@@ -36,14 +39,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 +62,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/hocon/pom.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cc.carm.lib</groupId>
+        <artifactId>easyconfiguration-parent</artifactId>
+        <version>3.7.0</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <properties>
+        <maven.compiler.source>${project.jdk.version}</maven.compiler.source>
+        <maven.compiler.target>${project.jdk.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+    <artifactId>easyconfiguration-hocon</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>easyconfiguration-core</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>easyconfiguration-demo</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.typesafe</groupId>
+            <artifactId>config</artifactId>
+            <version>1.4.2</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

impl/hocon/src/main/java/cc/carm/lib/configuration/EasyConfiguration.java

@@ -0,0 +1,36 @@
+package cc.carm.lib.configuration;
+
+import cc.carm.lib.configuration.hocon.HOCONFileConfigProvider;
+
+import java.io.File;
+import java.io.IOException;
+
+public class EasyConfiguration {
+
+    private EasyConfiguration() {
+    }
+
+    public static HOCONFileConfigProvider from(File file, String source) {
+        HOCONFileConfigProvider provider = new HOCONFileConfigProvider(file);
+        try {
+            provider.initializeFile(source);
+            provider.initializeConfig();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return provider;
+    }
+
+    public static HOCONFileConfigProvider from(File file) {
+        return from(file, file.getName());
+    }
+
+    public static HOCONFileConfigProvider from(String fileName) {
+        return from(fileName, fileName);
+    }
+
+    public static HOCONFileConfigProvider from(String fileName, String source) {
+        return from(new File(fileName), source);
+    }
+
+}

impl/hocon/src/main/java/cc/carm/lib/configuration/hocon/HOCONConfigWrapper.java

@@ -0,0 +1,117 @@
+package cc.carm.lib.configuration.hocon;
+
+import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
+import cc.carm.lib.configuration.hocon.util.HOCONUtils;
+import com.typesafe.config.*;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+public class HOCONConfigWrapper implements ConfigurationWrapper<Map<String, Object>> {
+    private static final char SEPARATOR = '.';
+    protected final Map<String, Object> data;
+
+    public HOCONConfigWrapper(ConfigObject config) {
+        this.data = new LinkedHashMap<>();
+
+        config.forEach((key, value) -> {
+            Config cfg = config.toConfig();
+            ConfigValue cv = cfg.getValue(key);
+            if (cv.valueType() == ConfigValueType.OBJECT) {
+                HOCONConfigWrapper.this.data.put(key, new HOCONConfigWrapper((ConfigObject) cv));
+            } else {
+                HOCONConfigWrapper.this.data.put(key, value.unwrapped());
+            }
+        });
+    }
+
+    @Override
+    public @NotNull Map<String, Object> getSource() {
+        return this.data;
+    }
+
+    @Override
+    public @NotNull Set<String> getKeys(boolean deep) {
+        return this.getValues(deep).keySet();
+    }
+
+    @Override
+    public @NotNull Map<String, Object> getValues(boolean deep) {
+        return HOCONUtils.getKeysFromObject(this, deep, "").stream().collect(
+                LinkedHashMap::new,
+                (map, key) -> map.put(key, get(key)),
+                LinkedHashMap::putAll
+        );
+    }
+
+    @Override
+    public void set(@NotNull String path, @Nullable Object value) {
+        if (value instanceof Map) {
+            //noinspection unchecked
+            value = new HOCONConfigWrapper(ConfigFactory.parseMap((Map<String, ?>) value).root());
+        }
+
+        HOCONConfigWrapper section = HOCONUtils.getObjectOn(this, path, SEPARATOR);
+        String simplePath = HOCONUtils.getSimplePath(path, SEPARATOR);
+
+        if (value == null) {
+            section.data.remove(simplePath);
+        } else {
+            section.setDirect(simplePath, value);
+        }
+    }
+
+    /**
+     * 只能设置当前路径下的内容
+     * 避免环回
+     *
+     * @param path 路径
+     */
+    public void setDirect(@NotNull String path, @Nullable Object value) {
+        this.data.put(path, value);
+    }
+
+    @Override
+    public boolean contains(@NotNull String path) {
+        return this.get(path) != null;
+    }
+
+    @Override
+    public @Nullable Object get(@NotNull String path) {
+        HOCONConfigWrapper section = HOCONUtils.getObjectOn(this, path, SEPARATOR);
+        return section.getDirect(HOCONUtils.getSimplePath(path, SEPARATOR));
+    }
+
+    /**
+     * 只能获取当前路径下的内容
+     * 避免环回
+     *
+     * @param path 路径
+     */
+    public Object getDirect(@NotNull String path) {
+        return this.data.get(path);
+    }
+
+    @Override
+    public boolean isList(@NotNull String path) {
+        return this.get(path) instanceof List<?>;
+    }
+
+    @Override
+    public @Nullable List<?> getList(@NotNull String path) {
+        Object val = this.get(path);
+        return (val instanceof List<?>) ? (List<?>) val : null;
+    }
+
+    @Override
+    public boolean isConfigurationSection(@NotNull String path) {
+        return this.get(path) instanceof HOCONConfigWrapper;
+    }
+
+    @Override
+    public @Nullable ConfigurationWrapper<Map<String, Object>> getConfigurationSection(@NotNull String path) {
+        Object val = get(path);
+        return (val instanceof HOCONConfigWrapper) ? (HOCONConfigWrapper) val : null;
+    }
+}

impl/hocon/src/main/java/cc/carm/lib/configuration/hocon/HOCONFileConfigProvider.java

@@ -0,0 +1,106 @@
+package cc.carm.lib.configuration.hocon;
+
+import cc.carm.lib.configuration.core.ConfigInitializer;
+import cc.carm.lib.configuration.core.source.ConfigurationComments;
+import cc.carm.lib.configuration.core.source.impl.FileConfigProvider;
+import cc.carm.lib.configuration.hocon.exception.HOCONGetValueException;
+import cc.carm.lib.configuration.hocon.util.HOCONUtils;
+import com.typesafe.config.*;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.Set;
+
+public class HOCONFileConfigProvider extends FileConfigProvider<HOCONConfigWrapper> {
+    protected final @NotNull ConfigurationComments comments = new ConfigurationComments();
+    protected HOCONConfigWrapper configuration;
+    protected ConfigInitializer<HOCONFileConfigProvider> initializer;
+
+    public HOCONFileConfigProvider(@NotNull File file) {
+        super(file);
+        this.initializer = new ConfigInitializer<>(this);
+    }
+
+    public void initializeConfig() {
+        try {
+            this.configuration = new HOCONConfigWrapper(ConfigFactory.parseFile(this.file, ConfigParseOptions.defaults()
+                    .setSyntax(ConfigSyntax.CONF)
+                    .setAllowMissing(false)).root());
+        } catch (ConfigException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public @NotNull HOCONConfigWrapper getConfiguration() {
+        return this.configuration;
+    }
+
+    @Override
+    public void save() throws IOException {
+        Files.write(this.file.toPath(), HOCONUtils.renderWithComment(configuration, comments::getHeaderComment).getBytes(StandardCharsets.UTF_8));
+    }
+
+    @Override
+    protected void onReload() throws ConfigException {
+        ConfigObject conf = ConfigFactory.parseFile(this.file, ConfigParseOptions.defaults()
+                .setSyntax(ConfigSyntax.CONF)
+                .setAllowMissing(false)).root();
+        this.configuration = new HOCONConfigWrapper(conf);
+    }
+
+    @Override
+    public @NotNull ConfigurationComments getComments() {
+        return this.comments;
+    }
+
+    @Override
+    public @NotNull ConfigInitializer<HOCONFileConfigProvider> getInitializer() {
+        return this.initializer;
+    }
+
+    public String serializeValue(@NotNull String key, @NotNull Object value) {
+        // 带有 key=value 的新空对象
+        return ConfigFactory.empty()
+                .withValue(key, ConfigValueFactory.fromAnyRef(value))
+                .root().render();
+    }
+
+    public @NotNull Set<String> getKeys() {
+        return getKeys(null, true);
+    }
+
+    @Contract("null,_->!null")
+    public @Nullable Set<String> getKeys(@Nullable String sectionKey, boolean deep) {
+        if (sectionKey == null) { // 当前路径
+            return HOCONUtils.getKeysFromObject(this.configuration, deep, "");
+        }
+
+        HOCONConfigWrapper section;
+        try {
+            // 获取目标字段所在路径
+            section = (HOCONConfigWrapper) this.configuration.get(sectionKey);
+        } catch (ClassCastException e) {
+            // 值和类型不匹配
+            throw new HOCONGetValueException(e);
+        }
+        if (section == null) {
+            return null;
+        }
+        return HOCONUtils.getKeysFromObject(section, deep, "");
+    }
+
+    public @Nullable Object getValue(@NotNull String key) {
+        return this.configuration.get(key);
+    }
+
+    public @Nullable List<String> getHeaderComments(@Nullable String key) {
+        return this.comments.getHeaderComment(key);
+    }
+}

impl/hocon/src/main/java/cc/carm/lib/configuration/hocon/exception/HOCONGetValueException.java

@@ -0,0 +1,19 @@
+package cc.carm.lib.configuration.hocon.exception;
+
+public class HOCONGetValueException extends RuntimeException {
+    public HOCONGetValueException() {
+        super();
+    }
+
+    public HOCONGetValueException(String message) {
+        super(message);
+    }
+
+    public HOCONGetValueException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public HOCONGetValueException(Throwable cause) {
+        super(cause);
+    }
+}

impl/hocon/src/main/java/cc/carm/lib/configuration/hocon/util/HOCONUtils.java

@@ -0,0 +1,110 @@
+package cc.carm.lib.configuration.hocon.util;
+
+import cc.carm.lib.configuration.hocon.HOCONConfigWrapper;
+import cc.carm.lib.configuration.hocon.exception.HOCONGetValueException;
+import com.typesafe.config.*;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+public class HOCONUtils {
+
+    private HOCONUtils() {
+    }
+
+    public static String getSimplePath(String path, char separator) {
+        int index = path.lastIndexOf(separator);
+        return (index == -1) ? path : path.substring(index + 1);
+    }
+
+    public static HOCONConfigWrapper getObjectOn(@NotNull HOCONConfigWrapper parent, @NotNull String path, char separator) {
+        String currentPath = path;
+        HOCONConfigWrapper currentObject = parent;
+        int index;
+        while ((index = currentPath.indexOf(separator)) != -1) {
+            HOCONConfigWrapper previousObject = currentObject;
+            String pathName = currentPath.substring(0, index);
+            try {
+                currentObject = (HOCONConfigWrapper) previousObject.getDirect(pathName);
+            } catch (ClassCastException e) {
+                throw new HOCONGetValueException(e);
+            }
+            if (currentObject == null) {
+                currentObject = new HOCONConfigWrapper(ConfigFactory.empty().root());
+                previousObject.setDirect(pathName, currentObject);
+            }
+            currentPath = currentPath.substring(index + 1);
+        }
+
+        return currentObject;
+    }
+
+    /**
+     * 在 Object 中获取所有键
+     * 思路：在第一次执行时 prefix 应该是 ""
+     * 后续找到了更深层的键，将会变为 "deep."
+     * 下一次键名就是 "deep.key"
+     *
+     * @param parent Object
+     * @param deep   是否更深层获取
+     * @param prefix 当前 Object 键名前缀
+     * @return Object 中的所有键
+     */
+    public static Set<String> getKeysFromObject(HOCONConfigWrapper parent, boolean deep, String prefix) {
+        return parent.getSource().entrySet().stream().collect(
+                LinkedHashSet::new,
+                (set, entry) -> {
+                    Object value = entry.getValue();
+                    if (value instanceof HOCONConfigWrapper && deep) {
+                        set.addAll(HOCONUtils.getKeysFromObject((HOCONConfigWrapper) value, true, prefix + entry.getKey() + "."));
+                    } else {
+                        set.add(prefix + entry.getKey());
+                    }
+                },
+                LinkedHashSet::addAll
+        );
+    }
+
+    /**
+     * 将 Object 保存为字符串
+     * 并使用注释器打上注释
+     *
+     * @param object    Object
+     * @param commenter 注释器
+     * @return 保存的字符串
+     */
+    public static @NotNull String renderWithComment(@NotNull HOCONConfigWrapper object, @NotNull Function<String, List<String>> commenter) {
+        return HOCONUtils.makeConfigWithComment(object, "", commenter).root().render(
+                ConfigRenderOptions.defaults()
+                        .setJson(false)
+                        .setOriginComments(false)
+        );
+    }
+
+    public static @NotNull Config makeConfigWithComment(@NotNull HOCONConfigWrapper object, @NotNull String prefix, @NotNull Function<String, List<String>> commenter) {
+        Config config = ConfigFactory.empty();
+        for (Map.Entry<String, Object> entry : object.getSource().entrySet()) {
+            String key = entry.getKey();
+            String fullKey = prefix + key;
+            Object value = entry.getValue();
+            ConfigValue result;
+            if (value instanceof Iterable) {
+                result = ConfigValueFactory.fromIterable((Iterable<?>) value);
+            } else if (value instanceof HOCONConfigWrapper) {
+                result = makeConfigWithComment((HOCONConfigWrapper) value, fullKey + ".", commenter).root();
+            } else {
+                result = ConfigValueFactory.fromAnyRef(value);
+            }
+            result = result.withOrigin(
+                    ConfigOriginFactory.newSimple()
+                            .withComments(commenter.apply(fullKey))
+            );
+            config = config.withValue(key, result);
+        }
+        return config;
+    }
+}

impl/hocon/src/test/java/online/flowerinsnow/test/easyconfiguration/HOCONTest.java

@@ -0,0 +1,24 @@
+package online.flowerinsnow.test.easyconfiguration;
+
+import cc.carm.lib.configuration.EasyConfiguration;
+//import cc.carm.lib.configuration.demo.DatabaseConfiguration;
+//import cc.carm.lib.configuration.demo.tests.conf.DemoConfiguration;
+import cc.carm.lib.configuration.hocon.HOCONFileConfigProvider;
+import online.flowerinsnow.test.easyconfiguration.config.Config;
+import org.junit.Test;
+
+import java.io.File;
+
+public class HOCONTest {
+    @Test
+    public void onTest() {
+        HOCONFileConfigProvider provider = EasyConfiguration.from(new File("target/hocon.conf"));
+        provider.initialize(Config.class);
+//        provider.initialize(DatabaseConfiguration.class);
+        try {
+            provider.reload();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

impl/hocon/src/test/java/online/flowerinsnow/test/easyconfiguration/config/Config.java

@@ -0,0 +1,25 @@
+package online.flowerinsnow.test.easyconfiguration.config;
+
+import cc.carm.lib.configuration.core.ConfigurationRoot;
+import cc.carm.lib.configuration.core.annotation.HeaderComment;
+import cc.carm.lib.configuration.core.value.type.ConfiguredList;
+import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
+
+public class Config extends ConfigurationRoot {
+    @HeaderComment("测试字段 int")
+    public static final ConfiguredValue<Integer> TEST_INT = ConfiguredValue.of(Integer.class, 15);
+
+    @HeaderComment("测试字段 List<String>")
+    public static final ConfiguredList<String> TEST_LIST_STRING = ConfiguredList.of(String.class, "li", "li", "li1");
+
+    @HeaderComment("测试对象")
+    public static class TestObject extends ConfigurationRoot {
+        @HeaderComment("测试字段 Boolean")
+        public static final ConfiguredValue<Boolean> TEST_BOOLEAN = ConfiguredValue.of(Boolean.class, true);
+        @HeaderComment("inner")
+        public static class InnerObject extends ConfigurationRoot {
+            @HeaderComment("测试字段")
+            public static final ConfiguredValue<Boolean> TEST_BOOLEAN_1 = ConfiguredValue.of(Boolean.class, true);
+        }
+    }
+}

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.7.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

impl/json/src/main/java/cc/carm/lib/configuration/EasyConfiguration.java

@@ -7,6 +7,9 @@ import java.io.IOException;
 
 public class EasyConfiguration {
 
+    private EasyConfiguration() {
+    }
+
     public static JSONConfigProvider from(File file, String source) {
         JSONConfigProvider provider = new JSONConfigProvider(file);
         try {

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.7.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

impl/sql/src/main/java/cc/carm/lib/configuration/EasyConfiguration.java

@@ -1,6 +1,8 @@
 package cc.carm.lib.configuration;
 
 public class EasyConfiguration {
-
+    
+    private EasyConfiguration() {
+    }
 
 }

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.7.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.3</version>
             <scope>compile</scope>
         </dependency>
 

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

@@ -6,6 +6,9 @@ import java.io.File;
 import java.io.IOException;
 
 public class EasyConfiguration {
+    
+    private EasyConfiguration() {
+    }
 
     public static YAMLConfigProvider from(File file, String source) {
         YAMLConfigProvider provider = new YAMLConfigProvider(file);

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()) { // 已过时的数据，需要重新解析一次。
-            try {
-                // 若未出现错误，则直接更新缓存并返回。
-                return updateCache(getYAMLConfig().getSerializable(getConfigPath(), valueClass, getDefaultValue()));
-            } catch (Exception e) {
-                // 出现了解析错误，提示并返回默认值。
-                e.printStackTrace();
-                return useDefault();
-            }
-        } else return Optional.ofNullable(getCachedValue()).orElse(defaultValue);
+        if (!isExpired()) return getCachedOrDefault();
+
+        try {
+            // 若未出现错误，则直接更新缓存并返回。
+            return updateCache(getYAMLConfig().getSerializable(getConfigPath(), valueClass, getDefaultValue()));
+        } catch (Exception e) {
+            // 出现了解析错误，提示并返回默认值。
+            e.printStackTrace();
+            return getDefaultValue();
+        }
+
     }
 
     @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,13 +15,14 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyconfiguration-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.5.1</version>
+    <version>3.7.0</version>
     <modules>
         <module>core</module>
         <module>demo</module>
         <module>impl/yaml</module>
         <module>impl/json</module>
         <module>impl/sql</module>
+        <module>impl/hocon</module>
     </modules>
 
     <name>EasyConfiguration</name>
@@ -122,7 +123,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.2</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
@@ -130,7 +131,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 +151,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
+                <version>3.0.1</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <useReleaseProfile>false</useReleaseProfile>
@@ -211,7 +212,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.3.0</version>
                     <executions>
                         <execution>
                             <phase>package</phase>
@@ -225,7 +226,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.5.0</version>
                     <executions>
                         <execution>
                             <phase>package</phase>