@@ -1184,7 +1184,7 @@ else if ( associationType instanceof ManyToOneType manyToOneType
1184
1184
}
1185
1185
1186
1186
protected Map <String , SingleIdArrayLoadPlan > getLazyLoadPlanByFetchGroup () {
1187
- final BytecodeEnhancementMetadata metadata = entityMetamodel . getBytecodeEnhancementMetadata ();
1187
+ final var metadata = getBytecodeEnhancementMetadata ();
1188
1188
return metadata .isEnhancedForLazyLoading () && metadata .getLazyAttributesMetadata ().hasLazyAttributes ()
1189
1189
? createLazyLoadPlanByFetchGroup ( metadata )
1190
1190
: emptyMap ();
@@ -1585,7 +1585,7 @@ protected Object initializeLazyPropertiesFromDatastore(
1585
1585
LOG .tracef ( "Initializing lazy properties from datastore (triggered for `%s`)" , fieldName );
1586
1586
1587
1587
final LazyAttributesMetadata lazyAttributesMetadata =
1588
- getEntityMetamodel (). getBytecodeEnhancementMetadata ().getLazyAttributesMetadata ();
1588
+ getBytecodeEnhancementMetadata ().getLazyAttributesMetadata ();
1589
1589
final String fetchGroup = lazyAttributesMetadata .getFetchGroupName ( fieldName );
1590
1590
final List <LazyAttributeDescriptor > fetchGroupAttributeDescriptors =
1591
1591
lazyAttributesMetadata .getFetchGroupAttributeDescriptors ( fetchGroup );
@@ -3491,9 +3491,9 @@ public Object initializeEnhancedEntityUsedAsProxy(
3491
3491
Object entity ,
3492
3492
String nameOfAttributeBeingAccessed ,
3493
3493
SharedSessionContractImplementor session ) {
3494
- final BytecodeEnhancementMetadata enhancementMetadata = getEntityMetamodel (). getBytecodeEnhancementMetadata ();
3495
- final BytecodeLazyAttributeInterceptor currentInterceptor = enhancementMetadata .extractLazyInterceptor ( entity );
3496
- if ( currentInterceptor instanceof EnhancementAsProxyLazinessInterceptor proxyInterceptor ) {
3494
+ final var enhancementMetadata = getBytecodeEnhancementMetadata ();
3495
+ if ( enhancementMetadata .extractLazyInterceptor ( entity )
3496
+ instanceof EnhancementAsProxyLazinessInterceptor proxyInterceptor ) {
3497
3497
3498
3498
final EntityKey entityKey = proxyInterceptor .getEntityKey ();
3499
3499
final Object identifier = entityKey .getIdentifier ();
@@ -3795,7 +3795,7 @@ public boolean hasLazyProperties() {
3795
3795
3796
3796
@ Override
3797
3797
public void afterReassociate (Object entity , SharedSessionContractImplementor session ) {
3798
- final BytecodeEnhancementMetadata metadata = getEntityMetamodel (). getBytecodeEnhancementMetadata ();
3798
+ final var metadata = getBytecodeEnhancementMetadata ();
3799
3799
if ( metadata .isEnhancedForLazyLoading () ) {
3800
3800
final BytecodeLazyAttributeInterceptor interceptor = metadata .extractLazyInterceptor ( entity );
3801
3801
if ( interceptor == null ) {
@@ -3928,7 +3928,7 @@ public boolean hasSubclasses() {
3928
3928
public boolean hasProxy () {
3929
3929
// skip proxy instantiation if entity is bytecode enhanced
3930
3930
return entityMetamodel .isLazy ()
3931
- && !entityMetamodel . getBytecodeEnhancementMetadata ().isEnhancedForLazyLoading ();
3931
+ && !getBytecodeEnhancementMetadata ().isEnhancedForLazyLoading ();
3932
3932
}
3933
3933
3934
3934
@ Override @ Deprecated
@@ -4019,7 +4019,7 @@ public String toString() {
4019
4019
4020
4020
@ Override
4021
4021
public boolean isInstrumented () {
4022
- return entityMetamodel . getBytecodeEnhancementMetadata ().isEnhancedForLazyLoading ();
4022
+ return getBytecodeEnhancementMetadata ().isEnhancedForLazyLoading ();
4023
4023
}
4024
4024
4025
4025
@ Override
@@ -4060,8 +4060,8 @@ public boolean isVersionGeneratedBeforeExecution() {
4060
4060
public void afterInitialize (Object entity , SharedSessionContractImplementor session ) {
4061
4061
if ( isPersistentAttributeInterceptable ( entity )
4062
4062
&& getRepresentationStrategy ().getMode () == POJO ) {
4063
- final BytecodeLazyAttributeInterceptor interceptor =
4064
- getEntityMetamodel (). getBytecodeEnhancementMetadata ()
4063
+ final var interceptor =
4064
+ getBytecodeEnhancementMetadata ()
4065
4065
.extractLazyInterceptor ( entity );
4066
4066
assert interceptor != null ;
4067
4067
if ( interceptor .getLinkedSession () == null ) {
@@ -4142,9 +4142,8 @@ public void setPropertyValues(Object object, Object[] values) {
4142
4142
accessOptimizer .setPropertyValues ( object , values );
4143
4143
}
4144
4144
else {
4145
- final BytecodeEnhancementMetadata enhancementMetadata = entityMetamodel .getBytecodeEnhancementMetadata ();
4146
4145
final AttributeMappingsList attributeMappings = getAttributeMappings ();
4147
- if ( enhancementMetadata .isEnhancedForLazyLoading () ) {
4146
+ if ( getBytecodeEnhancementMetadata () .isEnhancedForLazyLoading () ) {
4148
4147
for ( int i = 0 ; i < attributeMappings .size (); i ++ ) {
4149
4148
final Object value = values [i ];
4150
4149
if ( value != UNFETCHED_PROPERTY ) {
@@ -4171,11 +4170,11 @@ public Object[] getPropertyValues(Object object) {
4171
4170
return accessOptimizer .getPropertyValues ( object );
4172
4171
}
4173
4172
else {
4174
- final BytecodeEnhancementMetadata enhancementMetadata = entityMetamodel . getBytecodeEnhancementMetadata ();
4173
+ final var enhancementMetadata = getBytecodeEnhancementMetadata ();
4175
4174
final AttributeMappingsList attributeMappings = getAttributeMappings ();
4176
4175
final Object [] values = new Object [attributeMappings .size ()];
4177
4176
if ( enhancementMetadata .isEnhancedForLazyLoading () ) {
4178
- final LazyAttributesMetadata lazyAttributesMetadata = enhancementMetadata .getLazyAttributesMetadata ();
4177
+ final var lazyAttributesMetadata = enhancementMetadata .getLazyAttributesMetadata ();
4179
4178
for ( int i = 0 ; i < attributeMappings .size (); i ++ ) {
4180
4179
final AttributeMapping attributeMapping = attributeMappings .get ( i );
4181
4180
if ( !lazyAttributesMetadata .isLazyAttribute ( attributeMapping .getAttributeName () )
@@ -4288,8 +4287,8 @@ protected void linkToSession(Object entity, SharedSessionContractImplementor ses
4288
4287
}
4289
4288
4290
4289
private void setSession (PersistentAttributeInterceptable entity , SharedSessionContractImplementor session ) {
4291
- final BytecodeLazyAttributeInterceptor interceptor =
4292
- entityMetamodel . getBytecodeEnhancementMetadata ()
4290
+ final var interceptor =
4291
+ getBytecodeEnhancementMetadata ()
4293
4292
.extractLazyInterceptor ( entity );
4294
4293
if ( interceptor != null ) {
4295
4294
interceptor .setSession ( session );
@@ -4303,7 +4302,7 @@ public boolean isInstance(Object object) {
4303
4302
4304
4303
@ Override
4305
4304
public boolean hasUninitializedLazyProperties (Object object ) {
4306
- return entityMetamodel . getBytecodeEnhancementMetadata ().hasUnFetchedAttributes ( object );
4305
+ return getBytecodeEnhancementMetadata ().hasUnFetchedAttributes ( object );
4307
4306
}
4308
4307
4309
4308
@ Override
@@ -4369,7 +4368,7 @@ public Object[] getPropertyValuesToInsert(
4369
4368
}
4370
4369
4371
4370
protected boolean shouldGetAllProperties (Object entity ) {
4372
- final BytecodeEnhancementMetadata metadata = getEntityMetamodel (). getBytecodeEnhancementMetadata ();
4371
+ final var metadata = getBytecodeEnhancementMetadata ();
4373
4372
return !metadata .isEnhancedForLazyLoading ()
4374
4373
|| !metadata .hasUnFetchedAttributes ( entity );
4375
4374
}
@@ -4542,13 +4541,13 @@ public EntityRepresentationStrategy getRepresentationStrategy() {
4542
4541
return representationStrategy ;
4543
4542
}
4544
4543
4545
- @ Override
4544
+ @ Override @ Deprecated ( forRemoval = true )
4546
4545
public BytecodeEnhancementMetadata getInstrumentationMetadata () {
4547
4546
return getBytecodeEnhancementMetadata ();
4548
4547
}
4549
4548
4550
4549
@ Override
4551
- public BytecodeEnhancementMetadata getBytecodeEnhancementMetadata () {
4550
+ public final BytecodeEnhancementMetadata getBytecodeEnhancementMetadata () {
4552
4551
return entityMetamodel .getBytecodeEnhancementMetadata ();
4553
4552
}
4554
4553
0 commit comments