lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
wentch
2016-01-15 16:17:09 +08:00
parent 32718d8fe6
commit dc15a75f0e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/org/redkale/service/DataSQLListenerService.java
View File

@@ -25,6 +25,7 @@ import org.redkale.util.*;
* *
* @author zhangjx * @author zhangjx
*/ */
@Deprecated
@AutoLoad(false) @AutoLoad(false)
@ResourceType({DataSQLListenerService.class, DataSQLListener.class}) @ResourceType({DataSQLListenerService.class, DataSQLListener.class})
public class DataSQLListenerService implements DataSQLListener, Service { public class DataSQLListenerService implements DataSQLListener, Service {

13
src/org/redkale/util/ResourceFactory.java
View File

@@ -236,7 +236,9 @@ public final class ResourceFactory {
return null; return null;
} }
public <A> Map<String, A> find(final Pattern reg, Class<? extends A> clazz, A exclude) { //Map无法保证ResourceEntry的自动同步， 暂时不提供该功能
@Deprecated
private <A> Map<String, A> find(final Pattern reg, Class<? extends A> clazz, A exclude) {
Map<String, A> result = new LinkedHashMap(); Map<String, A> result = new LinkedHashMap();
load(reg, clazz, exclude, result); load(reg, clazz, exclude, result);
return result; return result;
@@ -308,10 +310,11 @@ public final class ResourceFactory {
final String rcname = tname; final String rcname = tname;
ResourceEntry re = genctype == classtype ? null : findEntry(rcname, genctype); ResourceEntry re = genctype == classtype ? null : findEntry(rcname, genctype);
if (re == null) { if (re == null) {
if (Map.class.isAssignableFrom(classtype)) { // if (Map.class.isAssignableFrom(classtype)) {
Map map = find(Pattern.compile(rcname.isEmpty() ? ".*" : rcname), (Class) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[1], src); // Map map = find(Pattern.compile(rcname.isEmpty() ? ".*" : rcname), (Class) ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[1], src);
if (map != null) re = new ResourceEntry(map); // if (map != null) re = new ResourceEntry(map);
} else if (rcname.startsWith("property.")) { // } else
if (rcname.startsWith("property.")) {
re = findEntry(rcname, String.class); re = findEntry(rcname, String.class);
} else { } else {
re = findEntry(rcname, classtype); re = findEntry(rcname, classtype);