henryC
/
flyfish-framework
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：增加自动完成数据源

This commit is contained in:
wangyu 2021-10-25 21:32:28 +08:00
parent d53dfaffb0
commit d0ea4d5143
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
View File

@ -348,15 +348,14 @@ public class BeanProperty {
*/ */
private static List<BeanProperty> parseExtras(Class<?> clazz, List<BeanProperty> origin) { private static List<BeanProperty> parseExtras(Class<?> clazz, List<BeanProperty> origin) {
List<BeanProperty> result = new ArrayList<>(); List<BeanProperty> result = new ArrayList<>();
MergedAnnotations annotations = MergedAnnotations.from(clazz);
// 包含properties // 包含properties
if (annotations.isPresent(Properties.class)) { if (clazz.isAnnotationPresent(Properties.class)) {
Properties properties = annotations.get(Properties.class).synthesize(); Properties properties = clazz.getAnnotation(Properties.class);
for (Property prop : properties.value()) { for (Property prop : properties.value()) {
applyExtraProperty(result, origin, prop); applyExtraProperty(result, origin, prop);
} }
} else if (annotations.isPresent(Property.class)) { } else if (clazz.isAnnotationPresent(Property.class)) {
applyExtraProperty(result, origin, annotations.get(Property.class).synthesize()); applyExtraProperty(result, origin, clazz.getAnnotation(Property.class));
} }
return result; return result;
} }