diff --git a/pom.xml b/pom.xml
index b59f744..94a91c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.imyeyu.config
timi-config
- 0.0.2
+ 0.0.3
true
@@ -27,10 +27,42 @@
maven-source-plugin
3.3.1
+
+ org.projectlombok
+ lombok-maven-plugin
+ 1.18.20.0
+
+ ${project.basedir}/src/main/java
+ ${project.build.directory}/delombok
+ false
+ UTF-8
+
+
+
+ generate-sources
+
+ delombok
+
+
+
+
+
+ org.projectlombok
+ lombok
+ 1.18.36
+
+
+
org.apache.maven.plugins
maven-javadoc-plugin
3.11.2
+
+ ${project.build.directory}/delombok
+ UTF-8
+ UTF-8
+ UTF-8
+
@@ -59,23 +91,23 @@
org.yaml
snakeyaml
- 2.2
+ 2.6
com.imyeyu.io
timi-io
- 0.0.2
+ 0.0.5
org.junit.jupiter
junit-jupiter
- 5.10.3
+ 6.0.3
test
org.projectlombok
lombok
- 1.18.34
+ 1.18.46
test
diff --git a/src/main/java/com/imyeyu/config/ConfigLoader.java b/src/main/java/com/imyeyu/config/ConfigLoader.java
index c8b017e..562e0f6 100644
--- a/src/main/java/com/imyeyu/config/ConfigLoader.java
+++ b/src/main/java/com/imyeyu/config/ConfigLoader.java
@@ -11,8 +11,12 @@ import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.representer.Representer;
import java.io.File;
+import java.lang.reflect.Array;
import java.lang.reflect.Field;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -40,6 +44,9 @@ public class ConfigLoader {
/**
* 创建配置加载器,源路径和目标路径相同
+ *
+ * @param path 源路径/目标路径
+ * @param clazz 配置类型
*/
public ConfigLoader(String path, Class clazz) {
this(path, path, clazz);
@@ -69,7 +76,7 @@ public class ConfigLoader {
LoaderOptions loaderOptions = new LoaderOptions();
loaderOptions.setAllowRecursiveKeys(false); // 禁止递归键
loaderOptions.setMaxAliasesForCollections(50); // 限制别名数量
- loaderOptions.setCodePointLimit((int) (IOSize.MB * 3)); // 限制 3 MB
+ loaderOptions.setCodePointLimit((int) (IOSize.MB * 10)); // 限制 10 MB
DumperOptions dumperOptions = new DumperOptions();
dumperOptions.setIndent(4);
@@ -96,13 +103,7 @@ public class ConfigLoader {
public T load() {
try {
String content = IO.toString(file);
- String normalized = content.replaceAll("\t", " ");
- if (converters.isEmpty()) {
- // SnakeYAML 自动转换 - 使用指定类型构造
- value = yaml.load(normalized);
- return value;
- }
- Object raw = rawYaml.load(normalized);
+ Object raw = rawYaml.load(content);
if (raw == null) {
value = null;
return null;
@@ -129,9 +130,8 @@ public class ConfigLoader {
Object toSerialize = applyConvertersOnDump(value);
// SnakeYAML 序列化
String yamlContent = yaml.dump(toSerialize);
- // 空格转制表符
- String toWrite = yamlContent.replaceAll("( ){4}", " ");
- IO.toFile(file, toWrite);
+
+ IO.toFile(file, yamlContent);
} catch (Exception e) {
throw new TimiException(TimiCode.ERROR, "dump config error: " + file.getAbsolutePath(), e);
}
@@ -163,11 +163,10 @@ public class ConfigLoader {
Class> currentClass = target.getClass();
while (currentClass != null && currentClass != Object.class) {
for (Field field : currentClass.getDeclaredFields()) {
- String fieldName = field.getName();
- if (!map.containsKey(fieldName)) {
+ Object rawValue = resolveMapValue(map, field.getName());
+ if (rawValue == null && !containsFieldKey(map, field.getName())) {
continue;
}
- Object rawValue = map.get(fieldName);
Object converted = convertFieldValue(field, rawValue);
field.setAccessible(true);
field.set(target, converted);
@@ -176,6 +175,17 @@ public class ConfigLoader {
}
}
+ private boolean containsFieldKey(Map, ?> map, String fieldName) {
+ return map.containsKey(fieldName) || map.containsKey(toSnakeCase(fieldName));
+ }
+
+ private Object resolveMapValue(Map, ?> map, String fieldName) {
+ if (map.containsKey(fieldName)) {
+ return map.get(fieldName);
+ }
+ return map.get(toSnakeCase(fieldName));
+ }
+
private Object convertFieldValue(Field field, Object rawValue) {
BaseConverter, ?> converter = converters.get(field.getType());
if (converter != null) {
@@ -188,12 +198,40 @@ public class ConfigLoader {
if (fieldType.isEnum()) {
return toEnumValue(fieldType, rawValue.toString());
}
+ if (fieldType.isArray() && rawValue instanceof Iterable> rawIterable) {
+ return toArrayValue(fieldType.getComponentType(), rawIterable);
+ }
if (rawValue instanceof Map, ?> rawMap && shouldMapToBean(fieldType)) {
return mapToBean(rawMap, fieldType);
}
return convertScalarValue(fieldType, rawValue);
}
+ private Object toArrayValue(Class> componentType, Iterable> rawIterable) {
+ List