HHH-19536 Flattening hierarchy of BytecodeLazyAttributeInterceptor: delete intermediate abstract class AbstractLazyLoadInterceptor

Author: Sanne

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/AbstractLazyLoadInterceptor.java

@@ -25,7 +25,7 @@
 /**
  * @author Steve Ebersole
  */
-public class EnhancementAsProxyLazinessInterceptor extends AbstractLazyLoadInterceptor {
+public class EnhancementAsProxyLazinessInterceptor extends AbstractInterceptor implements BytecodeLazyAttributeInterceptor {
 	private final Set<String> identifierAttributeNames;
 	private final CompositeType nonAggregatedCidMapper;
 
@@ -45,7 +45,7 @@ public EnhancementAsProxyLazinessInterceptor(
 			CompositeType nonAggregatedCidMapper,
 			EntityKey entityKey,
 			SharedSessionContractImplementor session) {
-		super( entityName, session );
+		super( entityName );
 
 		this.identifierAttributeNames = identifierAttributeNames;
 		assert identifierAttributeNames != null;
@@ -54,6 +54,7 @@ public EnhancementAsProxyLazinessInterceptor(
 		assert nonAggregatedCidMapper != null || identifierAttributeNames.size() == 1;
 
 		this.entityKey = entityKey;
+		setSession( session );
 
 		final EntityPersister entityPersister =
 				session.getFactory().getMappingMetamodel()

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementAsProxyLazinessInterceptor.java

@@ -27,7 +27,7 @@
  * @author Luis Barreiro
  * @author Steve Ebersole
  */
-public class LazyAttributeLoadingInterceptor extends AbstractLazyLoadInterceptor {
+public class LazyAttributeLoadingInterceptor extends AbstractInterceptor implements BytecodeLazyAttributeInterceptor {
 	private final Object identifier;
 
 	//N.B. this Set needs to be treated as immutable
@@ -40,9 +40,10 @@ public LazyAttributeLoadingInterceptor(
 			Object identifier,
 			Set<String> lazyFields,
 			SharedSessionContractImplementor session) {
-		super( entityName, session );
+		super( entityName );
 		this.identifier = identifier;
 		this.lazyFields = lazyFields;
+		setSession( session );
 	}
 
 	@Override