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

Introduce `VirtualIdEmbeddable` and `IdClassEmbeddable` + instantiators 

EmbeddableInitializer fully uses EmbeddableInstantiator and value injection

Still need to
  - integrate EmbeddableInstantiator work (ComponentType/ComponentTuplizer)
  - integrate embedded forms.  `VirtualIdEmbeddable` does not really need it as it can use the id-mapping itself as the embedded form.  But `IdClassEmbedded` should really be integrated
  - integrate `VirtualKeyEmbeddable` and `VirtualKeyEmbedded` for use as inverse composite fks
  - share `#finishInit` handling for `EmbeddableMappingType`, `VirtualIdEmbeddable` and `IdClassEmbeddable`
  - ability to use the containing composite owner as the parent of a composite (legacy behavior is to always use the "first" entity
This commit is contained in:
Steve Ebersole 2021-11-30 19:38:02 -06:00
parent a9fce4b69d
commit 5b44aa5d44
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java
View File

@ -62,11 +62,8 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
private final List<DomainResultAssembler<?>> assemblers;
// per-row state
// NOTE : technically `resolvedValues` need not be instance state,
// but keeping it here allows for not creating arrays for each
// and every row
private final Object[] resolvedValues;
private Boolean allValuesNull;
private final Object[] rowState;
private Boolean stateAllNull;
private Boolean stateInjected;
private Object compositeInstance;
@ -91,7 +88,7 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
representationStrategy = representationEmbeddable.getRepresentationStrategy();
final int numOfAttrs = embeddableTypeDescriptor.getNumberOfAttributeMappings();
this.resolvedValues = new Object[ numOfAttrs ];
this.rowState = new Object[ numOfAttrs ];
this.assemblers = arrayList( numOfAttrs );
embeddableTypeDescriptor.visitFetchables(
@ -169,7 +166,7 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
final Initializer parentInitializer = processingState.resolveInitializer( navigablePath.getParent() );
if ( parentInitializer != this ) {
( (FetchParentAccess) parentInitializer ).registerResolutionListener( (entity) -> {
representationEmbeddable.setPropertyValues( entity, resolvedValues );
representationEmbeddable.setPropertyValues( entity, rowState );
stateInjected = true;
} );
}
@ -180,9 +177,9 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
// NOTE: `valuesAccess` is set to null to indicate that all values are null,
// as opposed to returning the all-null value array. the instantiator
// interprets that as the values are not known or were all null.
final Supplier<Object[]> valuesAccess = allValuesNull
final Supplier<Object[]> valuesAccess = stateAllNull
? null
: () -> resolvedValues;
: () -> rowState;
final Object target = representationStrategy
.getInstantiator()
.instantiate( valuesAccess, sessionFactory);
@ -190,10 +187,10 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
( (HibernateProxy) compositeInstance ).getHibernateLazyInitializer().setImplementation( target );
}
}
else if ( allValuesNull == FALSE && stateInjected != TRUE ) {
else if ( stateAllNull == FALSE && stateInjected != TRUE ) {
// todo (6.0) : i think this is still called for cases where
// we have already done the "ctor injection"
representationEmbeddable.setPropertyValues( compositeInstance, resolvedValues );
representationEmbeddable.setPropertyValues( compositeInstance, rowState );
stateInjected = true;
}
}
@ -235,7 +232,7 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
}
private void extractRowState(RowProcessingState processingState) {
allValuesNull = true;
stateAllNull = true;
for ( int i = 0; i < assemblers.size(); i++ ) {
final DomainResultAssembler<?> assembler = assemblers.get( i );
final Object contributorValue = assembler.assemble(
@ -243,9 +240,9 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
processingState.getJdbcValuesSourceProcessingState().getProcessingOptions()
);
resolvedValues[i] = contributorValue;
rowState[i] = contributorValue;
if ( contributorValue != null ) {
allValuesNull = false;
stateAllNull = false;
}
}
@ -272,11 +269,11 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
final ToOneAttributeMapping toOneAttributeMapping = (ToOneAttributeMapping) virtualIdAttribute;
final ForeignKeyDescriptor fkDescriptor = toOneAttributeMapping.getForeignKeyDescriptor();
final Object associationKey = fkDescriptor.getAssociationKeyFromSide(
resolvedValues[position],
rowState[position],
toOneAttributeMapping.getSideNature().inverse(),
session
);
resolvedValues[position] = associationKey;
rowState[position] = associationKey;
}
}
);
@ -289,13 +286,13 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
EmbeddableRepresentationStrategy representationStrategy,
RowProcessingState processingState,
SessionFactoryImplementor sessionFactory) {
if ( !createEmptyCompositesEnabled && allValuesNull == TRUE ) {
if ( !createEmptyCompositesEnabled && stateAllNull == TRUE ) {
return NULL_MARKER;
}
final Supplier<Object[]> valuesAccess = allValuesNull == TRUE
final Supplier<Object[]> valuesAccess = stateAllNull == TRUE
? null
: () -> resolvedValues;
: () -> rowState;
final Object instance = representationStrategy.getInstantiator().instantiate( valuesAccess, sessionFactory );
stateInjected = true;
@ -388,7 +385,7 @@ public abstract class AbstractEmbeddableInitializer extends AbstractFetchParentA
@Override
public void finishUpRow(RowProcessingState rowProcessingState) {
compositeInstance = null;
allValuesNull = null;
stateAllNull = null;
stateInjected = null;
clearResolutionListeners();