Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-12913 - Fix AuditJoinTable to work when specified in an AuditOverride.

This commit is contained in:
Chris Cranford 2018-11-07 15:31:47 -05:00
parent 8a74973776
commit b00f580d8d
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java
View File

@ -28,7 +28,6 @@ import org.hibernate.annotations.common.reflection.ClassLoadingException;
import org.hibernate.annotations.common.reflection.ReflectionManager; import org.hibernate.annotations.common.reflection.ReflectionManager;
import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XClass;
import org.hibernate.annotations.common.reflection.XProperty; import org.hibernate.annotations.common.reflection.XProperty;
import org.hibernate.cfg.AccessType;
import org.hibernate.envers.AuditJoinTable; import org.hibernate.envers.AuditJoinTable;
import org.hibernate.envers.AuditMappedBy; import org.hibernate.envers.AuditMappedBy;
import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverride;
@ -62,6 +61,7 @@ import static org.hibernate.envers.internal.tools.Tools.newHashSet;
* @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
* @author Michal Skowronek (mskowr at o2 dot pl) * @author Michal Skowronek (mskowr at o2 dot pl)
* @author Lukasz Zuchowski (author at zuchos dot com) * @author Lukasz Zuchowski (author at zuchos dot com)
* @author Chris Cranford
*/ */
public class AuditedPropertiesReader { public class AuditedPropertiesReader {
private static final EnversMessageLogger LOG = Logger.getMessageLogger( private static final EnversMessageLogger LOG = Logger.getMessageLogger(
@ -83,6 +83,7 @@ public class AuditedPropertiesReader {
private final Set<XProperty> overriddenAuditedProperties; private final Set<XProperty> overriddenAuditedProperties;
private final Set<XProperty> overriddenNotAuditedProperties; private final Set<XProperty> overriddenNotAuditedProperties;
private final Map<XProperty, AuditJoinTable> overriddenAuditedPropertiesJoinTables;
private final Set<XClass> overriddenAuditedClasses; private final Set<XClass> overriddenAuditedClasses;
private final Set<XClass> overriddenNotAuditedClasses; private final Set<XClass> overriddenNotAuditedClasses;
@ -107,6 +108,7 @@ public class AuditedPropertiesReader {
overriddenAuditedProperties = newHashSet(); overriddenAuditedProperties = newHashSet();
overriddenNotAuditedProperties = newHashSet(); overriddenNotAuditedProperties = newHashSet();
overriddenAuditedPropertiesJoinTables = newHashMap();
overriddenAuditedClasses = newHashSet(); overriddenAuditedClasses = newHashSet();
overriddenNotAuditedClasses = newHashSet(); overriddenNotAuditedClasses = newHashSet();
@ -163,6 +165,7 @@ public class AuditedPropertiesReader {
if ( !overriddenNotAuditedProperties.contains( property ) ) { if ( !overriddenNotAuditedProperties.contains( property ) ) {
// If the property has not been marked as not audited by the subclass. // If the property has not been marked as not audited by the subclass.
overriddenAuditedProperties.add( property ); overriddenAuditedProperties.add( property );
overriddenAuditedPropertiesJoinTables.put( property, auditOverride.auditJoinTable() );
} }
} }
else { else {
@ -640,13 +643,27 @@ public class AuditedPropertiesReader {
} }
private void addPropertyJoinTables(XProperty property, PropertyAuditingData propertyData) { private void addPropertyJoinTables(XProperty property, PropertyAuditingData propertyData) {
// first set the join table based on the AuditJoinTable annotation // The AuditJoinTable annotation source will follow the following priority rules
final AuditJoinTable joinTable = property.getAnnotation( AuditJoinTable.class ); // 1. Use the override if one is specified
if ( joinTable != null ) { // 2. Use the site annotation if one is specified
propertyData.setJoinTable( joinTable ); // 3. Use the default if neither are specified
//
// The prime directive for (1) is so that when users in a subclass use @AuditOverride(s)
// the join-table specified there should have a higher priority in the event the
// super-class defines an equivalent @AuditJoinTable at the site/property level.
final AuditJoinTable overrideJoinTable = overriddenAuditedPropertiesJoinTables.get( property );
if ( overrideJoinTable != null ) {
propertyData.setJoinTable( overrideJoinTable );
} }
else { else {
propertyData.setJoinTable( DEFAULT_AUDIT_JOIN_TABLE ); final AuditJoinTable propertyJoinTable = property.getAnnotation( AuditJoinTable.class );
if ( propertyJoinTable != null ) {
propertyData.setJoinTable( propertyJoinTable );
}
else {
propertyData.setJoinTable( DEFAULT_AUDIT_JOIN_TABLE );
}
} }
} }
@ -693,7 +710,6 @@ public class AuditedPropertiesReader {
} }
} }
} }
} }
return true; return true;
} }