feat(init): 支持针对于实体类的初始化 #9

README.md

@@ -30,7 +30,7 @@
 
 ### 示例代码
 
-您可以 [点击这里](impl/yaml/src/test/java/config/source/DemoConfiguration.java) 查看部分代码演示，更多演示详见 [开发介绍](.documentation/README.md) 。
+您可以 [点击这里](demo/src/main/java/cc/carm/lib/configuration/demo/DatabaseConfiguration.java) 查看部分代码演示，更多演示详见 [开发介绍](.documentation/README.md) 。
 
 ### 依赖方式
 

core/pom.xml

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

core/src/main/java/cc/carm/lib/configuration/core/ConfigInitializer.java

@@ -46,7 +46,7 @@ public class ConfigInitializer<T extends ConfigurationProvider<?>> {
      */
     public void initialize(@NotNull Class<? extends ConfigurationRoot> clazz,
                            boolean saveDefaults, boolean loadSubClasses) {
-        initializeClass(
+        initializeStaticClass(
                 clazz, null, null,
                 null, null, null,
                 saveDefaults, loadSubClasses
@@ -60,12 +60,61 @@ public class ConfigInitializer<T extends ConfigurationProvider<?>> {
         }
     }
 
-    protected void initializeClass(@NotNull Class<?> clazz,
+    /**
-                                   @Nullable String parentPath, @Nullable String fieldName,
+     * 初始化指定实例的所有 {@link ConfigValue} 与内部 {@link ConfigurationRoot} 对象。
-                                   @Nullable ConfigPath fieldPath,
+     *
-                                   @Nullable HeaderComment fieldHeaderComments,
+     * @param config 配置文件实例类，须实现 {@link ConfigurationRoot} 。
-                                   @Nullable InlineComment fieldInlineComments,
+     */
-                                   boolean saveDefaults, boolean loadSubClasses) {
+    public void initialize(@NotNull ConfigurationRoot config) {
+        initialize(config, true);
+    }
+
+    /**
+     * 初始化指定实例的所有 {@link ConfigValue} 与内部 {@link ConfigurationRoot} 对象。
+     *
+     * @param config       配置文件实例类，须实现 {@link ConfigurationRoot} 。
+     * @param saveDefaults 是否写入默认值(默认为 true)。
+     */
+    public void initialize(@NotNull ConfigurationRoot config, boolean saveDefaults) {
+        initializeInstance(
+                config, null, null,
+                null, null, null,
+                saveDefaults
+        );
+        if (saveDefaults) {
+            try {
+                provider.save();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    // 针对实例类的初始化方法
+    private void initializeInstance(@NotNull ConfigurationRoot root,
+                                    @Nullable String parentPath, @Nullable String fieldName,
+                                    @Nullable ConfigPath fieldPath,
+                                    @Nullable HeaderComment fieldHeaderComments,
+                                    @Nullable InlineComment fieldInlineComments,
+                                    boolean saveDefaults) {
+        String path = getClassPath(root.getClass(), parentPath, fieldName, fieldPath);
+        this.provider.setHeaderComment(path, getClassHeaderComments(root.getClass(), fieldHeaderComments));
+        if (path != null) this.provider.setInlineComment(path, readInlineComments(fieldInlineComments));
+
+        for (Field field : root.getClass().getDeclaredFields()) {
+            initializeField(root, field, path, saveDefaults, false);
+        }
+    }
+
+    // 针对静态类的初始化方法
+    private void initializeStaticClass(@NotNull Class<?> clazz,
+                                       @Nullable String parentPath, @Nullable String fieldName,
+                                       @Nullable ConfigPath fieldPath,
+                                       @Nullable HeaderComment fieldHeaderComments,
+                                       @Nullable InlineComment fieldInlineComments,
+                                       boolean saveDefaults, boolean loadSubClasses) {
+        if (!ConfigurationRoot.class.isAssignableFrom(clazz)) return; // 只解析继承了 ConfigurationRoot 的类
         String path = getClassPath(clazz, parentPath, fieldName, fieldPath);
         this.provider.setHeaderComment(path, getClassHeaderComments(clazz, fieldHeaderComments));
         if (path != null) this.provider.setInlineComment(path, readInlineComments(fieldInlineComments));
@@ -77,7 +126,7 @@ public class ConfigInitializer<T extends ConfigurationProvider<?>> {
         if (!loadSubClasses) return;
         Class<?>[] classes = clazz.getDeclaredClasses();
         for (int i = classes.length - 1; i >= 0; i--) {   // 逆向加载，保持顺序。
-            initializeClass(
+            initializeStaticClass(
                     classes[i], path, classes[i].getSimpleName(),
                     null, null, null,
                     saveDefaults, true
@@ -85,11 +134,12 @@ public class ConfigInitializer<T extends ConfigurationProvider<?>> {
         }
     }
 
-    private void initializeField(@NotNull Class<?> source, @NotNull Field field, @Nullable String parent,
+    private void initializeField(@NotNull Object source, @NotNull Field field,
-                                 boolean saveDefaults, boolean loadSubClasses) {
+                                 @Nullable String parent, boolean saveDefaults, boolean loadSubClasses) {
         try {
             field.setAccessible(true);
             Object object = field.get(source);
+
             if (object instanceof ConfigValue<?>) {
                 initializeValue(
                         (ConfigValue<?>) object, getFieldPath(field, parent),
@@ -97,8 +147,18 @@ public class ConfigInitializer<T extends ConfigurationProvider<?>> {
                         field.getAnnotation(InlineComment.class),
                         saveDefaults
                 );
-            } else if (object instanceof Class<?>) {
+            } else if (source instanceof ConfigurationRoot && object instanceof ConfigurationRoot) {
-                initializeClass(
+                // 当且仅当 源字段与字段 均为ConfigurationRoot实例时，才对目标字段进行下一步初始化加载。
+                initializeInstance(
+                        (ConfigurationRoot) object, parent, field.getName(),
+                        field.getAnnotation(ConfigPath.class),
+                        field.getAnnotation(HeaderComment.class),
+                        field.getAnnotation(InlineComment.class),
+                        saveDefaults
+                );
+            } else if (source instanceof Class<?> && object instanceof Class<?>) {
+                // 当且仅当 源字段与字段 均为静态类时，才对目标字段进行下一步初始化加载。
+                initializeStaticClass(
                         (Class<?>) object, parent, field.getName(),
                         field.getAnnotation(ConfigPath.class),
                         field.getAnnotation(HeaderComment.class),
@@ -106,6 +166,11 @@ public class ConfigInitializer<T extends ConfigurationProvider<?>> {
                         saveDefaults, loadSubClasses
                 );
             }
+
+            // 以上判断实现以下规范：
+            // - 实例类中仅加载 ConfigValue实例 与 ConfigurationRoot实例
+            // - 静态类中仅加载 静态ConfigValue实例 与 静态ConfigurationRoot类
+
         } catch (IllegalAccessException ignored) {
         }
     }
@@ -142,7 +207,7 @@ public class ConfigInitializer<T extends ConfigurationProvider<?>> {
         return value.length() > 0 ? value : null;
     }
 
-    protected static @Nullable String getClassPath(@NotNull Class<?> clazz,
+    protected static @Nullable String getClassPath(@Nullable Class<?> clazz,
                                                    @Nullable String parentPath,
                                                    @Nullable String filedName,
                                                    @Nullable ConfigPath fieldAnnotation) {
@@ -150,11 +215,13 @@ public class ConfigInitializer<T extends ConfigurationProvider<?>> {
         boolean fromRoot = false;
 
         // 先获取 Class 对应的路径注解 其优先度最高。
-        ConfigPath clazzAnnotation = clazz.getAnnotation(ConfigPath.class);
+        if (clazz != null) {
-        if (clazzAnnotation != null) {
+            ConfigPath clazzAnnotation = clazz.getAnnotation(ConfigPath.class);
-            fromRoot = clazzAnnotation.root();
+            if (clazzAnnotation != null) {
-            if (clazzAnnotation.value().length() > 0) {
+                fromRoot = clazzAnnotation.root();
-                return (fromRoot ? "" : parent) + clazzAnnotation.value();
+                if (clazzAnnotation.value().length() > 0) {
+                    return (fromRoot ? "" : parent) + clazzAnnotation.value();
+                }
             }
         }
 

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

@@ -53,18 +53,20 @@ public interface ConfigValueParser<T, R> {
 
             if (Number.class.isAssignableFrom(valueClass)) {
                 if (Long.class.isAssignableFrom(valueClass)) {
-                    input = longValue().parse(input, null);
+                    input = longValue().parse(input, (Long) defaultValue);
                 } else if (Integer.class.isAssignableFrom(valueClass)) {
-                    input = intValue().parse(input, null);
+                    input = intValue().parse(input, (Integer) defaultValue);
                 } else if (Float.class.isAssignableFrom(valueClass)) {
-                    input = floatValue().parse(input, null);
+                    input = floatValue().parse(input, (Float) defaultValue);
                 } else if (Double.class.isAssignableFrom(valueClass)) {
-                    input = doubleValue().parse(input, null);
+                    input = doubleValue().parse(input, (Double) defaultValue);
                 } else if (Byte.class.isAssignableFrom(valueClass)) {
-                    input = byteValue().parse(input, null);
+                    input = byteValue().parse(input, (Byte) defaultValue);
                 } else if (Short.class.isAssignableFrom(valueClass)) {
-                    input = shortValue().parse(input, null);
+                    input = shortValue().parse(input, (Short) defaultValue);
                 }
+            } else if (Boolean.class.isAssignableFrom(valueClass)) {
+                input = booleanValue().parse(input, (Boolean) defaultValue);
             }
 
             if (valueClass.isInstance(input)) return valueClass.cast(input);

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

@@ -2,6 +2,8 @@ package cc.carm.lib.configuration.core.source;
 
 import cc.carm.lib.configuration.core.ConfigInitializer;
 import cc.carm.lib.configuration.core.ConfigurationRoot;
+import cc.carm.lib.configuration.core.value.ConfigValue;
+import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
@@ -17,23 +19,54 @@ public abstract class ConfigurationProvider<W extends ConfigurationWrapper<?>> {
         this.updateTime = System.currentTimeMillis();
     }
 
+    /**
+     * 得到配置文件的更新(最后加载)时间。
+     *
+     * @return 更新时间
+     */
     public long getUpdateTime() {
         return updateTime;
     }
 
+    /**
+     * 用于 {@link CachedConfigValue} 判断缓存值是否过期(即缓存的时间早于配置文件的最后加载时间)。
+     *
+     * @param time 缓存值时的时间戳
+     * @return 缓存值是否过期
+     */
     public boolean isExpired(long time) {
         return getUpdateTime() > time;
     }
 
+    /**
+     * 得到配置文件的原生功能类。
+     *
+     * @return 原生类
+     */
     public abstract @NotNull W getConfiguration();
 
+    /**
+     * 重载当前配置文件。(将不会保存已修改的内容)
+     *
+     * @throws Exception 当重载出现错误时抛出
+     */
     public void reload() throws Exception {
         onReload(); // 调用重写的Reload方法
         this.updateTime = System.currentTimeMillis();
     }
 
+    /**
+     * 将当前对配置文件的更改进行保存。
+     *
+     * @throws Exception 当保存出现错误时抛出
+     */
     public abstract void save() throws Exception;
 
+    /**
+     * 针对于不同配置文件类型所执行的重载操作。
+     *
+     * @throws Exception 当操作出现错误时抛出。
+     */
     protected abstract void onReload() throws Exception;
 
     public abstract @Nullable ConfigurationComments getComments();
@@ -60,16 +93,53 @@ public abstract class ConfigurationProvider<W extends ConfigurationWrapper<?>> {
 
     public abstract @NotNull ConfigInitializer<? extends ConfigurationProvider<W>> getInitializer();
 
+    /**
+     * 初始化指定类以及其子类的所有 {@link ConfigValue} 对象。
+     *
+     * @param configClazz 配置文件类，须继承于 {@link ConfigurationRoot} 。
+     */
     public void initialize(Class<? extends ConfigurationRoot> configClazz) {
         initialize(configClazz, true);
     }
 
+    /**
+     * 初始化指定类以及其子类的所有 {@link ConfigValue} 对象。
+     *
+     * @param configClazz  配置文件类，须继承于 {@link ConfigurationRoot} 。
+     * @param saveDefaults 是否写入默认值(默认为 true)。
+     */
     public void initialize(Class<? extends ConfigurationRoot> configClazz, boolean saveDefaults) {
-        getInitializer().initialize(configClazz, saveDefaults);
+        this.getInitializer().initialize(configClazz, saveDefaults);
     }
 
+    /**
+     * 初始化指定类的所有 {@link ConfigValue} 对象。
+     *
+     * @param configClazz    配置文件类，须继承于 {@link ConfigurationRoot} 。
+     * @param saveDefaults   是否写入默认值(默认为 true)。
+     * @param loadSubClasses 是否加载内部子类(默认为 true)。
+     */
     public void initialize(Class<? extends ConfigurationRoot> configClazz, boolean saveDefaults, boolean loadSubClasses) {
-        getInitializer().initialize(configClazz, saveDefaults, loadSubClasses);
+        this.getInitializer().initialize(configClazz, saveDefaults, loadSubClasses);
+    }
+
+    /**
+     * 初始化指定实例的所有 {@link ConfigValue} 与内部 {@link ConfigurationRoot} 对象。
+     *
+     * @param config 配置文件实例类，须实现 {@link ConfigurationRoot} 。
+     */
+    public void initialize(@NotNull ConfigurationRoot config) {
+        this.getInitializer().initialize(config, true);
+    }
+
+    /**
+     * 初始化指定实例的所有 {@link ConfigValue} 与内部 {@link ConfigurationRoot} 对象。
+     *
+     * @param config       配置文件实例类，须实现 {@link ConfigurationRoot} 。
+     * @param saveDefaults 是否写入默认值(默认为 true)。
+     */
+    public void initialize(@NotNull ConfigurationRoot config, boolean saveDefaults) {
+        this.getInitializer().initialize(config, saveDefaults);
     }
 
 }

core/src/test/java/cc/carm/test/config/offset/FieldOffset.java

@@ -1,4 +1,4 @@
-package config.offset;
+package cc.carm.test.config.offset;
 
 import org.jetbrains.annotations.NotNull;
 

demo/pom.xml

@@ -0,0 +1,31 @@
+<?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">
+    <parent>
+        <artifactId>easyconfiguration-parent</artifactId>
+        <groupId>cc.carm.lib</groupId>
+        <version>3.3.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <properties>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+    </properties>
+    <artifactId>easyconfiguration-demo</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>easyconfiguration-core</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

demo/src/main/java/cc/carm/lib/configuration/demo/DatabaseConfiguration.java

@@ -1,4 +1,4 @@
-package config.source;
+package cc.carm.lib.configuration.demo;
 
 import cc.carm.lib.configuration.core.ConfigurationRoot;
 import cc.carm.lib.configuration.core.annotation.ConfigPath;
@@ -12,7 +12,8 @@ public class DatabaseConfiguration extends ConfigurationRoot {
     @ConfigPath("driver")
     @HeaderComment({
             "数据库驱动配置，请根据数据库类型设置。",
-            "- MySQL: com.mysql.cj.jdbc.Driver",
+            "- MySQL(旧): com.mysql.jdbc.Driver",
+            "- MySQL(新): com.mysql.cj.jdbc.Driver",
             "- MariaDB(推荐): org.mariadb.jdbc.Driver",
     })
     protected static final ConfigValue<String> DRIVER_NAME = ConfiguredValue.of(

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

@@ -0,0 +1,78 @@
+package cc.carm.lib.configuration.demo.tests;
+
+import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import cc.carm.lib.configuration.demo.tests.model.TestModel;
+import cc.carm.lib.configuration.demo.tests.conf.DemoConfiguration;
+import cc.carm.lib.configuration.demo.tests.conf.TestConfiguration;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class ConfigurationTest {
+
+    public static void testDemo(ConfigurationProvider<?> provider) {
+        provider.initialize(DemoConfiguration.class);
+
+        System.out.println("----------------------------------------------------");
+
+        System.out.println("Test Number: ");
+
+        System.out.println("before: " + DemoConfiguration.TEST_NUMBER.get());
+        DemoConfiguration.TEST_NUMBER.set((long) (Long.MAX_VALUE * Math.random()));
+        System.out.println("after: " + DemoConfiguration.TEST_NUMBER.get());
+
+        System.out.println("> Test Value:");
+        System.out.println("before: " + DemoConfiguration.Sub.UUID_CONFIG_VALUE.get());
+        DemoConfiguration.Sub.UUID_CONFIG_VALUE.set(UUID.randomUUID());
+        System.out.println("after: " + DemoConfiguration.Sub.UUID_CONFIG_VALUE.get());
+
+        System.out.println("> Test List:");
+        DemoConfiguration.Sub.That.OPERATORS.getNotNull().forEach(System.out::println);
+        List<UUID> operators = IntStream.range(0, 5).mapToObj(i -> UUID.randomUUID()).collect(Collectors.toList());
+        DemoConfiguration.Sub.That.OPERATORS.set(operators);
+
+        System.out.println("> Test Section:");
+        System.out.println(DemoConfiguration.MODEL_TEST.get());
+        DemoConfiguration.MODEL_TEST.set(TestModel.random());
+
+        System.out.println("> Test Maps:");
+        DemoConfiguration.USERS.getNotNull().forEach((k, v) -> System.out.println(k + ": " + v));
+        LinkedHashMap<Integer, UUID> data = new LinkedHashMap<>();
+        for (int i = 1; i <= 5; i++) {
+            data.put(i, UUID.randomUUID());
+        }
+        DemoConfiguration.USERS.set(data);
+        System.out.println("----------------------------------------------------");
+    }
+
+    public static void testInner(ConfigurationProvider<?> provider) {
+
+        TestConfiguration TEST = new TestConfiguration();
+
+        provider.initialize(TEST, true);
+
+        System.out.println("> Test Inner value before:");
+        System.out.println(TEST.INNER.INNER_VALUE.getNotNull());
+
+        double after = Math.random() * 200D;
+        System.out.println("> Test Inner value -> " + after);
+        TEST.INNER.INNER_VALUE.set(after);
+
+        System.out.println("> Test Inner value after:");
+        System.out.println(TEST.INNER.INNER_VALUE.getNotNull());
+
+    }
+
+    public static void save(ConfigurationProvider<?> provider) {
+        try {
+            provider.save();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+}

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

@@ -1,4 +1,4 @@
-package config.source;
+package cc.carm.lib.configuration.demo.tests.conf;
 
 import cc.carm.lib.configuration.core.ConfigInitializer;
 import cc.carm.lib.configuration.core.ConfigurationRoot;
@@ -10,7 +10,7 @@ import cc.carm.lib.configuration.core.value.type.ConfiguredList;
 import cc.carm.lib.configuration.core.value.type.ConfiguredMap;
 import cc.carm.lib.configuration.core.value.type.ConfiguredSection;
 import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
-import config.model.TestModel;
+import cc.carm.lib.configuration.demo.tests.model.TestModel;
 
 import java.util.List;
 import java.util.Map;
@@ -32,14 +32,10 @@ public class DemoConfiguration extends ConfigurationRoot {
 
     // 支持通过 Class<?> 变量标注子配置，一并注册。
     // 注意： 若对应类也有注解，则优先使用类的注解。
-    @ConfigPath("impl-test") //支持通过注解修改子配置的主路径，若不修改则以变量名自动生成。
+    @ConfigPath("other-class-config") //支持通过注解修改子配置的主路径，若不修改则以变量名自动生成。
     @HeaderComment({"", "Something..."}) // 支持给子路径直接打注释
     @InlineComment("InlineComments for class path")
-    public static final Class<?> IMPL = ImplConfiguration.class;
+    public static final Class<?> OTHER = OtherConfiguration.class;
-
-    // 子配置文件
-    @ConfigPath("database")
-    public static final Class<?> DB_CONFIG = DatabaseConfiguration.class;
 
     @ConfigPath("user") // 通过注解规定配置文件中的路径，若不进行注解则以变量名自动生成。
     @HeaderComment({"", "Section类型数据测试"}) // 通过注解给配置添加注释。
@@ -79,7 +75,6 @@ public class DemoConfiguration extends ConfigurationRoot {
                     .build();
 
         }
-
     }
 
 

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

@@ -0,0 +1,4 @@
+package cc.carm.lib.configuration.demo.tests.conf;
+
+public class OtherConfiguration {
+}

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

@@ -0,0 +1,30 @@
+package cc.carm.lib.configuration.demo.tests.conf;
+
+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.annotation.InlineComment;
+import cc.carm.lib.configuration.core.value.ConfigValue;
+import cc.carm.lib.configuration.core.value.type.ConfiguredSection;
+import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
+import cc.carm.lib.configuration.demo.tests.model.TestModel;
+
+import java.util.UUID;
+
+public class TestConfiguration extends ConfigurationRoot {
+
+    public final TestInnerConfiguration INNER = new TestInnerConfiguration();
+
+    public final ConfigValue<Double> CLASS_VALUE = ConfiguredValue.of(Double.class, 1.0D);
+
+    @ConfigPath("test.user") // 通过注解规定配置文件中的路径，若不进行注解则以变量名自动生成。
+    @HeaderComment({"", "Section类型数据测试"}) // 通过注解给配置添加注释。
+    @InlineComment("Section数据也支持InlineComment注释")
+    public final ConfigValue<TestModel> TEST_MODEL = ConfiguredSection
+            .builder(TestModel.class)
+            .defaults(new TestModel("Carm", UUID.randomUUID()))
+            .parseValue((section, defaultValue) -> TestModel.deserialize(section))
+            .serializeValue(TestModel::serialize).build();
+
+
+}

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

@@ -0,0 +1,13 @@
+package cc.carm.lib.configuration.demo.tests.conf;
+
+import cc.carm.lib.configuration.core.ConfigurationRoot;
+import cc.carm.lib.configuration.core.annotation.HeaderComment;
+import cc.carm.lib.configuration.core.value.ConfigValue;
+import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
+
+@HeaderComment("Inner Test")
+public class TestInnerConfiguration extends ConfigurationRoot {
+
+    public final ConfigValue<Double> INNER_VALUE = ConfiguredValue.of(Double.class, 1.0D);
+
+}

demo/src/main/java/cc/carm/lib/configuration/demo/tests/model/AbstractModel.java

@@ -1,4 +1,4 @@
-package config.model;
+package cc.carm.lib.configuration.demo.tests.model;
 
 import org.jetbrains.annotations.NotNull;
 

demo/src/main/java/cc/carm/lib/configuration/demo/tests/model/TestModel.java

@@ -1,4 +1,4 @@
-package config.model;
+package cc.carm.lib.configuration.demo.tests.model;
 
 import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
 import org.jetbrains.annotations.NotNull;

impl/json/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -27,6 +27,13 @@
             <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.google.code.gson</groupId>
             <artifactId>gson</artifactId>

impl/json/src/test/java/config/JSONConfigTest.java

@@ -1,67 +1,28 @@
 package config;
 
 import cc.carm.lib.configuration.EasyConfiguration;
+import cc.carm.lib.configuration.demo.tests.ConfigurationTest;
 import cc.carm.lib.configuration.json.JSONConfigProvider;
-import config.model.TestModel;
-import config.source.DemoConfiguration;
 import org.junit.Test;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
 public class JSONConfigTest {
 
-    protected final JSONConfigProvider provider = EasyConfiguration.from("target/config.yml", "config.yml");
+    protected final JSONConfigProvider provider = EasyConfiguration.from("target/config.json", "config.json");
 
 
     @Test
     public void onTest() {
 
-        provider.initialize(DemoConfiguration.class);
+        ConfigurationTest.testDemo(this.provider);
+        ConfigurationTest.testInner(this.provider);
 
-        testDemo();
         System.out.println("----------------------------------------------------");
         provider.getConfiguration().getValues(true).forEach((k, v) -> System.out.println(k + ": " + v));
         System.out.println("----------------------------------------------------");
         provider.getConfiguration().getValues(false).forEach((k, v) -> System.out.println(k + ": " + v));
         System.out.println("----------------------------------------------------");
-
+        
-        try {
+        ConfigurationTest.save(this.provider);
-            provider.save();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public static void testDemo() {
-        System.out.println("----------------------------------------------------");
-
-        System.out.println("> Test Value:");
-        System.out.println("before: " + DemoConfiguration.Sub.UUID_CONFIG_VALUE.get());
-        DemoConfiguration.Sub.UUID_CONFIG_VALUE.set(UUID.randomUUID());
-        System.out.println("after: " + DemoConfiguration.Sub.UUID_CONFIG_VALUE.get());
-
-        System.out.println("> Test List:");
-        DemoConfiguration.Sub.That.OPERATORS.getNotNull().forEach(System.out::println);
-        List<UUID> operators = IntStream.range(0, 5).mapToObj(i -> UUID.randomUUID()).collect(Collectors.toList());
-        DemoConfiguration.Sub.That.OPERATORS.set(operators);
-
-        System.out.println("> Test Section:");
-        System.out.println(DemoConfiguration.MODEL_TEST.get());
-        DemoConfiguration.MODEL_TEST.set(TestModel.random());
-
-        System.out.println("> Test Maps:");
-        DemoConfiguration.USERS.getNotNull().forEach((k, v) -> System.out.println(k + ": " + v));
-        LinkedHashMap<Integer, UUID> data = new LinkedHashMap<>();
-        for (int i = 1; i <= 5; i++) {
-            data.put(i, UUID.randomUUID());
-        }
-        DemoConfiguration.USERS.set(data);
-        System.out.println("----------------------------------------------------");
     }
 
 

impl/json/src/test/java/config/model/SomeModel.java

@@ -1,39 +0,0 @@
-package config.model;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.TestOnly;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class SomeModel extends AbstractModel {
-
-    public final int num;
-
-    public SomeModel(@NotNull String name, int num) {
-        super(name);
-        this.num = num;
-    }
-
-    @Override
-    public String toString() {
-        return "SomeModel{" +
-                "name='" + name + '\'' +
-                ", num=" + num +
-                '}';
-    }
-
-    public @NotNull Map<String, Object> serialize() {
-        Map<String, Object> map = new HashMap<>();
-        map.put("name", name);
-        map.put("num", num);
-        return map;
-    }
-
-    @TestOnly
-    public static SomeModel deserialize(Map<String, ?> args) {
-        return new SomeModel((String) args.get("name"), (Integer) args.get("num"));
-    }
-
-
-}

impl/json/src/test/java/config/source/DatabaseConfiguration.java

@@ -1,30 +0,0 @@
-package config.source;
-
-import cc.carm.lib.configuration.core.ConfigurationRoot;
-import cc.carm.lib.configuration.core.annotation.HeaderComment;
-import cc.carm.lib.configuration.core.annotation.ConfigPath;
-import cc.carm.lib.configuration.core.value.ConfigValue;
-import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
-
-@HeaderComment({"数据库配置", "  用于提供数据库连接，进行数据库操作。"})
-public class DatabaseConfiguration extends ConfigurationRoot {
-
-    @ConfigPath("driver")
-    protected static final ConfigValue<String> DRIVER_NAME = ConfiguredValue.of(
-            String.class, "com.mysql.cj.jdbc.Driver"
-    );
-
-    protected static final ConfigValue<String> HOST = ConfiguredValue.of(String.class, "127.0.0.1");
-    protected static final ConfigValue<Integer> PORT = ConfiguredValue.of(Integer.class, 3306);
-
-    protected static final ConfigValue<String> DATABASE = ConfiguredValue.of(String.class, "minecraft");
-    protected static final ConfigValue<String> USERNAME = ConfiguredValue.of(String.class, "root");
-    protected static final ConfigValue<String> PASSWORD = ConfiguredValue.of(String.class, "password");
-
-    protected static final ConfigValue<String> EXTRA = ConfiguredValue.of(String.class, "?useSSL=false");
-
-    protected static String buildJDBC() {
-        return String.format("jdbc:mysql://%s:%s/%s%s", HOST.get(), PORT.get(), DATABASE.get(), EXTRA.get());
-    }
-
-}

impl/json/src/test/java/config/source/DemoConfiguration.java

@@ -1,65 +0,0 @@
-package config.source;
-
-import cc.carm.lib.configuration.core.ConfigurationRoot;
-import cc.carm.lib.configuration.core.annotation.ConfigPath;
-import cc.carm.lib.configuration.core.value.ConfigValue;
-import cc.carm.lib.configuration.core.value.type.ConfiguredList;
-import cc.carm.lib.configuration.core.value.type.ConfiguredMap;
-import cc.carm.lib.configuration.core.value.type.ConfiguredSection;
-import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
-import config.model.TestModel;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-
-public class DemoConfiguration extends ConfigurationRoot {
-
-    @ConfigPath(root = true)
-    protected static final ConfigValue<Double> VERSION = ConfiguredValue.of(Double.class, 1.0D);
-
-    // 可以直接写静态内部类，并通过 Class<?> 声明。
-    public static final Class<?> SUB_TEST = Sub.class;
-
-    @ConfigPath("user") // 通过注解规定配置文件中的路径，若不进行注解则以变量名自动生成。
-    public static final ConfigValue<TestModel> MODEL_TEST = ConfiguredSection
-            .builder(TestModel.class)
-            .defaults(new TestModel("Carm", UUID.randomUUID()))
-            .parseValue((section, defaultValue) -> TestModel.deserialize(section))
-            .serializeValue(TestModel::serialize).build();
-
-    // 子配置文件
-    @ConfigPath("database")
-    public static final Class<?> DB_CONFIG = DatabaseConfiguration.class;
-
-    public static final ConfigValue<Map<Integer, UUID>> USERS = ConfiguredMap
-            .builder(Integer.class, UUID.class).fromString()
-            .parseKey(Integer::parseInt)
-            .parseValue(v -> Objects.requireNonNull(UUID.fromString(v)))
-            .build();
-
-
-    public static class Sub extends ConfigurationRoot {
-
-        @ConfigPath(value = "uuid-value", root = true)
-        public static final ConfigValue<UUID> UUID_CONFIG_VALUE = ConfiguredValue
-                .builder(UUID.class).fromString()
-                .parseValue((data, defaultValue) -> UUID.fromString(data))
-                .build();
-
-        public static final Class<?> NOTHING = That.class;
-
-        public static class That extends ConfigurationRoot {
-
-            public static final ConfigValue<List<UUID>> OPERATORS = ConfiguredList
-                    .builder(UUID.class).fromString()
-                    .parseValue(s -> Objects.requireNonNull(UUID.fromString(s)))
-                    .build();
-
-        }
-
-    }
-
-
-}

impl/sql/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.2.1</version>
+        <version>3.3.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.2.1</version>
+        <version>3.3.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -28,6 +28,13 @@
             <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>org.bspfsystems</groupId>
             <artifactId>yamlconfiguration</artifactId>

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

@@ -1,85 +1,45 @@
 package config;
 
 import cc.carm.lib.configuration.EasyConfiguration;
+import cc.carm.lib.configuration.demo.tests.ConfigurationTest;
+import cc.carm.lib.configuration.demo.tests.model.AbstractModel;
 import cc.carm.lib.configuration.yaml.YAMLConfigProvider;
-import config.model.AbstractModel;
+import config.model.AnyModel;
 import config.model.SomeModel;
-import config.model.TestModel;
+import config.source.ModelConfiguration;
-import config.source.DemoConfiguration;
-import config.source.ImplConfiguration;
 import org.bspfsystems.yamlconfiguration.serialization.ConfigurationSerialization;
 import org.junit.Test;
 
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
 public class DemoConfigTest {
 
     static {
-        ConfigurationSerialization.registerClass(TestModel.class);
         ConfigurationSerialization.registerClass(SomeModel.class);
+        ConfigurationSerialization.registerClass(AnyModel.class);
     }
 
     protected final YAMLConfigProvider provider = EasyConfiguration.from("target/config.yml", "config.yml");
 
     @Test
     public void onTest() {
-        provider.initialize(DemoConfiguration.class);
+        ConfigurationTest.testDemo(this.provider);
+        ConfigurationTest.testInner(this.provider);
 
-        testDemo();
+        testSerialization(this.provider);
-        testSerialization();
-
-        try {
-            provider.save();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
 
+        ConfigurationTest.save(this.provider);
     }
 
 
-    public static void testDemo() {
+    public static void testSerialization(YAMLConfigProvider provider) {
+        provider.initialize(ModelConfiguration.class);
         System.out.println("----------------------------------------------------");
 
-        System.out.println("Test Number: ");
+        AbstractModel someModel = ModelConfiguration.SOME_MODEL.get();
+        if (someModel != null) System.out.println(someModel.getName());
 
-        System.out.println("before: " + DemoConfiguration.TEST_NUMBER.get());
+        AbstractModel anyModel = ModelConfiguration.ANY_MODEL.get();
-        DemoConfiguration.TEST_NUMBER.set((long) (Long.MAX_VALUE * Math.random()));
+        if (anyModel != null) System.out.println(anyModel.getName());
-        System.out.println("after: " + DemoConfiguration.TEST_NUMBER.get());
 
-        System.out.println("> Test Value:");
-        System.out.println("before: " + DemoConfiguration.Sub.UUID_CONFIG_VALUE.get());
-        DemoConfiguration.Sub.UUID_CONFIG_VALUE.set(UUID.randomUUID());
-        System.out.println("after: " + DemoConfiguration.Sub.UUID_CONFIG_VALUE.get());
-
-        System.out.println("> Test List:");
-        DemoConfiguration.Sub.That.OPERATORS.getNotNull().forEach(System.out::println);
-        List<UUID> operators = IntStream.range(0, 5).mapToObj(i -> UUID.randomUUID()).collect(Collectors.toList());
-        DemoConfiguration.Sub.That.OPERATORS.set(operators);
-
-        System.out.println("> Test Section:");
-        System.out.println(DemoConfiguration.MODEL_TEST.get());
-        DemoConfiguration.MODEL_TEST.set(TestModel.random());
-
-        System.out.println("> Test Maps:");
-        DemoConfiguration.USERS.getNotNull().forEach((k, v) -> System.out.println(k + ": " + v));
-        LinkedHashMap<Integer, UUID> data = new LinkedHashMap<>();
-        for (int i = 1; i <= 5; i++) {
-            data.put(i, UUID.randomUUID());
-        }
-        DemoConfiguration.USERS.set(data);
-        System.out.println("----------------------------------------------------");
-    }
-
-    public static void testSerialization() {
-        System.out.println("----------------------------------------------------");
-        AbstractModel model = ImplConfiguration.TEST.get();
-        if (model != null) {
-            System.out.println(model.getName());
-        }
         System.out.println("----------------------------------------------------");
     }
 

impl/yaml/src/test/java/config/model/AbstractModel.java

@@ -1,17 +0,0 @@
-package config.model;
-
-import org.bspfsystems.yamlconfiguration.serialization.ConfigurationSerializable;
-import org.jetbrains.annotations.NotNull;
-
-public abstract class AbstractModel implements ConfigurationSerializable {
-
-    protected final @NotNull String name;
-
-    public AbstractModel(@NotNull String name) {
-        this.name = name;
-    }
-
-    public @NotNull String getName() {
-        return name;
-    }
-}

impl/yaml/src/test/java/config/model/AnyModel.java

@@ -0,0 +1,50 @@
+package config.model;
+
+import cc.carm.lib.configuration.demo.tests.model.AbstractModel;
+import org.bspfsystems.yamlconfiguration.serialization.ConfigurationSerializable;
+import org.bspfsystems.yamlconfiguration.serialization.SerializableAs;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.TestOnly;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+@SerializableAs("AnyModel")
+public class AnyModel extends AbstractModel implements ConfigurationSerializable {
+
+    public final boolean bool;
+
+    public AnyModel(@NotNull String name, boolean bool) {
+        super(name);
+        this.bool = bool;
+    }
+
+    @Override
+    public String toString() {
+        return "AnyModel{" +
+                "name='" + name + '\'' +
+                ", bool=" + bool +
+                '}';
+    }
+
+    @Override
+    public @NotNull Map<String, Object> serialize() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("name", name);
+        map.put("state", bool);
+        return map;
+    }
+
+    public static AnyModel random() {
+        return new AnyModel(UUID.randomUUID().toString().substring(0, 5), Math.random() > 0.5);
+    }
+
+
+    @TestOnly
+    public static AnyModel deserialize(Map<String, ?> args) {
+        return new AnyModel((String) args.get("name"), (Boolean) args.get("state"));
+    }
+
+
+}

impl/yaml/src/test/java/config/model/SomeModel.java

@@ -1,5 +1,6 @@
 package config.model;
 
+import cc.carm.lib.configuration.demo.tests.model.AbstractModel;
 import org.bspfsystems.yamlconfiguration.serialization.ConfigurationSerializable;
 import org.bspfsystems.yamlconfiguration.serialization.SerializableAs;
 import org.jetbrains.annotations.NotNull;
@@ -7,6 +8,7 @@ import org.jetbrains.annotations.TestOnly;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 @SerializableAs("SomeModel")
 public class SomeModel extends AbstractModel implements ConfigurationSerializable {
@@ -34,6 +36,11 @@ public class SomeModel extends AbstractModel implements ConfigurationSerializabl
         return map;
     }
 
+    public static SomeModel random() {
+        return new SomeModel(UUID.randomUUID().toString().substring(0, 5), (int) (Math.random() * 1000));
+    }
+
+
     @TestOnly
     public static SomeModel deserialize(Map<String, ?> args) {
         return new SomeModel((String) args.get("name"), (Integer) args.get("num"));

impl/yaml/src/test/java/config/model/TestModel.java

@@ -1,72 +0,0 @@
-package config.model;
-
-import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
-import org.bspfsystems.yamlconfiguration.serialization.ConfigurationSerializable;
-import org.bspfsystems.yamlconfiguration.serialization.SerializableAs;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.TestOnly;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-@SerializableAs("TestModel")
-public class TestModel extends AbstractModel implements ConfigurationSerializable {
-
-    public UUID uuid;
-
-    public TestModel(String name, UUID uuid) {
-        super(name);
-        this.uuid = uuid;
-    }
-
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
-    }
-
-    public UUID getUuid() {
-        return uuid;
-    }
-
-    @Override
-    public @NotNull Map<String, Object> serialize() {
-        Map<String, Object> map = new HashMap<>();
-        map.put("name", name);
-        Map<String, Object> map2 = new HashMap<>();
-        map2.put("uuid", uuid.toString());
-        map.put("info", map2);
-        return map;
-    }
-
-    public static TestModel deserialize(ConfigurationWrapper<?> section) {
-        String name = section.getString("name");
-        if (name == null) throw new NullPointerException("name is null");
-        String uuidString = section.getString("info.uuid");
-        if (uuidString == null) throw new NullPointerException("uuid is null");
-        return new TestModel(name, UUID.fromString(uuidString));
-    }
-
-    @TestOnly
-    @SuppressWarnings("unchecked")
-    public static TestModel deserialize(Map<String, ?> args) {
-        String name = (String) args.get("name");
-        if (name == null) throw new NullPointerException("name is null");
-        Map<String, ?> map = (Map<String, ?>) args.get("info");
-        String uuidString = (String) map.get("uuid");
-        if (uuidString == null) throw new NullPointerException("uuid is null");
-        return new TestModel(name, UUID.fromString(uuidString));
-    }
-
-    public static TestModel random() {
-        return new TestModel(UUID.randomUUID().toString().substring(0, 5), UUID.randomUUID());
-    }
-
-
-    @Override
-    public String toString() {
-        return "TestUser{" +
-                "name='" + name + '\'' +
-                ", uuid=" + uuid +
-                '}';
-    }
-}

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

@@ -1,18 +0,0 @@
-package config.source;
-
-import cc.carm.lib.configuration.core.ConfigurationRoot;
-import cc.carm.lib.configuration.core.annotation.ConfigPath;
-import cc.carm.lib.configuration.core.value.ConfigValue;
-import cc.carm.lib.configuration.yaml.value.ConfiguredSerializable;
-import config.model.AbstractModel;
-import config.model.TestModel;
-
-@ConfigPath(root = true)
-public class ImplConfiguration extends ConfigurationRoot {
-
-    public static final ConfigValue<? extends AbstractModel> TEST = ConfiguredSerializable.of(
-            TestModel.class, TestModel.random()
-    );
-
-
-}

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

@@ -0,0 +1,22 @@
+package config.source;
+
+import cc.carm.lib.configuration.core.ConfigurationRoot;
+import cc.carm.lib.configuration.core.annotation.ConfigPath;
+import cc.carm.lib.configuration.core.value.ConfigValue;
+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;
+
+@ConfigPath("model-test")
+public class ModelConfiguration extends ConfigurationRoot {
+
+    public static final ConfigValue<? extends AbstractModel> SOME_MODEL = ConfiguredSerializable.of(
+            SomeModel.class, SomeModel.random()
+    );
+
+    public static final ConfigValue<? extends AbstractModel> ANY_MODEL = ConfiguredSerializable.of(
+            AnyModel.class, AnyModel.random()
+    );
+
+}

pom.xml

@@ -15,12 +15,13 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyconfiguration-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.2.1</version>
+    <version>3.3.0</version>
     <modules>
         <module>core</module>
         <module>impl/yaml</module>
         <module>impl/json</module>
         <module>impl/sql</module>
+        <module>demo</module>
     </modules>
 
     <name>EasyConfiguration</name>