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

Refactoring, removed InFlightEntityMappingType#finishMappingModelInitialization method

This commit is contained in:
Andrea Boriero 2019-12-16 11:15:26 +00:00
parent 287808a914
commit d5715e3fbc
5 changed files with 21 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EmbeddableMappingType.java
View File

@ -23,7 +23,6 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.internal.util.collections.ArrayHelper;
import org.hibernate.mapping.Component;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.ToOne;
import org.hibernate.metamodel.mapping.internal.MappingModelCreationHelper;
import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess;
import org.hibernate.metamodel.mapping.internal.SingularAssociationAttributeMapping;
@ -194,14 +193,6 @@ public class EmbeddableMappingType implements ManagedMappingType {
compositeType.getCascadeStyle( attributeIndex ),
creationProcess
);
MappingModelCreationHelper.interpretKeyDescriptor(
singularAssociationAttributeMapping,
bootPropertyDescriptor,
(ToOne) bootPropertyDescriptor.getValue(),
entityPersister,
dialect,
creationProcess
);
attributeMappings.put( bootPropertyDescriptor.getName(), singularAssociationAttributeMapping );
// todo (6.0) : not sure it is always correct
columnPosition++;

4
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/InFlightEntityMappingType.java
View File

@ -35,8 +35,4 @@ public interface InFlightEntityMappingType extends EntityMappingType {
default void prepareMappingModel(MappingModelCreationProcess creationProcess) {
// by default do nothing - support for legacy impls
}
default void finishMappingModelInitialization(MappingModelCreationProcess creationProcess) {
// by default do nothing
}
}

24
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java
View File

@ -1281,12 +1281,11 @@ public class MappingModelCreationHelper {
}
}
public static SingularAssociationAttributeMapping buildSingularAssociationAttributeMapping(
String attrName,
int stateArrayPosition,
Property bootProperty,
ManagedMappingType declaringType,
EntityPersister declaringType,
EntityType attrType,
PropertyAccess propertyAccess,
CascadeStyle cascadeStyle,
@ -1316,7 +1315,7 @@ public class MappingModelCreationHelper {
final FetchStrategy fetchStrategy = new FetchStrategy( fetchTiming, fetchStyle );
return new SingularAssociationAttributeMapping(
final SingularAssociationAttributeMapping attributeMapping = new SingularAssociationAttributeMapping(
attrName,
stateArrayPosition,
(ToOne) bootProperty.getValue(),
@ -1326,6 +1325,25 @@ public class MappingModelCreationHelper {
declaringType,
propertyAccess
);
creationProcess.registerInitializationCallback(
() -> {
final Dialect dialect = creationProcess.getCreationContext()
.getSessionFactory()
.getJdbcServices()
.getDialect();
MappingModelCreationHelper.interpretKeyDescriptor(
attributeMapping,
bootProperty,
(ToOne) bootProperty.getValue(),
declaringType,
dialect,
creationProcess
);
return true;
}
);
return attributeMapping;
}
}

6
hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationProcess.java
View File

@ -66,12 +66,6 @@ public class MappingModelCreationProcess {
entityPersister.prepareMappingModel( this );
}
for ( EntityPersister entityPersister : entityPersisterMap.values() ) {
currentlyProcessingRole = entityPersister.getEntityName();
entityPersister.finishMappingModelInitialization( this );
}
while ( postInitCallbacks != null && ! postInitCallbacks.isEmpty() ) {
// copy to avoid CCME
final ArrayList<PostInitCallback> copy = new ArrayList<>( new ArrayList<>( postInitCallbacks ) );

25
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View File

@ -124,7 +124,6 @@ import org.hibernate.mapping.RootClass;
import org.hibernate.mapping.Selectable;
import org.hibernate.mapping.Subclass;
import org.hibernate.mapping.Table;
import org.hibernate.mapping.ToOne;
import org.hibernate.metadata.ClassMetadata;
import org.hibernate.metamodel.RepresentationMode;
import org.hibernate.metamodel.mapping.AttributeMapping;
@ -5781,27 +5780,6 @@ public abstract class AbstractEntityPersister
);
}
@Override
public void finishMappingModelInitialization(MappingModelCreationProcess creationProcess) {
singularAssociationsToFinilize.forEach( (property, singularAssociationAttributeMapping) -> {
final Dialect dialect = creationProcess.getCreationContext()
.getSessionFactory()
.getJdbcServices()
.getDialect();
MappingModelCreationHelper.interpretKeyDescriptor(
singularAssociationAttributeMapping,
property,
(ToOne) property.getValue(),
this,
dialect,
creationProcess
);
} );
singularAssociationsToFinilize.clear();
}
protected static SqmMultiTableMutationStrategy interpretSqmMultiTableStrategy(
AbstractEntityPersister entityMappingDescriptor,
MappingModelCreationProcess creationProcess) {
@ -5969,8 +5947,6 @@ public abstract class AbstractEntityPersister
throw new NotYetImplementedFor6Exception( AbstractEntityPersister.class );
}
Map<Property,SingularAssociationAttributeMapping> singularAssociationsToFinilize = new HashMap<>( );
private AttributeMapping generateNonIdAttributeMapping(
NonIdentifierAttribute tupleAttrDefinition,
Property bootProperty,
@ -6042,7 +6018,6 @@ public abstract class AbstractEntityPersister
tupleAttrDefinition.getCascadeStyle(),
creationProcess
);
singularAssociationsToFinilize.put( bootProperty,attributeMapping );
return attributeMapping;
}