fix(parse): 修复Number基础类型转型丢失的问题。 fix #17

Bumps [yamlconfiguration](https://github.com/bspfsystems/YamlConfiguration) from 1.2.2 to 1.3.0.
- [Release notes](https://github.com/bspfsystems/YamlConfiguration/releases)
- [Commits](https://github.com/bspfsystems/YamlConfiguration/compare/v1.2.2...v1.3.0)

---
updated-dependencies:
- dependency-name: org.bspfsystems:yamlconfiguration
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

core/pom.xml

@@ -5,12 +5,14 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.1.0</version>
+        <version>3.2.1</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-core</artifactId>

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

@@ -19,7 +19,7 @@ public class ConfigValueBuilder<V> {
         return fromSection(ConfigValueParser.required(), ConfigDataFunction.required());
     }
 
-    public @NotNull SectionValueBuilder<V> fromSection(@NotNull ConfigValueParser<ConfigurationWrapper, V> valueParser,
+    public @NotNull SectionValueBuilder<V> fromSection(@NotNull ConfigValueParser<ConfigurationWrapper<?>, V> valueParser,
                                                        @NotNull ConfigDataFunction<V, ? extends Map<String, Object>> valueSerializer) {
         return new SectionValueBuilder<>(this.valueClass, valueParser, valueSerializer);
     }

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

@@ -15,11 +15,11 @@ public class SectionValueBuilder<V>
 
     protected final @NotNull Class<V> valueClass;
 
-    protected @NotNull ConfigValueParser<ConfigurationWrapper, V> parser;
+    protected @NotNull ConfigValueParser<ConfigurationWrapper<?>, V> parser;
     protected @NotNull ConfigDataFunction<V, ? extends Map<String, Object>> serializer;
 
     public SectionValueBuilder(@NotNull Class<V> valueClass,
-                               @NotNull ConfigValueParser<ConfigurationWrapper, V> parser,
+                               @NotNull ConfigValueParser<ConfigurationWrapper<?>, V> parser,
                                @NotNull ConfigDataFunction<V, ? extends Map<String, Object>> serializer) {
         this.valueClass = valueClass;
         this.parser = parser;
@@ -32,7 +32,7 @@ public class SectionValueBuilder<V>
         return this;
     }
 
-    public @NotNull SectionValueBuilder<V> parseValue(ConfigValueParser<ConfigurationWrapper, V> valueParser) {
+    public @NotNull SectionValueBuilder<V> parseValue(ConfigValueParser<ConfigurationWrapper<?>, V> valueParser) {
         this.parser = valueParser;
         return this;
     }

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

@@ -50,6 +50,23 @@ public interface ConfigValueParser<T, R> {
     @Contract(pure = true)
     static <V> @NotNull ConfigValueParser<Object, V> castObject(Class<V> valueClass) {
         return (input, defaultValue) -> {
+
+            if (Number.class.isAssignableFrom(valueClass)) {
+                if (Long.class.isAssignableFrom(valueClass)) {
+                    input = longValue().parse(input, null);
+                } else if (Integer.class.isAssignableFrom(valueClass)) {
+                    input = intValue().parse(input, null);
+                } else if (Float.class.isAssignableFrom(valueClass)) {
+                    input = floatValue().parse(input, null);
+                } else if (Double.class.isAssignableFrom(valueClass)) {
+                    input = doubleValue().parse(input, null);
+                } else if (Byte.class.isAssignableFrom(valueClass)) {
+                    input = byteValue().parse(input, null);
+                } else if (Short.class.isAssignableFrom(valueClass)) {
+                    input = shortValue().parse(input, null);
+                }
+            }
+
             if (valueClass.isInstance(input)) return valueClass.cast(input);
             else throw new IllegalArgumentException("Cannot cast value to " + valueClass.getName());
         };

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

@@ -0,0 +1,51 @@
+package cc.carm.lib.configuration.core.source;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.util.*;
+
+public abstract class ConfigurationComments {
+
+    protected final @NotNull Map<String, List<String>> headerComments = new HashMap<>();
+    protected final @NotNull Map<String, String> inlineComments = new HashMap<>();
+
+    protected @NotNull Map<String, List<String>> getHeaderComments() {
+        return headerComments;
+    }
+
+    protected @NotNull Map<String, String> getInlineComments() {
+        return inlineComments;
+    }
+
+    public void setHeaderComments(@Nullable String path, @Nullable List<String> comments) {
+
+        if (comments == null) {
+            getHeaderComments().remove(path);
+        } else {
+            getHeaderComments().put(path, comments);
+        }
+    }
+
+
+    public void setInlineComment(@NotNull String path, @Nullable String comment) {
+        if (comment == null) {
+            getInlineComments().remove(path);
+        } else {
+            getInlineComments().put(path, comment);
+        }
+    }
+
+    @Nullable
+    @Unmodifiable
+    public List<String> getHeaderComment(@Nullable String path) {
+        return Optional.ofNullable(getHeaderComments().get(path)).map(Collections::unmodifiableList).orElse(null);
+    }
+
+    public @Nullable String getInlineComment(@NotNull String path) {
+        return getInlineComments().get(path);
+    }
+
+
+}

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

@@ -7,8 +7,9 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.util.List;
+import java.util.Optional;
 
-public abstract class ConfigurationProvider<W extends ConfigurationWrapper> {
+public abstract class ConfigurationProvider<W extends ConfigurationWrapper<?>> {
 
     protected long updateTime;
 
@@ -21,7 +22,7 @@ public abstract class ConfigurationProvider<W extends ConfigurationWrapper> {
     }
 
     public boolean isExpired(long time) {
-        return this.updateTime > time;
+        return getUpdateTime() > time;
     }
 
     public abstract @NotNull W getConfiguration();
@@ -35,15 +36,27 @@ public abstract class ConfigurationProvider<W extends ConfigurationWrapper> {
 
     protected abstract void onReload() throws Exception;
 
-    public abstract void setHeaderComment(@Nullable String path, @Nullable List<String> comments);
+    public abstract @Nullable ConfigurationComments getComments();
 
-    public abstract void setInlineComment(@NotNull String path, @Nullable String comment);
+    public void setHeaderComment(@Nullable String path, @Nullable List<String> comments) {
+        if (getComments() == null) return;
+        getComments().setHeaderComments(path, comments);
+    }
+
+    public void setInlineComment(@NotNull String path, @Nullable String comment) {
+        if (getComments() == null) return;
+        getComments().setInlineComment(path, comment);
+    }
 
     @Nullable
     @Unmodifiable
-    public abstract List<String> getHeaderComment(@Nullable String path);
+    public List<String> getHeaderComment(@Nullable String path) {
+        return Optional.ofNullable(getComments()).map(c -> c.getHeaderComment(path)).orElse(null);
+    }
 
-    public abstract @Nullable String getInlineComment(@NotNull String path);
+    public @Nullable String getInlineComment(@NotNull String path) {
+        return Optional.ofNullable(getComments()).map(c -> c.getInlineComment(path)).orElse(null);
+    }
 
     public abstract @NotNull ConfigInitializer<? extends ConfigurationProvider<W>> getInitializer();
 

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

@@ -12,7 +12,7 @@ import java.util.List;
 
 interface ConfigurationReader {
 
-    ConfigurationWrapper getWrapper();
+    ConfigurationWrapper<?> getWrapper();
 
     default boolean isBoolean(@NotNull String path) {
         return getWrapper().isType(path, Boolean.class);

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

@@ -9,13 +9,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public interface ConfigurationWrapper extends ConfigurationReader {
+public interface ConfigurationWrapper<S> extends ConfigurationReader {
 
     @Override
-    default ConfigurationWrapper getWrapper() {
+    default ConfigurationWrapper<S> getWrapper() {
         return this;
     }
 
+    @NotNull S getSource();
+
     @NotNull
     Set<String> getKeys(boolean deep);
 
@@ -66,6 +68,6 @@ public interface ConfigurationWrapper extends ConfigurationReader {
     boolean isConfigurationSection(@NotNull String path);
 
     @Nullable
-    ConfigurationWrapper getConfigurationSection(@NotNull String path);
+    ConfigurationWrapper<S> getConfigurationSection(@NotNull String path);
 
 }

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

@@ -10,7 +10,7 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.Objects;
 
-public abstract class FileConfigProvider<W extends ConfigurationWrapper> extends ConfigurationProvider<W> {
+public abstract class FileConfigProvider<W extends ConfigurationWrapper<?>> extends ConfigurationProvider<W> {
 
     protected final @NotNull File file;
 

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

@@ -136,7 +136,7 @@ public abstract class ConfigValue<T> {
                 .orElseThrow(() -> new IllegalStateException("Value(" + configPath + ") does not have a provider."));
     }
 
-    public final @NotNull ConfigurationWrapper getConfiguration() {
+    public final @NotNull ConfigurationWrapper<?> getConfiguration() {
         try {
             return getProvider().getConfiguration();
         } catch (Exception ex) {

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

@@ -78,7 +78,7 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> {
         if (isExpired()) { // 已过时的数据，需要重新解析一次。
             Map<K, V> map = supplier.get();
 
-            ConfigurationWrapper section = getConfiguration().getConfigurationSection(getConfigPath());
+            ConfigurationWrapper<?> section = getConfiguration().getConfigurationSection(getConfigPath());
             if (section == null) return useOrDefault(map);
 
             Set<String> keys = section.getKeys(false);

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

@@ -21,13 +21,13 @@ public class ConfiguredSection<V> extends CachedConfigValue<V> {
 
     protected final @NotNull Class<V> valueClass;
 
-    protected final @NotNull ConfigValueParser<ConfigurationWrapper, V> parser;
+    protected final @NotNull ConfigValueParser<ConfigurationWrapper<?>, V> parser;
     protected final @NotNull ConfigDataFunction<V, ? extends Map<String, Object>> serializer;
 
     public ConfiguredSection(@Nullable ConfigurationProvider<?> provider, @Nullable String sectionPath,
                              @Nullable List<String> headerComments, @Nullable String inlineComments,
                              @NotNull Class<V> valueClass, @Nullable V defaultValue,
-                             @NotNull ConfigValueParser<ConfigurationWrapper, V> parser,
+                             @NotNull ConfigValueParser<ConfigurationWrapper<?>, V> parser,
                              @NotNull ConfigDataFunction<V, ? extends Map<String, Object>> serializer) {
         super(provider, sectionPath, headerComments, inlineComments, defaultValue);
         this.valueClass = valueClass;
@@ -39,7 +39,7 @@ public class ConfiguredSection<V> extends CachedConfigValue<V> {
         return valueClass;
     }
 
-    public @NotNull ConfigValueParser<ConfigurationWrapper, V> getParser() {
+    public @NotNull ConfigValueParser<ConfigurationWrapper<?>, V> getParser() {
         return parser;
     }
 
@@ -50,7 +50,7 @@ public class ConfiguredSection<V> extends CachedConfigValue<V> {
     @Override
     public @Nullable V get() {
         if (isExpired()) { // 已过时的数据，需要重新解析一次。
-            ConfigurationWrapper section = getConfiguration().getConfigurationSection(getConfigPath());
+            ConfigurationWrapper<?> section = getConfiguration().getConfigurationSection(getConfigPath());
             if (section == null) return useDefault();
             try {
                 // 若未出现错误，则直接更新缓存并返回。

impl/json/pom.xml

@@ -5,13 +5,15 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.1.0</version>
+        <version>3.2.1</version>
         <relativePath>../../pom.xml</relativePath>
     </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-json</artifactId>
     <packaging>jar</packaging>
@@ -28,7 +30,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.9.0</version>
+            <version>2.10</version>
             <scope>compile</scope>
         </dependency>
 

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

@@ -1,6 +1,7 @@
 package cc.carm.lib.configuration.json;
 
 import cc.carm.lib.configuration.core.ConfigInitializer;
+import cc.carm.lib.configuration.core.source.ConfigurationComments;
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
 import cc.carm.lib.configuration.core.source.impl.FileConfigProvider;
 import com.google.gson.Gson;
@@ -8,12 +9,10 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSerializer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Unmodifiable;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
-import java.util.List;
 
 /**
  * Some code comes from BungeeCord's implementation of the JsonConfiguration.
@@ -62,6 +61,11 @@ public class JSONConfigProvider extends FileConfigProvider<JSONConfigWrapper> {
         initializeConfig();
     }
 
+    @Override
+    public @Nullable ConfigurationComments getComments() {
+        return null;
+    }
+
     @Override
     public void save() throws Exception {
         try (Writer writer = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
@@ -69,26 +73,6 @@ public class JSONConfigProvider extends FileConfigProvider<JSONConfigWrapper> {
         }
     }
 
-    @Override
-    public void setHeaderComment(@Nullable String path, @Nullable List<String> comments) {
-        // JSON doesn't support comments;
-    }
-
-    @Override
-    public void setInlineComment(@NotNull String path, @Nullable String comment) {
-        // JSON doesn't support comments;
-    }
-
-    @Override
-    public @Nullable @Unmodifiable List<String> getHeaderComment(@Nullable String path) {
-        return null;
-    }
-
-    @Override
-    public @Nullable String getInlineComment(@NotNull String path) {
-        return null;
-    }
-
     @Override
     public @NotNull ConfigInitializer<? extends ConfigurationProvider<JSONConfigWrapper>> getInitializer() {
         return this.initializer;

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

@@ -14,7 +14,7 @@ import java.util.Set;
  *
  * @author md_5, CarmJos
  */
-public class JSONConfigWrapper implements ConfigurationWrapper {
+public class JSONConfigWrapper implements ConfigurationWrapper<Map<String, Object>> {
 
     private static final char SEPARATOR = '.';
     protected final Map<String, Object> data;
@@ -33,6 +33,10 @@ public class JSONConfigWrapper implements ConfigurationWrapper {
         }
     }
 
+    @Override
+    public @NotNull Map<String, Object> getSource() {
+        return this.data;
+    }
 
     @Override
     public @NotNull Set<String> getKeys(boolean deep) {
@@ -94,7 +98,7 @@ public class JSONConfigWrapper implements ConfigurationWrapper {
     }
 
     @Override
-    public @Nullable ConfigurationWrapper getConfigurationSection(@NotNull String path) {
+    public @Nullable JSONConfigWrapper getConfigurationSection(@NotNull String path) {
         Object val = get(path);
         return (val instanceof JSONConfigWrapper) ? (JSONConfigWrapper) val : null;
     }

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

@@ -8,7 +8,7 @@ import java.util.Map;
 
 public class SomeModel extends AbstractModel {
 
-    int num;
+    public final int num;
 
     public SomeModel(@NotNull String name, int num) {
         super(name);

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

@@ -33,7 +33,7 @@ public class TestModel extends AbstractModel {
         return map;
     }
 
-    public static TestModel deserialize(ConfigurationWrapper section) {
+    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");

impl/sql/pom.xml

@@ -0,0 +1,33 @@
+<?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.2.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </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>
+
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
+    <artifactId>easyconfiguration-sql</artifactId>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>easyconfiguration-core</artifactId>
+            <version>${project.parent.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,6 @@
+package cc.carm.lib.configuration;
+
+public class EasyConfiguration {
+
+
+}

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

@@ -0,0 +1,38 @@
+package cc.carm.lib.configuration.sql;
+
+import cc.carm.lib.configuration.core.ConfigInitializer;
+import cc.carm.lib.configuration.core.source.ConfigurationComments;
+import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class SQLConfigProvider extends ConfigurationProvider<SQLSectionWrapper> {
+
+
+    @Override
+    public @NotNull SQLSectionWrapper getConfiguration() {
+        return null;
+    }
+
+    @Override
+    public void save() throws Exception {
+
+    }
+
+    @Override
+    protected void onReload() throws Exception {
+
+    }
+
+    @Override
+    public @Nullable ConfigurationComments getComments() {
+        return null;
+    }
+
+    @Override
+    public @NotNull ConfigInitializer<? extends ConfigurationProvider<SQLSectionWrapper>> getInitializer() {
+        return null;
+    }
+
+
+}

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

@@ -0,0 +1,63 @@
+package cc.carm.lib.configuration.sql;
+
+import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class SQLSectionWrapper implements ConfigurationWrapper<Map<String, Object>> {
+
+    @Override
+    public @NotNull Map<String, Object> getSource() {
+        return null;
+    }
+
+    @Override
+    public @NotNull Set<String> getKeys(boolean deep) {
+        return null;
+    }
+
+    @Override
+    public @NotNull Map<String, Object> getValues(boolean deep) {
+        return null;
+    }
+
+    @Override
+    public void set(@NotNull String path, @Nullable Object value) {
+
+    }
+
+    @Override
+    public boolean contains(@NotNull String path) {
+        return false;
+    }
+
+    @Override
+    public @Nullable Object get(@NotNull String path) {
+        return null;
+    }
+
+    @Override
+    public boolean isList(@NotNull String path) {
+        return false;
+    }
+
+    @Override
+    public @Nullable List<?> getList(@NotNull String path) {
+        return null;
+    }
+
+    @Override
+    public boolean isConfigurationSection(@NotNull String path) {
+        return false;
+    }
+
+    @Override
+    public @Nullable SQLSectionWrapper getConfigurationSection(@NotNull String path) {
+        return null;
+    }
+
+}

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

@@ -0,0 +1,7 @@
+package cc.carm.lib.configuration.sql;
+
+public class SQLValueParser {
+
+
+
+}

impl/sql/table_schem.sql

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

impl/yaml/pom.xml

@@ -5,13 +5,15 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>3.1.0</version>
+        <version>3.2.1</version>
         <relativePath>../../pom.xml</relativePath>
     </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-yaml</artifactId>
@@ -29,7 +31,7 @@
         <dependency>
             <groupId>org.bspfsystems</groupId>
             <artifactId>yamlconfiguration</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.0</version>
             <scope>compile</scope>
         </dependency>
 

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

@@ -1,60 +1,23 @@
 package cc.carm.lib.configuration.yaml;
 
+import cc.carm.lib.configuration.core.source.ConfigurationComments;
 import org.bspfsystems.yamlconfiguration.configuration.ConfigurationSection;
 import org.bspfsystems.yamlconfiguration.file.FileConfiguration;
 import org.bspfsystems.yamlconfiguration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Unmodifiable;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
-import java.util.*;
+import java.util.List;
+import java.util.StringJoiner;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import static cc.carm.lib.configuration.yaml.YAMLConfigProvider.SEPARATOR;
 
-public class YAMLComments {
-
-    protected final @NotNull Map<String, List<String>> headerComments = new HashMap<>();
-    protected final @NotNull Map<String, String> inlineComments = new HashMap<>();
-
-    protected @NotNull Map<String, List<String>> getHeaderComments() {
-        return headerComments;
-    }
-
-    protected @NotNull Map<String, String> getInlineComments() {
-        return inlineComments;
-    }
-
-    public void setHeaderComments(@Nullable String path, @Nullable List<String> comments) {
-
-        if (comments == null) {
-            getHeaderComments().remove(path);
-        } else {
-            getHeaderComments().put(path, comments);
-        }
-    }
-
-
-    public void setInlineComment(@NotNull String path, @Nullable String comment) {
-        if (comment == null) {
-            getInlineComments().remove(path);
-        } else {
-            getInlineComments().put(path, comment);
-        }
-    }
-
-    @Nullable
-    @Unmodifiable
-    public List<String> getHeaderComment(@Nullable String path) {
-        return Optional.ofNullable(getHeaderComments().get(path)).map(Collections::unmodifiableList).orElse(null);
-    }
-
-    public @Nullable String getInlineComment(@NotNull String path) {
-        return getInlineComments().get(path);
-    }
+@SuppressWarnings("SpellCheckingInspection")
+public class YAMLComments extends ConfigurationComments {
 
     public @Nullable String buildHeaderComments(@Nullable String path, @NotNull String indents) {
         List<String> comments = getHeaderComment(path);

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

@@ -1,11 +1,11 @@
 package cc.carm.lib.configuration.yaml;
 
 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 org.bspfsystems.yamlconfiguration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Unmodifiable;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -13,7 +13,6 @@ import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.List;
 
 public class YAMLConfigProvider extends FileConfigProvider<YAMLSectionWrapper> {
 
@@ -43,6 +42,12 @@ public class YAMLConfigProvider extends FileConfigProvider<YAMLSectionWrapper> {
     }
 
     @Override
+    public @Nullable ConfigurationComments getComments() {
+        return this.comments;
+    }
+
+    @Override
+    @SuppressWarnings("SpellCheckingInspection")
     public void save() throws Exception {
         configuration.save(getFile());
 
@@ -60,28 +65,6 @@ public class YAMLConfigProvider extends FileConfigProvider<YAMLSectionWrapper> {
 
     }
 
-    @Override
-    public void setHeaderComment(@Nullable String path, @Nullable List<String> comments) {
-        this.comments.setHeaderComments(path, comments);
-    }
-
-    @Override
-    public void setInlineComment(@NotNull String path, @Nullable String comment) {
-        this.comments.setInlineComment(path, comment);
-    }
-
-    @Override
-    @Nullable
-    @Unmodifiable
-    public List<String> getHeaderComment(@Nullable String path) {
-        return this.comments.getHeaderComment(path);
-    }
-
-    @Override
-    public @Nullable String getInlineComment(@NotNull String path) {
-        return this.comments.getInlineComment(path);
-    }
-
     @Override
     public @NotNull ConfigInitializer<YAMLConfigProvider> getInitializer() {
         return this.initializer;

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

@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class YAMLSectionWrapper implements ConfigurationWrapper {
+public class YAMLSectionWrapper implements ConfigurationWrapper<ConfigurationSection> {
 
     private final ConfigurationSection section;
 
@@ -25,6 +25,11 @@ public class YAMLSectionWrapper implements ConfigurationWrapper {
         return section == null ? null : new YAMLSectionWrapper(section);
     }
 
+    @Override
+    public @NotNull ConfigurationSection getSource() {
+        return this.section;
+    }
+
     @Override
     public @NotNull Set<String> getKeys(boolean deep) {
         return new LinkedHashSet<>(section.getKeys(deep));
@@ -66,7 +71,7 @@ public class YAMLSectionWrapper implements ConfigurationWrapper {
     }
 
     @Override
-    public @Nullable ConfigurationWrapper getConfigurationSection(@NotNull String path) {
+    public @Nullable YAMLSectionWrapper getConfigurationSection(@NotNull String path) {
         return of(this.section.getConfigurationSection(path));
     }
 
@@ -80,5 +85,5 @@ public class YAMLSectionWrapper implements ConfigurationWrapper {
     public <T extends ConfigurationSerializable> T getSerializable(@NotNull String path, @NotNull Class<T> clazz, @Nullable T defaultValue) {
         return this.section.getSerializable(path, clazz, defaultValue);
     }
-    
+
 }

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

@@ -16,7 +16,7 @@ import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-public class ConfigTester {
+public class DemoConfigTest {
 
     static {
         ConfigurationSerialization.registerClass(TestModel.class);
@@ -44,6 +44,12 @@ public class ConfigTester {
     public static void testDemo() {
         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());

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

@@ -1,26 +0,0 @@
-package config;
-
-import config.offset.FieldOffset;
-import config.offset.OffsetUtil;
-import config.source.DemoConfiguration;
-import org.junit.Test;
-
-import java.util.List;
-
-public class OffsetTest {
-
-    @Test
-    public void test() {
-//
-//        output(OffsetUtil.getClassMemberOffset(DemoConfiguration.class));
-//        output(OffsetUtil.getClassMemberOffset(DemoConfiguration.Sub.class));
-
-    }
-
-    protected static void output(List<FieldOffset> fieldOffsets) {
-        for (FieldOffset fieldOffset : fieldOffsets) {
-            System.out.println(fieldOffset.getOffsetValue() + " -> " + fieldOffset);
-        }
-    }
-
-}

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

@@ -11,7 +11,7 @@ import java.util.Map;
 @SerializableAs("SomeModel")
 public class SomeModel extends AbstractModel implements ConfigurationSerializable {
 
-    int num;
+    public final int num;
 
     public SomeModel(@NotNull String name, int num) {
         super(name);

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

@@ -38,7 +38,7 @@ public class TestModel extends AbstractModel implements ConfigurationSerializabl
         return map;
     }
 
-    public static TestModel deserialize(ConfigurationWrapper section) {
+    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");

impl/yaml/src/test/java/config/offset/OffsetUtil.java

@@ -1,63 +1,63 @@
-package config.offset;
-
-
-import sun.misc.Unsafe;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author Chris2018998
- */
-public class OffsetUtil {
-    private static Unsafe unsafe;
-
-    static {
-        try {
-            // 获取 Unsafe 内部的私有的实例化单例对象
-            Field field = Unsafe.class.getDeclaredField("theUnsafe");
-            // 无视权限
-            field.setAccessible(true);
-            unsafe = (Unsafe) field.get(null);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
+//package config.offset;
+//
+//
+//import sun.misc.Unsafe;
+//
+//import java.lang.reflect.Field;
+//import java.lang.reflect.Modifier;
+//import java.util.Collections;
+//import java.util.LinkedList;
+//import java.util.List;
+//
+///**
+// * @author Chris2018998
+// */
+//public class OffsetUtil {
+//    private static Unsafe unsafe;
+//
+//    static {
 //        try {
-//            unsafe = AccessController.doPrivileged((PrivilegedExceptionAction<Unsafe>) () -> {
-//                Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
-//                theUnsafe.setAccessible(true);
-//                return (Unsafe) theUnsafe.get(null);
-//            });
-//        } catch (Throwable e) {
-//            System.err.println("Unable to load unsafe");
+//            // 获取 Unsafe 内部的私有的实例化单例对象
+//            Field field = Unsafe.class.getDeclaredField("theUnsafe");
+//            // 无视权限
+//            field.setAccessible(true);
+//            unsafe = (Unsafe) field.get(null);
+//        } catch (NoSuchFieldException | IllegalAccessException e) {
+//            e.printStackTrace();
 //        }
-    }
-
-    public static List<FieldOffset> getClassMemberOffset(Class<?> beanClass) {
-        List<FieldOffset> offsetsList = new LinkedList<>();
-        for (Field field : beanClass.getDeclaredFields()) {
-            FieldOffset fieldOffset = new FieldOffset(field);
-            offsetsList.add(fieldOffset);
-            if (Modifier.isStatic(field.getModifiers()))
-                fieldOffset.setOffsetValue(unsafe.staticFieldOffset(field));
-            else
-                fieldOffset.setOffsetValue(unsafe.objectFieldOffset(field));
-            Class<?> fieldType = field.getType();
-            if (!fieldType.getName().startsWith("java")) {
-                Field[] subfields = fieldType.getDeclaredFields();
-                if (subfields.length > 0) {
-                    fieldOffset.setSubFieldOffsetList(getClassMemberOffset(fieldType));
-                }
-            }
-        }
-
-        Collections.sort(offsetsList);
-        return offsetsList;
-    }
-
-
-}
-
+////        try {
+////            unsafe = AccessController.doPrivileged((PrivilegedExceptionAction<Unsafe>) () -> {
+////                Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
+////                theUnsafe.setAccessible(true);
+////                return (Unsafe) theUnsafe.get(null);
+////            });
+////        } catch (Throwable e) {
+////            System.err.println("Unable to load unsafe");
+////        }
+//    }
+//
+//    public static List<FieldOffset> getClassMemberOffset(Class<?> beanClass) {
+//        List<FieldOffset> offsetsList = new LinkedList<>();
+//        for (Field field : beanClass.getDeclaredFields()) {
+//            FieldOffset fieldOffset = new FieldOffset(field);
+//            offsetsList.add(fieldOffset);
+//            if (Modifier.isStatic(field.getModifiers()))
+//                fieldOffset.setOffsetValue(unsafe.staticFieldOffset(field));
+//            else
+//                fieldOffset.setOffsetValue(unsafe.objectFieldOffset(field));
+//            Class<?> fieldType = field.getType();
+//            if (!fieldType.getName().startsWith("java")) {
+//                Field[] subfields = fieldType.getDeclaredFields();
+//                if (subfields.length > 0) {
+//                    fieldOffset.setSubFieldOffsetList(getClassMemberOffset(fieldType));
+//                }
+//            }
+//        }
+//
+//        Collections.sort(offsetsList);
+//        return offsetsList;
+//    }
+//
+//
+//}
+//

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

@@ -27,6 +27,9 @@ public class DemoConfiguration extends ConfigurationRoot {
     @ConfigPath(root = true)
     protected static final ConfigValue<Double> VERSION = ConfiguredValue.of(Double.class, 1.0D);
 
+    @ConfigPath(root = true)
+    public static final ConfigValue<Long> TEST_NUMBER = ConfiguredValue.of(Long.class, 1000000L);
+
     // 支持通过 Class<?> 变量标注子配置，一并注册。
     // 注意： 若对应类也有注解，则优先使用类的注解。
     @ConfigPath("impl-test") //支持通过注解修改子配置的主路径，若不修改则以变量名自动生成。

pom.xml

@@ -15,11 +15,12 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyconfiguration-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.0</version>
+    <version>3.2.1</version>
     <modules>
         <module>core</module>
         <module>impl/yaml</module>
         <module>impl/json</module>
+        <module>impl/sql</module>
     </modules>
 
     <name>EasyConfiguration</name>
@@ -90,7 +91,7 @@
         <downloadUrl>https://github.com/CarmJos/EasyConfiguration/releases</downloadUrl>
         <site>
             <id>javadoc</id>
-            <name>EasyConfiguration JavaDoc (on Github Pages)</name>
+            <name>EasyConfiguration JavaDoc (on GitHub Pages)</name>
             <url>https://CarmJos.github.io/EasyConfiguration</url>
         </site>
     </distributionManagement>
@@ -164,7 +165,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.4.1</version>
                     <configuration>
                         <classifier>javadoc</classifier>
                         <detectJavaApiLink>false</detectJavaApiLink>
@@ -203,7 +204,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.3.0</version>
                 </plugin>
 
                 <plugin>
@@ -223,7 +224,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.1</version>
                     <executions>
                         <execution>
                             <phase>package</phase>