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

HHH-8505: Fixed todos

This commit is contained in:
zuchos 2013-10-02 13:46:03 +02:00 committed by adamw
parent e971a8e14a
commit c9d4305bf1
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,13 +319,11 @@ public class AuditedPropertiesReader {
private void addPropertiesFromDynamicComponent(DynamicComponentSource dynamicComponentSource) {
Audited audited = computeAuditConfiguration( dynamicComponentSource.getXClass() );
if ( !fieldAccessedPersistentProperties.isEmpty() ) {
//TODO ŁŻ hmm... for sure ?
throw new MappingException( "Dynamic component cannot have field accessed persistent properties" );
throw new MappingException(
"Audited dynamic component cannot have properties with access=\"field\" for properties: " + fieldAccessedPersistentProperties + ". \n Change properties access=\"property\", to make it work)"
);
}
for ( String property : propertyAccessedPersistentProperties ) {
// If this is not a persistent property, with the same access type as currently checked,
// it's not audited as well.
// If the property was already defined by the subclass, is ignored by superclasses
String accessType = AccessType.PROPERTY.getType();
if ( !auditedPropertiesHolder.contains( property ) ) {
final Value propertyValue = persistentPropertiesSource.getProperty( property ).getValue();
@ -345,21 +343,6 @@ public class AuditedPropertiesReader {
);
}
}
else if ( propertiesGroupMapping.containsKey( property ) ) {
//todo ŁŻ - I'm not sure is that the case that we should handle for dynamic component.
// Retrieve embedded component name based on class field.
final String embeddedName = propertiesGroupMapping.get( property );
if ( !auditedPropertiesHolder.contains( embeddedName ) ) {
// Manage properties mapped within <properties> tag.
final Value propertyValue = persistentPropertiesSource.getProperty( embeddedName ).getValue();
this.addFromPropertiesGroup(
embeddedName,
new DynamicProperty( dynamicComponentSource, property ), accessType,
(Component) propertyValue,
audited
);
}
}
}
}

4
hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java
View File

@ -50,8 +50,8 @@ public class ComponentPropertyMapper implements PropertyMapper, CompositeMapperB
public ComponentPropertyMapper(PropertyData propertyData, Class componentClass) {
this.propertyData = propertyData;
//ŁŻ this could be done better
if ( Map.class.equals( componentClass ) ) {
//if class is a map it means that this is dynamic component
if ( Map.class.isAssignableFrom( componentClass ) ) {
this.delegate = new MultiDynamicComponentMapper( propertyData );
this.componentClass = HashMap.class;
}