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

* Skipping auditing id mapping generation if the id mapping is unsupported (e.g. key-many-to-one) 

* Some logging

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18109 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Adam Warski 2009-12-01 07:20:17 +00:00
parent bf9f27215a
commit 7b6b156869
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,8 @@ import org.hibernate.MappingException;
import org.hibernate.cfg.Configuration;
import org.hibernate.mapping.*;
import org.hibernate.type.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author Adam Warski (adam at warski dot org)
@ -52,6 +54,8 @@ import org.hibernate.type.*;
* @author Tomasz Bech
*/
public final class AuditMetadataGenerator {
private static final Logger log = LoggerFactory.getLogger(AuditMetadataGenerator.class);
private final Configuration cfg;
private final GlobalConfiguration globalCfg;
private final AuditEntitiesConfiguration verEntCfg;
@ -317,6 +321,15 @@ public final class AuditMetadataGenerator {
if (!isAudited) {
String entityName = pc.getEntityName();
IdMappingData idMapper = idMetadataGenerator.addId(pc);
if (idMapper == null) {
// Unsupported id mapping, e.g. key-many-to-one. If the entity is used in auditing, an exception
// will be thrown later on.
log.debug("Unable to create auditing id mapping for entity " + entityName +
", because of an unsupported Hibernate id mapping (e.g. key-many-to-one).");
return;
}
ExtendedPropertyMapper propertyMapper = null;
String parentEntityName = null;
EntityConfiguration entityCfg = new EntityConfiguration(entityName, idMapper, propertyMapper,
@ -326,6 +339,8 @@ public final class AuditMetadataGenerator {
}
String entityName = pc.getEntityName();
log.debug("Generating first-pass auditing mapping for entity " + entityName + ".");
String auditEntityName = verEntCfg.getAuditEntityName(entityName);
String auditTableName = verEntCfg.getAuditTableName(entityName, pc.getTable().getName());
@ -395,6 +410,7 @@ public final class AuditMetadataGenerator {
public void generateSecondPass(PersistentClass pc, ClassAuditingData auditingData,
EntityXmlMappingData xmlMappingData) {
String entityName = pc.getEntityName();
log.debug("Generating second-pass auditing mapping for entity " + entityName + ".");
CompositeMapperBuilder propertyMapper = entitiesConfigurations.get(entityName).getPropertyMapper();

5
envers/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java
View File

@ -84,6 +84,11 @@ public final class IdMetadataGenerator {
Property id_prop = pc.getIdentifierProperty();
Component id_mapper = pc.getIdentifierMapper();
// Checking if the id mapping is supported
if (id_mapper == null && id_prop == null) {
return null;
}
SimpleIdMapperBuilder mapper;
if (id_mapper != null) {
// Multiple id