Skip to content

兼容jdk7 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leganck wants to merge 1 commit into
base: master
Choose a base branch
from
Open

兼容jdk7 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/main/java/com/github/dadiyang/equator/FieldBaseEquator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,24 @@ private Map<String, Field> getAllFields(Object obj) {
if (obj == null) {
return Collections.emptyMap();
}
return CACHE.computeIfAbsent(obj.getClass(), k -> {
Class<?> clazz = obj.getClass();
Map<String, Field> allField = CACHE.get(clazz);
if (allField == null) {
Map<String, Field> fieldMap = new HashMap<>(8);
Class<?> cls = k;
while (cls != Object.class) {
Field[] fields = cls.getDeclaredFields();
while (clazz != Object.class) {
Field[] fields = clazz.getDeclaredFields();
for (Field field : fields) {
// 一些通过字节码注入改写类的框架会合成一些字段，如 jacoco 的 $jacocoData 字段
// 正常情况下这些字段都需要被排除掉
if (!field.isSynthetic()) {
fieldMap.put(field.getName(), field);
}
}
cls = cls.getSuperclass();
clazz = clazz.getSuperclass();
}
CACHE.put(clazz, fieldMap);
return fieldMap;
});
}
return allField;
}
}
}
9 changes: 6 additions & 3 deletions src/main/java/com/github/dadiyang/equator/GetterBaseEquator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,9 @@ private Map<String, Method> getAllGetters(Object obj) {
if (obj == null) {
return Collections.emptyMap();
}
return CACHE.computeIfAbsent(obj.getClass(), k -> {
Class<?> clazz = obj.getClass();
Class<?> clazz = obj.getClass();
Map<String, Method> allGetMethods = CACHE.get(clazz);
if (allGetMethods == null) {
Map<String, Method> getters = new LinkedHashMap<>(8);
while (clazz != Object.class) {
Method[] methods = clazz.getDeclaredMethods();
Expand All @@ -136,8 +137,10 @@ private Map<String, Method> getAllGetters(Object obj) {
}
clazz = clazz.getSuperclass(); //得到父类,然后赋给自己
}
CACHE.put(clazz, getters);
return getters;
});
}
return allGetMethods;
}

/**
Expand Down