[1.1.0] 实现 ConfigurationSerializable 相关数据的加载、获取与写入。

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

@@ -11,13 +11,19 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Optional;
 
-public class ConfigInitializer {
+public class ConfigInitializer<T extends ConfigurationProvider<?>> {
 
-    public static void initialize(ConfigurationProvider source, Class<? extends ConfigurationRoot> rootClazz) {
-        initialize(source, rootClazz, true);
+    protected final @NotNull T provider;
+
+    public ConfigInitializer(@NotNull T provider) {
+        this.provider = provider;
     }
 
-    public static void initialize(ConfigurationProvider provider, Class<? extends ConfigurationRoot> rootClazz, boolean saveDefault) {
+    public void initialize(Class<? extends ConfigurationRoot> rootClazz) {
+        initialize(rootClazz, true);
+    }
+
+    public void initialize(Class<? extends ConfigurationRoot> rootClazz, boolean saveDefault) {
         String rootSection = null;
 
         ConfigPath sectionAnnotation = rootClazz.getAnnotation(ConfigPath.class);
@@ -34,11 +40,11 @@ public class ConfigInitializer {
         }
 
         for (Class<?> innerClass : rootClazz.getDeclaredClasses()) {
-            initSection(provider, rootSection, innerClass, saveDefault);
+            initSection(rootSection, innerClass, saveDefault);
         }
 
         for (Field field : rootClazz.getDeclaredFields()) {
-            initValue(provider, rootSection, rootClazz, field, saveDefault);
+            initValue(rootSection, rootClazz, field, saveDefault);
         }
 
         if (saveDefault) {
@@ -51,7 +57,7 @@ public class ConfigInitializer {
 
     }
 
-    private static void initSection(ConfigurationProvider provider, String parentSection, Class<?> clazz, boolean saveDefault) {
+    private void initSection(String parentSection, Class<?> clazz, boolean saveDefault) {
         if (!Modifier.isStatic(clazz.getModifiers()) || !Modifier.isPublic(clazz.getModifiers())) return;
 
         String section = getSectionPath(clazz.getSimpleName(), parentSection, clazz.getAnnotation(ConfigPath.class));
@@ -60,18 +66,18 @@ public class ConfigInitializer {
             provider.setComments(parentSection, comments.value());
         }
 
-        for (Field field : clazz.getDeclaredFields()) initValue(provider, section, clazz, field, saveDefault);
-        for (Class<?> innerClass : clazz.getDeclaredClasses()) initSection(provider, section, innerClass, saveDefault);
+        for (Field field : clazz.getDeclaredFields()) initValue(section, clazz, field, saveDefault);
+        for (Class<?> innerClass : clazz.getDeclaredClasses()) initSection(section, innerClass, saveDefault);
 
     }
 
-    private static void initValue(ConfigurationProvider provider, String parentSection, Class<?> clazz, Field field, boolean saveDefault) {
+    private void initValue(String parentSection, Class<?> clazz, Field field, boolean saveDefault) {
         try {
             field.setAccessible(true);
             Object object = field.get(clazz);
             if (object instanceof ConfigValue<?>) {
                 initializeValue(
-                        provider, (ConfigValue<?>) object, saveDefault,
+                        (ConfigValue<?>) object, saveDefault,
                         getSectionPath(field.getName(), parentSection, field.getAnnotation(ConfigPath.class)),
                         Optional.ofNullable(field.getAnnotation(ConfigComment.class))
                                 .map(ConfigComment::value).orElse(new String[0])
@@ -82,8 +88,8 @@ public class ConfigInitializer {
     }
 
 
-    public static void initializeValue(@NotNull ConfigurationProvider provider, @NotNull ConfigValue<?> value,
-                                       boolean saveDefault, @NotNull String path, @NotNull String[] comments) {
+    public void initializeValue(@NotNull ConfigValue<?> value, boolean saveDefault,
+                                @NotNull String path, @NotNull String[] comments) {
         value.initialize(provider, path, comments);
         if (saveDefault && value.getDefaultValue() != null && !provider.getConfiguration().contains(path)) {
             value.setDefault();

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

@@ -5,20 +5,25 @@ import cc.carm.lib.configuration.core.value.ConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class AbstractConfigBuilder<B extends AbstractConfigBuilder<B, T>, T> {
+public abstract class AbstractConfigBuilder<T, B extends AbstractConfigBuilder<T, B, P>, P extends ConfigurationProvider<?>> {
 
+    protected final Class<? super P> providerClass;
 
-    protected @Nullable ConfigurationProvider provider;
+    protected @Nullable P provider;
     protected @Nullable String path;
 
     protected @NotNull String[] comments = new String[0];
     protected @Nullable T defaultValue;
 
+    public AbstractConfigBuilder(Class<? super P> providerClass) {
+        this.providerClass = providerClass;
+    }
+
     protected abstract @NotNull B getThis();
 
     public abstract @NotNull ConfigValue<?> build();
 
-    public @NotNull B from(@Nullable ConfigurationProvider provider) {
+    public @NotNull B from(@Nullable P provider) {
         this.provider = provider;
         return getThis();
     }

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

@@ -0,0 +1,46 @@
+package cc.carm.lib.configuration.core.builder;
+
+import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import cc.carm.lib.configuration.core.value.ConfigValue;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public abstract class CommonConfigBuilder<T, B extends CommonConfigBuilder<T, B>>
+        extends AbstractConfigBuilder<T, B, ConfigurationProvider<?>> {
+
+    protected @Nullable ConfigurationProvider<?> provider;
+    protected @Nullable String path;
+
+    protected @NotNull String[] comments = new String[0];
+    protected @Nullable T defaultValue;
+
+    public CommonConfigBuilder() {
+        super(ConfigurationProvider.class);
+    }
+
+    protected abstract @NotNull B getThis();
+
+    public abstract @NotNull ConfigValue<?> build();
+
+    public @NotNull B from(@Nullable ConfigurationProvider<?> provider) {
+        this.provider = provider;
+        return getThis();
+    }
+
+    public @NotNull B path(@Nullable String path) {
+        this.path = path;
+        return getThis();
+    }
+
+    public @NotNull B comments(@NotNull String... comments) {
+        this.comments = comments;
+        return getThis();
+    }
+
+    public @NotNull B defaults(@Nullable T defaultValue) {
+        this.defaultValue = defaultValue;
+        return getThis();
+    }
+
+
+}

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

@@ -1,14 +1,13 @@
 package cc.carm.lib.configuration.core.builder.list;
 
-import cc.carm.lib.configuration.core.builder.AbstractConfigBuilder;
+import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.value.type.ConfiguredList;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-public class SourceListBuilder<S, V>
-        extends AbstractConfigBuilder<SourceListBuilder<S, V>, List<V>> {
+public class SourceListBuilder<S, V> extends CommonConfigBuilder<List<V>, SourceListBuilder<S, V>> {
 
     protected final @NotNull Class<S> sourceClass;
     protected @NotNull ConfigDataFunction<Object, S> sourceParser;

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

@@ -1,6 +1,6 @@
 package cc.carm.lib.configuration.core.builder.map;
 
-import cc.carm.lib.configuration.core.builder.AbstractConfigBuilder;
+import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.value.type.ConfiguredMap;
 import org.jetbrains.annotations.NotNull;
@@ -8,8 +8,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Map;
 import java.util.function.Supplier;
 
-public class SourceMapBuilder<M extends Map<K, V>, S, K, V>
-        extends AbstractConfigBuilder<SourceMapBuilder<M, S, K, V>, M> {
+public class SourceMapBuilder<M extends Map<K, V>, S, K, V> extends CommonConfigBuilder<M, SourceMapBuilder<M, S, K, V>> {
 
     protected final @NotNull Supplier<@NotNull M> supplier;
 

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

@@ -1,6 +1,6 @@
 package cc.carm.lib.configuration.core.builder.value;
 
-import cc.carm.lib.configuration.core.builder.AbstractConfigBuilder;
+import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.function.ConfigValueParser;
 import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Map;
 
 public class SectionValueBuilder<V>
-        extends AbstractConfigBuilder<SectionValueBuilder<V>, V> {
+        extends CommonConfigBuilder<V, SectionValueBuilder<V>> {
 
 
     protected final @NotNull Class<V> valueClass;

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

@@ -1,12 +1,12 @@
 package cc.carm.lib.configuration.core.builder.value;
 
-import cc.carm.lib.configuration.core.builder.AbstractConfigBuilder;
+import cc.carm.lib.configuration.core.builder.CommonConfigBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.function.ConfigValueParser;
 import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
 import org.jetbrains.annotations.NotNull;
 
-public class SourceValueBuilder<S, V> extends AbstractConfigBuilder<SourceValueBuilder<S, V>, V> {
+public class SourceValueBuilder<S, V> extends CommonConfigBuilder<V, SourceValueBuilder<S, V>> {
 
     protected final @NotNull Class<S> sourceClass;
     protected @NotNull ConfigDataFunction<Object, S> sourceParser;

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

@@ -5,7 +5,7 @@ import cc.carm.lib.configuration.core.ConfigurationRoot;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class ConfigurationProvider {
+public abstract class ConfigurationProvider<W extends ConfigurationWrapper> {
 
     protected long updateTime;
 
@@ -21,7 +21,7 @@ public abstract class ConfigurationProvider {
         return this.updateTime > time;
     }
 
-    public abstract @NotNull ConfigurationWrapper getConfiguration();
+    public abstract @NotNull W getConfiguration();
 
     public abstract void reload() throws Exception;
 
@@ -31,8 +31,10 @@ public abstract class ConfigurationProvider {
 
     public abstract @Nullable String[] getComments(@NotNull String path);
 
+    public abstract @NotNull ConfigInitializer<? extends ConfigurationProvider<W>> getInitializer();
+
     public void initialize(Class<? extends ConfigurationRoot> configClazz) {
-        ConfigInitializer.initialize(this, configClazz, true);
+        getInitializer().initialize(configClazz, true);
     }
 
 }

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

@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public interface ConfigurationWrapper extends ConfigurationReader{
+public interface ConfigurationWrapper extends ConfigurationReader {
 
     @Override
     default ConfigurationWrapper getWrapper() {
@@ -68,5 +68,4 @@ public interface ConfigurationWrapper extends ConfigurationReader{
     @Nullable
     ConfigurationWrapper getConfigurationSection(@NotNull String path);
 
-
 }

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

@@ -1,6 +1,7 @@
 package cc.carm.lib.configuration.core.source.impl;
 
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -9,7 +10,7 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.Objects;
 
-public abstract class FileConfigProvider extends ConfigurationProvider {
+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

@@ -10,28 +10,26 @@ import java.util.Objects;
 import java.util.Optional;
 
 public abstract class ConfigValue<T> {
-    
+
     public static @NotNull ConfigBuilder builder() {
         return new ConfigBuilder();
     }
 
-    protected @Nullable T defaultValue;
-
-    protected @Nullable ConfigurationProvider provider;
+    protected @Nullable ConfigurationProvider<?> provider;
     protected @Nullable String configPath;
     protected @NotNull String[] comments;
 
-    public ConfigValue(@Nullable ConfigurationProvider provider, @Nullable String configPath,
-                       @NotNull String[] comments, @Nullable T defaultValue) {
+    protected @Nullable T defaultValue;
+
+    public ConfigValue(@Nullable ConfigurationProvider<?> provider,
+                       @Nullable String configPath, @NotNull String[] comments, @Nullable T defaultValue) {
         this.provider = provider;
         this.configPath = configPath;
         this.comments = comments;
-
         this.defaultValue = defaultValue;
     }
 
-    public void initialize(@NotNull ConfigurationProvider provider, @NotNull String configPath,
-                           @NotNull String... comments) {
+    public void initialize(@NotNull ConfigurationProvider<?> provider, @NotNull String configPath, @NotNull String... comments) {
         if (this.provider == null) this.provider = provider;
         if (this.configPath == null) this.configPath = configPath;
         if (this.comments.length == 0) this.comments = comments;
@@ -68,7 +66,15 @@ public abstract class ConfigValue<T> {
         Optional.ofNullable(getDefaultValue()).ifPresent(this::set);
     }
 
-    public @NotNull ConfigurationProvider getProvider() {
+    public boolean isDefault() {
+        T defaultValue = getDefaultValue();
+        T value = get();
+        if (defaultValue == null && value == null) return true;
+        else if (defaultValue != null && value != null) return defaultValue.equals(value);
+        else return false;
+    }
+
+    public @NotNull ConfigurationProvider<?> getProvider() {
         return Optional.ofNullable(this.provider)
                 .orElseThrow(() -> new IllegalStateException("Value(" + configPath + ") does not have a provider."));
     }

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

@@ -1,6 +1,7 @@
-package cc.carm.lib.configuration.core.value;
+package cc.carm.lib.configuration.core.value.impl;
 
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import cc.carm.lib.configuration.core.value.ConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -10,7 +11,7 @@ public abstract class CachedConfigValue<T> extends ConfigValue<T> {
     protected @Nullable T cachedValue;
     protected long parsedTime = -1;
 
-    public CachedConfigValue(@Nullable ConfigurationProvider provider, @Nullable String sectionPath,
+    public CachedConfigValue(@Nullable ConfigurationProvider<?> provider, @Nullable String sectionPath,
                              @NotNull String[] comments, @Nullable T defaultValue) {
         super(provider, sectionPath, comments, defaultValue);
     }

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

@@ -3,7 +3,7 @@ package cc.carm.lib.configuration.core.value.type;
 import cc.carm.lib.configuration.core.builder.list.ConfigListBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
-import cc.carm.lib.configuration.core.value.CachedConfigValue;
+import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -21,7 +21,7 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> {
     protected final @NotNull ConfigDataFunction<Object, V> parser;
     protected final @NotNull ConfigDataFunction<V, Object> serializer;
 
-    public ConfiguredList(@Nullable ConfigurationProvider provider,
+    public ConfiguredList(@Nullable ConfigurationProvider<?> provider,
                           @Nullable String sectionPath, @NotNull String[] comments,
                           @NotNull Class<V> valueClass, @Nullable List<V> defaultValue,
                           @NotNull ConfigDataFunction<Object, V> parser,
@@ -34,6 +34,9 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> {
 
     @Override
     public @NotNull List<V> get() {
+
+
+
         if (isExpired()) { // 已过时的数据，需要重新解析一次。
             List<V> list = new ArrayList<>();
 

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

@@ -1,11 +1,10 @@
 package cc.carm.lib.configuration.core.value.type;
 
-import cc.carm.lib.configuration.core.builder.ConfigBuilder;
 import cc.carm.lib.configuration.core.builder.map.ConfigMapBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
 import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
-import cc.carm.lib.configuration.core.value.CachedConfigValue;
+import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -32,7 +31,7 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> {
     protected final @NotNull ConfigDataFunction<K, String> keySerializer;
     protected final @NotNull ConfigDataFunction<V, Object> valueSerializer;
 
-    public ConfiguredMap(@Nullable ConfigurationProvider provider,
+    public ConfiguredMap(@Nullable ConfigurationProvider<?> provider,
                          @Nullable String sectionPath, @NotNull String[] comments,
                          @Nullable Map<K, V> defaultValue, @NotNull Supplier<? extends Map<K, V>> supplier,
                          @NotNull Class<K> keyClass, @NotNull ConfigDataFunction<String, K> keyParser,

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

@@ -1,12 +1,11 @@
 package cc.carm.lib.configuration.core.value.type;
 
-import cc.carm.lib.configuration.core.builder.ConfigBuilder;
 import cc.carm.lib.configuration.core.builder.value.SectionValueBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.function.ConfigValueParser;
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
 import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
-import cc.carm.lib.configuration.core.value.CachedConfigValue;
+import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -24,7 +23,7 @@ public class ConfiguredSection<V> extends CachedConfigValue<V> {
     protected final @NotNull ConfigValueParser<ConfigurationWrapper, V> parser;
     protected final @NotNull ConfigDataFunction<V, ? extends Map<String, Object>> serializer;
 
-    public ConfiguredSection(@Nullable ConfigurationProvider provider,
+    public ConfiguredSection(@Nullable ConfigurationProvider<?> provider,
                              @Nullable String sectionPath, @NotNull String[] comments,
                              @NotNull Class<V> valueClass, @Nullable V defaultValue,
                              @NotNull ConfigValueParser<ConfigurationWrapper, V> parser,

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

@@ -1,11 +1,10 @@
 package cc.carm.lib.configuration.core.value.type;
 
-import cc.carm.lib.configuration.core.builder.ConfigBuilder;
 import cc.carm.lib.configuration.core.builder.value.ConfigValueBuilder;
 import cc.carm.lib.configuration.core.function.ConfigDataFunction;
 import cc.carm.lib.configuration.core.function.ConfigValueParser;
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
-import cc.carm.lib.configuration.core.value.CachedConfigValue;
+import cc.carm.lib.configuration.core.value.impl.CachedConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -30,7 +29,7 @@ public class ConfiguredValue<V> extends CachedConfigValue<V> {
     protected final @NotNull ConfigValueParser<Object, V> parser;
     protected final @NotNull ConfigDataFunction<V, Object> serializer;
 
-    public ConfiguredValue(@Nullable ConfigurationProvider provider,
+    public ConfiguredValue(@Nullable ConfigurationProvider<?> provider,
                            @Nullable String sectionPath, @NotNull String[] comments,
                            @NotNull Class<V> valueClass, @Nullable V defaultValue,
                            @NotNull ConfigValueParser<Object, V> parser,