From dc15a75f0ef3f2d2bc43a85f4a595fba4526f97b Mon Sep 17 00:00:00 2001 From: wentch <22250530@qq.com> Date: Fri, 15 Jan 2016 16:17:09 +0800 Subject: [PATCH] --- src/org/redkale/service/DataSQLListenerService.java | 1 + src/org/redkale/util/ResourceFactory.java | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/org/redkale/service/DataSQLListenerService.java b/src/org/redkale/service/DataSQLListenerService.java index d74504620..a7f785602 100644 --- a/src/org/redkale/service/DataSQLListenerService.java +++ b/src/org/redkale/service/DataSQLListenerService.java @@ -25,6 +25,7 @@ import org.redkale.util.*; * * @author zhangjx */ +@Deprecated @AutoLoad(false) @ResourceType({DataSQLListenerService.class, DataSQLListener.class}) public class DataSQLListenerService implements DataSQLListener, Service { diff --git a/src/org/redkale/util/ResourceFactory.java b/src/org/redkale/util/ResourceFactory.java index 6034645d3..60f4318f9 100644 --- a/src/org/redkale/util/ResourceFactory.java +++ b/src/org/redkale/util/ResourceFactory.java @@ -236,7 +236,9 @@ public final class ResourceFactory { return null; } - public Map find(final Pattern reg, Class clazz, A exclude) { + //Map无法保证ResourceEntry的自动同步, 暂时不提供该功能 + @Deprecated + private Map find(final Pattern reg, Class clazz, A exclude) { Map result = new LinkedHashMap(); load(reg, clazz, exclude, result); return result; @@ -308,10 +310,11 @@ public final class ResourceFactory { final String rcname = tname; ResourceEntry re = genctype == classtype ? null : findEntry(rcname, genctype); if (re == null) { - if (Map.class.isAssignableFrom(classtype)) { - Map map = find(Pattern.compile(rcname.isEmpty() ? ".*" : rcname), (Class) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[1], src); - if (map != null) re = new ResourceEntry(map); - } else if (rcname.startsWith("property.")) { +// if (Map.class.isAssignableFrom(classtype)) { +// Map map = find(Pattern.compile(rcname.isEmpty() ? ".*" : rcname), (Class) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[1], src); +// if (map != null) re = new ResourceEntry(map); +// } else + if (rcname.startsWith("property.")) { re = findEntry(rcname, String.class); } else { re = findEntry(rcname, classtype);