502647092/YumCore
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/YumCore.git synced 2024-11-24 02:08:48 +00:00
Code Issues Releases Activity

fix: 修复配置注入默认值无效的问题

Browse Source 
Signed-off-by: 502647092 <admin@yumc.pw>
This commit is contained in:
502647092 2017-04-17 00:24:44 +08:00
parent 2766713ff9
commit d8c35355fa
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/pw/yumc/YumCore/config/inject/AbstractInjectConfig.java
View File

@ -24,7 +24,7 @@ import pw.yumc.YumCore.config.exception.ConfigParseException;
*/ */
public abstract class AbstractInjectConfig { public abstract class AbstractInjectConfig {
private static String INJECT_TYPE_ERROR = "配置节点 %s 数据类型不匹配 应该为: %s 但实际为: %s!"; private static String INJECT_TYPE_ERROR = "配置节点 %s 数据类型不匹配 应该为: %s 但实际为: %s!";
private static String INJECT_ERROR = "自动注入配置失败 可能造成插件运行错误 %s: %s!"; private static String INJECT_ERROR = "配置节点 %s 自动注入失败 可能造成插件运行错误 %s: %s!";
private static String PATH_NOT_FOUND = "配置节点 %s 丢失 将使用默认值!"; private static String PATH_NOT_FOUND = "配置节点 %s 丢失 将使用默认值!";
protected ConfigurationSection config; protected ConfigurationSection config;
@ -69,12 +69,12 @@ public abstract class AbstractInjectConfig {
private void hanldeValue(Field field, String path, Object value) throws IllegalAccessException, IllegalArgumentException, InstantiationException, InvocationTargetException, NoSuchMethodException, SecurityException, ConfigParseException { private void hanldeValue(Field field, String path, Object value) throws IllegalAccessException, IllegalArgumentException, InstantiationException, InvocationTargetException, NoSuchMethodException, SecurityException, ConfigParseException {
Class type = field.getType(); Class type = field.getType();
if (!type.equals(value.getClass())) { if (!type.equals(value.getClass())) {
value = InjectParse.parse(type, config, path); value = InjectParse.parse(type, value, config, path);
} }
if (type.equals(String.class)) { if (type.equals(String.class)) {
value = ChatColor.translateAlternateColorCodes('&', String.valueOf(value)); value = ChatColor.translateAlternateColorCodes('&', String.valueOf(value));
} }
if (value != null && !type.isAssignableFrom(value.getClass())) { if (!type.isAssignableFrom(value.getClass())) {
Log.w("字段 %s 默认类型为 %s 但解析后为 %s 可能存在转换错误!", field.getName(), type.getName(), value.getClass().getName()); Log.w("字段 %s 默认类型为 %s 但解析后为 %s 可能存在转换错误!", field.getName(), type.getName(), value.getClass().getName());
} }
field.set(this, value); field.set(this, value);
@ -182,10 +182,10 @@ public abstract class AbstractInjectConfig {
Log.w(PATH_NOT_FOUND, path); Log.w(PATH_NOT_FOUND, path);
applyDefault(field); applyDefault(field);
} }
if (value == null) { return; }
} else { } else {
value = config.get(path); value = config.get(path);
} }
if (value == null) { return; }
hanldeValue(field, path, value); hanldeValue(field, path, value);
} catch (IllegalArgumentException ex) { } catch (IllegalArgumentException ex) {
Log.w(INJECT_TYPE_ERROR, path, field.getType().getName(), value != null ? value.getClass().getName() : "空指针"); Log.w(INJECT_TYPE_ERROR, path, field.getType().getName(), value != null ? value.getClass().getName() : "空指针");
@ -193,7 +193,7 @@ public abstract class AbstractInjectConfig {
} catch (ConfigParseException e) { } catch (ConfigParseException e) {
Log.w(e.getMessage()); Log.w(e.getMessage());
} catch (InstantiationException | InvocationTargetException | NoSuchMethodException | SecurityException | IllegalAccessException ex) { } catch (InstantiationException | InvocationTargetException | NoSuchMethodException | SecurityException | IllegalAccessException ex) {
Log.w(INJECT_ERROR, ex.getClass().getName(), ex.getMessage()); Log.w(INJECT_ERROR, path, ex.getClass().getName(), ex.getMessage());
Log.d(ex); Log.d(ex);
} }
} }

3
src/main/java/pw/yumc/YumCore/config/inject/InjectParse.java
View File

@ -33,9 +33,8 @@ public class InjectParse {
new DateFormatParse(); new DateFormatParse();
} }
public static Object parse(Class type, ConfigurationSection config, String path) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { public static Object parse(Class type, Object value, ConfigurationSection config, String path) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException {
if (allparse.containsKey(type)) { return allparse.get(type).parse(config, path); } if (allparse.containsKey(type)) { return allparse.get(type).parse(config, path); }
Object value = config.get(path);
try { try {
return type.getDeclaredMethod("valueOf", String.class).invoke(null, value); return type.getDeclaredMethod("valueOf", String.class).invoke(null, value);
} catch (NoSuchMethodException | IllegalArgumentException ignored) { } catch (NoSuchMethodException | IllegalArgumentException ignored) {