initial work for table per class inheritance

Author: dreab8

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

@@ -5482,8 +5482,6 @@ public Object[] getPropertyValuesToInsert(Object entity, Map mergeMap, SharedSes
 			return accessOptimizer.getPropertyValues( entity );
 		}
 
-		final Collection<AttributeMapping> attributeMappings = getAttributeMappings();
-
 		final Object[] result = new Object[this.attributeMappings.size()];
 		for ( int i = 0; i < this.attributeMappings.size(); i++ ) {
 			result[i] = this.attributeMappings.get( i ).getPropertyAccess().getGetter().getForInsert(
@@ -6102,7 +6100,7 @@ public CacheEntry buildCacheEntry(Object entity, Object[] state, Object version,
 	private List<AttributeMapping> attributeMappings;
 	private List<Fetchable> staticFetchableList;
 
-	private ReflectionOptimizer.AccessOptimizer accessOptimizer;
+	protected ReflectionOptimizer.AccessOptimizer accessOptimizer;
 
 	@Override
 	public void visitAttributeMappings(Consumer<AttributeMapping> action) {
@@ -6142,17 +6140,7 @@ public void prepareMappingModel(MappingModelCreationProcess creationProcess) {
 				);
 			}
 
-			if ( getDiscriminatorType() == null && shouldProcessSuperMapping() ) {
-				discriminatorMapping = null;
-			}
-			else {
-				discriminatorMapping = new EntityDiscriminatorMappingImpl(
-						this,
-						getRootTableName(),
-						getDiscriminatorColumnName(),
-						(BasicType) getDiscriminatorType()
-				);
-			}
+			buildDiscriminatorMapping();
 
 			// todo (6.0) : support for natural-id not yet implemented
 			naturalIdMapping = null;
@@ -6165,14 +6153,13 @@ public void prepareMappingModel(MappingModelCreationProcess creationProcess) {
 				.getEntityBinding( getEntityName() );
 
 		final EntityMetamodel currentEntityMetamodel = this.getEntityMetamodel();
-
-		int stateArrayPosition = superMappingType == null ? 0 : superMappingType.getNumberOfAttributeMappings();
+		int stateArrayPosition = getStateArrayInitialPosition( creationProcess );
 
 		for ( int i = 0; i < currentEntityMetamodel.getPropertySpan(); i++ ) {
 			final NonIdentifierAttribute runtimeAttrDefinition = currentEntityMetamodel.getProperties()[i];
 			final Property bootProperty = bootEntityDescriptor.getProperty( runtimeAttrDefinition.getName() );
 
-			if ( superMappingType != null && superMappingType.findAttributeMapping( bootProperty.getName() ) != null && shouldProcessSuperMapping() ) {
+			if ( superMappingType != null && superMappingType.findAttributeMapping( bootProperty.getName() ) != null ) {
 				// its defined on the super-type, skip it here
 			}
 			else {
@@ -6201,6 +6188,33 @@ public void prepareMappingModel(MappingModelCreationProcess creationProcess) {
 		}
 	}
 
+	protected int getStateArrayInitialPosition(MappingModelCreationProcess creationProcess) {
+		// todo (6.0) not sure this is correct in case of SingleTable Inheritance and for Table per class when the selection is the root
+		int stateArrayPosition;
+		if ( superMappingType != null ) {
+			( (InFlightEntityMappingType) superMappingType ).prepareMappingModel( creationProcess );
+			stateArrayPosition = superMappingType.getNumberOfAttributeMappings();
+		}
+		else {
+			stateArrayPosition = 0;
+		}
+		return stateArrayPosition;
+	}
+
+	protected void buildDiscriminatorMapping() {
+		if ( getDiscriminatorType() == null) {
+			discriminatorMapping = null;
+		}
+		else {
+			discriminatorMapping = new EntityDiscriminatorMappingImpl(
+					this,
+					getRootTableName(),
+					getDiscriminatorColumnName(),
+					(BasicType) getDiscriminatorType()
+			);
+		}
+	}
+
 	protected boolean shouldProcessSuperMapping(){
 		return true;
 	}
@@ -6524,6 +6538,7 @@ public void visitFetchables(
 			EntityMappingType treatTargetType) {
 		if ( treatTargetType == null ) {
 			getStaticFetchableList().forEach( fetchableConsumer );
+//			staticFetchableList.forEach( fetchableConsumer );
 			// EARLY EXIT!!!
 			return;
 		}