Fix for HHH-4646 and HHH-5177: removing unneeded addPropertiesFromClassRec method

This commit is contained in:
adamw 2010-10-21 15:59:03 +02:00
parent 65e14bb39b
commit c6a6e5cea1
1 changed files with 1 additions and 14 deletions

View File

@ -89,24 +89,11 @@ public class AuditedPropertiesReader {
if(allClassAudited != null || !auditedPropertiesHolder.isEmpty()) { if(allClassAudited != null || !auditedPropertiesHolder.isEmpty()) {
XClass superclazz = clazz.getSuperclass(); XClass superclazz = clazz.getSuperclass();
if (!clazz.isInterface() && !"java.lang.Object".equals(superclazz.getName())) { if (!clazz.isInterface() && !"java.lang.Object".equals(superclazz.getName())) {
addPropertiesFromClassRec(superclazz); addPropertiesFromClass(superclazz);
} }
} }
} }
private void addPropertiesFromClassRec(XClass clazz) {
Audited allClassAudited = clazz.getAnnotation(Audited.class);
XClass superclazz = clazz.getSuperclass();
if (!clazz.isInterface() && !"java.lang.Object".equals(superclazz.getName())) {
addPropertiesFromClassRec(superclazz);
}
addFromProperties(clazz.getDeclaredProperties("field"), "field", fieldAccessedPersistentProperties, allClassAudited);
addFromProperties(clazz.getDeclaredProperties("property"), "property", propertyAccessedPersistentProperties, allClassAudited);
}
private void addFromProperties(Iterable<XProperty> properties, String accessType, Set<String> persistentProperties, Audited allClassAudited) { private void addFromProperties(Iterable<XProperty> properties, String accessType, Set<String> persistentProperties, Audited allClassAudited) {
for (XProperty property : properties) { for (XProperty property : properties) {
// If this is not a persistent property, with the same access type as currently checked, // If this is not a persistent property, with the same access type as currently checked,