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

HHH-7918 - Completely recalculate entity state on merge

This commit is contained in:
Lukasz Antoniak 2013-01-14 21:36:23 +01:00 committed by Brett Meyer
parent 357b12c040
commit 87eae02f5c
4 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
View File

@ -427,7 +427,7 @@ public final class AuditMetadataGenerator {
ExtendedPropertyMapper propertyMapper = null;
String parentEntityName = null;
EntityConfiguration entityCfg = new EntityConfiguration(entityName, pc.getClassName(), idMapper, propertyMapper,
parentEntityName, auditingData.isUsingModifiedFlag());
parentEntityName);
notAuditedEntitiesConfigurations.put(entityName, entityCfg);
return;
}
@ -501,7 +501,7 @@ public final class AuditMetadataGenerator {
// Storing the generated configuration
EntityConfiguration entityCfg = new EntityConfiguration(auditEntityName, pc.getClassName(), idMapper,
propertyMapper, parentEntityName, auditingData.isUsingModifiedFlag());
propertyMapper, parentEntityName);
entitiesConfigurations.put(pc.getEntityName(), entityCfg);
}

12
hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ClassAuditingData.java
View File

@ -85,18 +85,6 @@ public class ClassAuditingData implements AuditedPropertiesHolder {
public boolean isAudited() {
return defaultAudited || properties.size() > 0;
}
/**
* @return {@code true} if any of the properties has modification flag enabled, {@code false} otherwise.
*/
public boolean isUsingModifiedFlag() {
for ( PropertyAuditingData prop : properties.values() ) {
if ( prop.isUsingModifiedFlag() ) {
return true;
}
}
return false;
}
public boolean contains(String propertyName) {
return properties.containsKey(propertyName);

11
hibernate-envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java
View File

@ -42,16 +42,14 @@ public class EntityConfiguration {
// Maps from property name
private Map<String, RelationDescription> relations;
private String parentEntityName;
private boolean usingModifiedFlag;
public EntityConfiguration(String versionsEntityName, String entityClassName, IdMappingData idMappingData,
ExtendedPropertyMapper propertyMapper, String parentEntityName, boolean usingModifiedFlag) {
ExtendedPropertyMapper propertyMapper, String parentEntityName) {
this.versionsEntityName = versionsEntityName;
this.entityClassName = entityClassName;
this.idMappingData = idMappingData;
this.propertyMapper = propertyMapper;
this.parentEntityName = parentEntityName;
this.usingModifiedFlag = usingModifiedFlag;
this.relations = new HashMap<String, RelationDescription>();
}
@ -125,11 +123,4 @@ public class EntityConfiguration {
public String getEntityClassName() {
return entityClassName;
}
/**
* @return {@code true} if the entity or any of its properties use modification flag, {@code false} otherwise.
*/
public boolean isUsingModifiedFlag() {
return usingModifiedFlag;
}
}

15
hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/ModWorkUnit.java
View File

@ -74,15 +74,12 @@ public class ModWorkUnit extends AbstractAuditWorkUnit implements AuditWorkUnit
}
public AuditWorkUnit merge(ModWorkUnit second) {
if ( verCfg.getEntCfg().get( getEntityName() ).isUsingModifiedFlag() ) {
// In case of multiple subsequent flushes within single transaction, modification flags need to be
// recalculated against initial and final state of the given entity.
return new ModWorkUnit(
second.sessionImplementor, second.getEntityName(), second.verCfg, second.id,
second.entityPersister, second.newState, this.oldState
);
}
return second;
// In case of multiple subsequent flushes within single transaction, modification flags need to be
// recalculated against initial and final state of the given entity.
return new ModWorkUnit(
second.sessionImplementor, second.getEntityName(), second.verCfg, second.id,
second.entityPersister, second.newState, this.oldState
);
}
public AuditWorkUnit merge(DelWorkUnit second) {