HHH-19070 Introduce new single setPersistenceInfo method

Author: mbellade

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates.java

@@ -19,7 +19,9 @@
 import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeLoadingInterceptor;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.spi.CompositeOwner;
+import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.ExtendedSelfDirtinessTracker;
+import org.hibernate.engine.spi.ManagedEntity;
 import org.hibernate.engine.spi.PersistentAttributeInterceptor;
 import org.hibernate.internal.util.collections.ArrayHelper;
 
@@ -37,6 +39,26 @@
 
 class CodeTemplates {
 
+	static class SetPersistenceInfo {
+		@Advice.OnMethodExit
+		static void $$_hibernate_setOwner(
+				@Advice.Argument(0) EntityEntry entityEntry,
+				@Advice.Argument(1) ManagedEntity previous,
+				@Advice.Argument(2) ManagedEntity next,
+				@Advice.Argument(3) int instanceId,
+				@Advice.Return(readOnly = false) EntityEntry previousEntry,
+				@Advice.FieldValue(value = EnhancerConstants.ENTITY_ENTRY_FIELD_NAME, readOnly = false) EntityEntry entityEntryField,
+				@Advice.FieldValue(value = EnhancerConstants.PREVIOUS_FIELD_NAME, readOnly = false) ManagedEntity previousField,
+				@Advice.FieldValue(value = EnhancerConstants.NEXT_FIELD_NAME, readOnly = false) ManagedEntity nextField,
+				@Advice.FieldValue(value = EnhancerConstants.INSTANCE_ID_FIELD_NAME, readOnly = false) int instanceIdField) {
+			previousEntry = entityEntryField;
+			entityEntryField = entityEntry;
+			previousField = previous;
+			nextField = next;
+			instanceIdField = instanceId;
+		}
+	}
+
 	static class SetOwner {
 		@Advice.OnMethodEnter
 		static void $$_hibernate_setOwner(

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImpl.java

@@ -245,6 +245,13 @@ private DynamicType.Builder<?> doEnhance(Supplier<DynamicType.Builder<?>> builde
 					EnhancerConstants.INSTANCE_ID_SETTER_NAME
 			);
 
+			builder = addSetPersistenceInfoMethod(
+					builder,
+					constants.TypeEntityEntry,
+					constants.TypeManagedEntity,
+					constants.TypeIntegerPrimitive
+			);
+
 			builder = addInterceptorHandling( builder, managedCtClass );
 
 			if ( enhancementContext.doDirtyCheckingInline( managedCtClass ) ) {
@@ -704,6 +711,19 @@ private DynamicType.Builder<?> addFieldWithGetterAndSetter(
 						.intercept( FieldAccessor.ofField( fieldName ) );
 	}
 
+	private DynamicType.Builder<?> addSetPersistenceInfoMethod(
+			DynamicType.Builder<?> builder,
+			TypeDefinition entityEntryType,
+			TypeDefinition managedEntityType,
+			TypeDefinition intType) {
+		return builder
+				// returns previous entity entry
+				.defineMethod( EnhancerConstants.PERSISTENCE_INFO_SETTER_NAME, entityEntryType, constants.methodModifierPUBLIC )
+				// previous, next, instance-id
+				.withParameters( entityEntryType, managedEntityType, managedEntityType, intType )
+				.intercept( constants.implementationSetPersistenceInfo );
+	}
+
 	private List<AnnotatedFieldDescription> collectCollectionFields(TypeDescription managedCtClass) {
 		List<AnnotatedFieldDescription> collectionList = new ArrayList<>();
 

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/EnhancerImplConstants.java

@@ -51,6 +51,7 @@ public final class EnhancerImplConstants {
 	final Advice adviceInitializeLazyAttributeLoadingInterceptor;
 	final Implementation implementationSetOwner;
 	final Implementation implementationClearOwner;
+	final Implementation implementationSetPersistenceInfo;
 
 	//Frequently used Modifiers:
 	final int methodModifierPUBLIC = ModifierContributor.Resolver.of( List.of( Visibility.PUBLIC ) ).resolve();
@@ -119,6 +120,8 @@ public EnhancerImplConstants() {
 				.wrap( StubMethod.INSTANCE );
 		this.implementationClearOwner = Advice.to( CodeTemplates.ClearOwner.class, adviceLocator )
 				.wrap( StubMethod.INSTANCE );
+		this.implementationSetPersistenceInfo = Advice.to( CodeTemplates.SetPersistenceInfo.class, adviceLocator )
+				.wrap( StubMethod.INSTANCE );
 	}
 
 }

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

@@ -188,6 +188,8 @@ public final class EnhancerConstants {
 	public static final String INSTANCE_ID_GETTER_NAME = "$$_hibernate_getInstanceId";
 	public static final String INSTANCE_ID_SETTER_NAME = "$$_hibernate_setInstanceId";
 
+	public static final String PERSISTENCE_INFO_SETTER_NAME = "$$_hibernate_setPersistenceInfo";
+
 
 	private EnhancerConstants() {
 	}