[skip ci] try to fix security problems

.documentation/JAVADOC-README.md

@@ -0,0 +1,9 @@
+# EasyConfiguration Javadoc
+
+基于 [Github Pages](https://pages.github.com/) 搭建，请访问 [JavaDoc](https://carmjos.github.io/EasyConfiguration) 。
+
+## 如何实现？
+
+若您也想通过 [Github Actions](https://docs.github.com/en/actions/learn-github-actions)
+自动部署项目的Javadoc到 [Github Pages](https://pages.github.com/) ，
+可以参考我的文章 [《自动部署Javadoc到Github Pages》](https://pages.carm.cc/doc/javadoc-in-github.html) 。

.github/workflows/deploy.yml

@@ -40,14 +40,14 @@ jobs:
         run: |
           rm -rf docs
           mkdir -vp docs
-          cp -vrf api/target/apidocs/* docs/
+          cp -vrf core/target/apidocs/* docs/
           cp -vrf .documentation/JAVADOC-README.md docs/README.md
 
       - name: "Generate the Javadoc sitemap"
         id: sitemap
         uses: cicirello/generate-sitemap@v1
         with:
-          base-url-path: https://carmjos.github.io/EasySQL
+          base-url-path: https://CarmJos.github.io/EasyConfiguration
           path-to-root: docs
 
       - name: "Output stats"
@@ -72,7 +72,7 @@ jobs:
         run: |
           cd docs
           git init
-          git remote add origin git@github.com:CarmJos/EasySQL.git
+          git remote add origin git@github.com:CarmJos/EasyConfiguration.git
           git checkout -b gh-pages
           git add -A
           git commit -m "API Document generated."

README.md

@@ -11,7 +11,7 @@
 [![version](https://img.shields.io/github/v/release/CarmJos/EasyConfiguration)](https://github.com/CarmJos/EasyConfiguration/releases)
 [![License](https://img.shields.io/github/license/CarmJos/EasyConfiguration)](https://opensource.org/licenses/MIT)
 [![workflow](https://github.com/CarmJos/EasyConfiguration/actions/workflows/maven.yml/badge.svg?branch=master)](https://github.com/CarmJos/EasyConfiguration/actions/workflows/maven.yml)
-[![CodeFactor](https://www.codefactor.io/repository/github/carmjos/easysql/badge)](https://www.codefactor.io/repository/github/carmjos/easysql)
+[![CodeFactor](https://www.codefactor.io/repository/github/carmjos/easyconfiguration/badge)](https://www.codefactor.io/repository/github/carmjos/easyconfiguration)
 ![CodeSize](https://img.shields.io/github/languages/code-size/CarmJos/EasyConfiguration)
 ![](https://visitor-badge.glitch.me/badge?page_id=EasyConfiguration.readme)
 

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.0.0</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
@@ -16,4 +16,25 @@
     <artifactId>easyconfiguration-core</artifactId>
     <packaging>jar</packaging>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

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

@@ -11,30 +11,30 @@ import java.util.TreeMap;
 
 public class ConfigBuilder {
 
-    public static <V> @NotNull ConfigValueBuilder<V> asValue(@NotNull Class<V> valueClass) {
+    public <V> @NotNull ConfigValueBuilder<V> asValue(@NotNull Class<V> valueClass) {
         return new ConfigValueBuilder<>(valueClass);
     }
 
-    public static <V> @NotNull ConfigListBuilder<V> asList(@NotNull Class<V> valueClass) {
+    public <V> @NotNull ConfigListBuilder<V> asList(@NotNull Class<V> valueClass) {
         return new ConfigListBuilder<>(valueClass);
     }
 
-    public static <K, V> @NotNull ConfigMapBuilder<LinkedHashMap<K, V>, K, V> asMap(@NotNull Class<K> keyClass,
+    public <K, V> @NotNull ConfigMapBuilder<LinkedHashMap<K, V>, K, V> asMap(@NotNull Class<K> keyClass,
                                                                                     @NotNull Class<V> valueClass) {
         return new ConfigMapBuilder<>(LinkedHashMap::new, keyClass, valueClass);
     }
 
-    public static <K, V> @NotNull ConfigMapBuilder<HashMap<K, V>, K, V> asHashMap(@NotNull Class<K> keyClass,
+    public <K, V> @NotNull ConfigMapBuilder<HashMap<K, V>, K, V> asHashMap(@NotNull Class<K> keyClass,
                                                                                   @NotNull Class<V> valueClass) {
         return asMap(keyClass, valueClass).supplier(HashMap::new);
     }
 
-    public static <K, V> @NotNull ConfigMapBuilder<LinkedHashMap<K, V>, K, V> asLinkedMap(@NotNull Class<K> keyClass,
+    public <K, V> @NotNull ConfigMapBuilder<LinkedHashMap<K, V>, K, V> asLinkedMap(@NotNull Class<K> keyClass,
                                                                                           @NotNull Class<V> valueClass) {
         return asMap(keyClass, valueClass);
     }
 
-    public static <K extends Comparable<K>, V> @NotNull ConfigMapBuilder<TreeMap<K, V>, K, V> asTreeMap(@NotNull Class<K> keyClass,
+    public <K extends Comparable<K>, V> @NotNull ConfigMapBuilder<TreeMap<K, V>, K, V> asTreeMap(@NotNull Class<K> keyClass,
                                                                                                         @NotNull Class<V> valueClass) {
         return asMap(keyClass, valueClass).supplier(TreeMap::new);
     }

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

@@ -1,7 +1,6 @@
 package cc.carm.lib.configuration.core.value;
 
 import cc.carm.lib.configuration.core.builder.ConfigBuilder;
-import cc.carm.lib.configuration.core.builder.value.ConfigValueBuilder;
 import cc.carm.lib.configuration.core.source.ConfigurationProvider;
 import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
 import org.jetbrains.annotations.NotNull;
@@ -11,13 +10,9 @@ import java.util.Objects;
 import java.util.Optional;
 
 public abstract class ConfigValue<T> {
-
-    public static <V> ConfigValueBuilder<V> builder(Class<V> valueClass) {
-        return ConfigBuilder.asValue(valueClass);
-    }
-
-    public static <V> ConfigValue<V> of(Class<V> valueClass) {
-        return builder(valueClass).fromObject().build();
+    
+    public static @NotNull ConfigBuilder builder() {
+        return new ConfigBuilder();
     }
 
     protected @Nullable T defaultValue;

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

@@ -1,8 +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.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.ConfigValue;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -11,6 +14,10 @@ import java.util.List;
 
 public class ConfiguredList<V> extends CachedConfigValue<List<V>> {
 
+    public static <V> @NotNull ConfigListBuilder<V> builder(@NotNull Class<V> valueClass) {
+        return builder().asList(valueClass);
+    }
+
     protected final @NotNull Class<V> valueClass;
 
     protected final @NotNull ConfigDataFunction<Object, V> parser;

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

@@ -18,7 +18,7 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> {
 
     public static <K, V> @NotNull ConfigMapBuilder<LinkedHashMap<K, V>, K, V> builder(@NotNull Class<K> keyClass,
                                                                                       @NotNull Class<V> valueClass) {
-        return ConfigBuilder.asMap(keyClass, valueClass);
+        return builder().asMap(keyClass, valueClass);
     }
 
     protected final @NotNull Supplier<? extends Map<K, V>> supplier;

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

@@ -1,5 +1,7 @@
 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;
@@ -13,6 +15,10 @@ import java.util.Optional;
 
 public class ConfiguredSection<V> extends CachedConfigValue<V> {
 
+    public static <V> @NotNull SectionValueBuilder<V> builder(@NotNull Class<V> valueClass) {
+        return builder().asValue(valueClass).fromSection();
+    }
+
     protected final @NotNull Class<V> valueClass;
 
     protected final @NotNull ConfigValueParser<ConfigurationWrapper, V> parser;

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

@@ -1,5 +1,7 @@
 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;
@@ -11,6 +13,18 @@ import java.util.Optional;
 
 public class ConfiguredValue<V> extends CachedConfigValue<V> {
 
+    public static <V> ConfigValueBuilder<V> builder(Class<V> valueClass) {
+        return builder().asValue(valueClass);
+    }
+
+    public static <V> ConfiguredValue<V> of(Class<V> valueClass) {
+        return of(valueClass, null);
+    }
+
+    public static <V> ConfiguredValue<V> of(Class<V> valueClass, @Nullable V defaultValue) {
+        return builder(valueClass).fromObject().defaults(defaultValue).build();
+    }
+
     protected final @NotNull Class<V> valueClass;
 
     protected final @NotNull ConfigValueParser<Object, V> parser;

impl/yaml/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.0.0</version>
+        <version>1.0.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -35,5 +35,26 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>

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

@@ -11,7 +11,7 @@ public class EasyConfiguration {
         YamlConfigProvider provider = new YamlConfigProvider(file);
         try {
             provider.initializeFile(source);
-            provider.initialize();
+            provider.initializeConfig();
         } catch (IOException e) {
             e.printStackTrace();
         }

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

@@ -17,7 +17,7 @@ public class YamlConfigProvider extends FileConfigProvider {
         super(file);
     }
 
-    public void initialize() {
+    public void initializeConfig() {
         this.configuration = CommentedYamlConfiguration.loadConfiguration(comments, file);
     }
 

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

@@ -3,9 +3,12 @@ package config.source;
 import cc.carm.lib.configuration.core.ConfigurationRoot;
 import cc.carm.lib.configuration.core.annotation.ConfigComment;
 import cc.carm.lib.configuration.core.annotation.ConfigPath;
-import cc.carm.lib.configuration.core.builder.ConfigBuilder;
 import cc.carm.lib.configuration.core.util.MapFactory;
 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.misc.TestUser;
 
 import java.util.List;
@@ -16,8 +19,8 @@ import java.util.UUID;
 public class TestConfiguration extends ConfigurationRoot {
 
     @ConfigComment({"User测试"})
-    public static final ConfigValue<TestUser> USER = ConfigBuilder
-            .asValue(TestUser.class).fromSection()
+    public static final ConfigValue<TestUser> USER = ConfiguredSection
+            .builder(TestUser.class)
             .defaults(new TestUser("Carm", UUID.randomUUID()))
             .parseValue((section, defaultValue) -> new TestUser(
                     section.getString("name"),
@@ -29,8 +32,8 @@ public class TestConfiguration extends ConfigurationRoot {
             ).build();
 
     @ConfigComment({"[ID-UUID] 对照表", "", "用于测试Map类型的解析与序列化保存"})
-    public static final ConfigValue<Map<Integer, UUID>> USERS = ConfigBuilder
-            .asMap(Integer.class, UUID.class).fromString()
+    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();
@@ -38,16 +41,18 @@ public class TestConfiguration extends ConfigurationRoot {
     public static class Sub {
 
         @ConfigPath("uuid")
-        public static final ConfigValue<UUID> UUID_CONFIG_VALUE = ConfigBuilder
-                .asValue(UUID.class).fromString()
+        public static final ConfigValue<UUID> UUID_CONFIG_VALUE = ConfiguredValue
+                .builder(UUID.class).fromString()
                 .parseValue((data, defaultValue) -> UUID.fromString(data))
                 .build();
 
         @ConfigPath("nothing")
         public static class That {
 
-            public static final ConfigValue<List<UUID>> Operators = ConfigBuilder.asList(UUID.class).fromString()
-                    .parseValue(s -> Objects.requireNonNull(UUID.fromString(s))).build();
+            public static final ConfigValue<List<UUID>> Operators = ConfiguredList
+                    .builder(UUID.class).fromString()
+                    .parseValue(s -> Objects.requireNonNull(UUID.fromString(s)))
+                    .build();
 
         }
 

platform/bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.0.0</version>
+        <version>1.0.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -44,4 +44,25 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

platform/bungee/src/main/java/cc/carm/lib/configuration/EasyConfiguration.java

@@ -11,7 +11,7 @@ public class EasyConfiguration {
         BungeeConfigProvider provider = new BungeeConfigProvider(file);
         try {
             provider.initializeFile(source);
-            provider.initialize();
+            provider.initializeConfig();
         } catch (IOException e) {
             e.printStackTrace();
         }

platform/bungee/src/main/java/cc/carm/lib/configuration/bungee/BungeeConfigProvider.java

@@ -19,7 +19,7 @@ public class BungeeConfigProvider extends FileConfigProvider {
         super(file);
     }
 
-    public void initialize() throws IOException {
+    public void initializeConfig() throws IOException {
         this.configuration = getLoader().load(file);
     }
 

platform/spigot/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyconfiguration-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.0.0</version>
+        <version>1.0.4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -35,5 +35,26 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>

platform/spigot/src/main/java/cc/carm/lib/configuration/EasyConfiguration.java

@@ -12,7 +12,7 @@ public class EasyConfiguration {
         SpigotConfigProvider provider = new SpigotConfigProvider(file);
         try {
             provider.initializeFile(source);
-            provider.initialize();
+            provider.initializeConfig();
         } catch (IOException e) {
             e.printStackTrace();
         }

platform/spigot/src/main/java/cc/carm/lib/configuration/spigot/SpigotConfigProvider.java

@@ -17,7 +17,7 @@ public class SpigotConfigProvider extends FileConfigProvider {
         super(file);
     }
 
-    public void initialize() {
+    public void initializeConfig() {
         this.configuration = CommentedYamlConfiguration.loadConfiguration(comments, file);
     }
 

pom.xml

@@ -15,7 +15,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyconfiguration-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0</version>
+    <version>1.0.4</version>
     <modules>
         <module>core</module>
 
@@ -123,6 +123,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+                <configuration>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -247,14 +251,6 @@
                     </configuration>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.2</version>
-                    <configuration>
-                        <useSystemClassLoader>false</useSystemClassLoader>
-                    </configuration>
-                </plugin>
 
             </plugins>
         </pluginManagement>