HHH-19536 Refactoring step: separate state handling between EnhancementAsProxyLazinessInterceptor and LazyAttributeLoadingInterceptor

Author: Sanne

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

@@ -11,15 +11,9 @@
  */
 public abstract class AbstractInterceptor implements SessionAssociableInterceptor {
 
-	private final String entityName;
 	private SessionAssociationMarkers sessionAssociation;
 
-	public AbstractInterceptor(String entityName) {
-		this.entityName = entityName;
-	}
-
-	public String getEntityName() {
-		return entityName;
+	protected AbstractInterceptor() {
 	}
 
 	@Override

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

@@ -28,6 +28,7 @@
 public class EnhancementAsProxyLazinessInterceptor extends AbstractInterceptor implements BytecodeLazyAttributeInterceptor {
 	private final Set<String> identifierAttributeNames;
 	private final CompositeType nonAggregatedCidMapper;
+	private final String entityName;
 
 	private final EntityKey entityKey;
 
@@ -45,7 +46,7 @@ public EnhancementAsProxyLazinessInterceptor(
 			CompositeType nonAggregatedCidMapper,
 			EntityKey entityKey,
 			SharedSessionContractImplementor session) {
-		super( entityName );
+		this.entityName = entityName;
 
 		this.identifierAttributeNames = identifierAttributeNames;
 		assert identifierAttributeNames != null;
@@ -83,6 +84,11 @@ public EnhancementAsProxyLazinessInterceptor(
 		status = Status.UNINITIALIZED;
 	}
 
+	@Override
+	public String getEntityName() {
+		return entityName;
+	}
+
 	public EntityKey getEntityKey() {
 		return entityKey;
 	}

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

@@ -29,6 +29,7 @@
  */
 public class LazyAttributeLoadingInterceptor extends AbstractInterceptor implements BytecodeLazyAttributeInterceptor {
 	private final Object identifier;
+	private final String entityName;
 
 	//N.B. this Set needs to be treated as immutable
 	private Set<String> lazyFields;
@@ -40,12 +41,17 @@ public LazyAttributeLoadingInterceptor(
 			Object identifier,
 			Set<String> lazyFields,
 			SharedSessionContractImplementor session) {
-		super( entityName );
+		this.entityName = entityName;
 		this.identifier = identifier;
 		this.lazyFields = lazyFields;
 		setSession( session );
 	}
 
+	@Override
+	public String getEntityName() {
+		return entityName;
+	}
+
 	@Override
 	public Object getIdentifier() {
 		return identifier;