HHH-19535 Interceptor.postMerge() should accept an id

Author: gavinking

hibernate-core/src/main/java/org/hibernate/Interceptor.java

@@ -430,17 +430,17 @@ default void preMerge(Object entity, Object[] state, String[] propertyNames, Typ
 	 *
 	 * @param source The entity passed to {@code merge()}
 	 * @param target The target managed entity
+	 * @param id The identifier of the managed entity
 	 * @param targetState The copied state already assigned to the target managed entity
 	 * @param originalState The original state of the target managed entity before assignment of the copied state,
-	 *                      or {@code null} if the target entity is a new instance
+	 * or {@code null} if the target entity is a new instance
 	 * @param propertyNames The names of the entity properties
 	 * @param propertyTypes The types of the entity properties
-	 *
 	 * @since 7.1
 	 */
 	@Incubating
 	default void postMerge(
-			Object source, Object target,
+			Object source, Object target, Object id,
 			Object[] targetState, Object[] originalState,
 			String[] propertyNames, Type[] propertyTypes) {}
 }

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java

@@ -8,6 +8,7 @@
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
 import org.hibernate.ObjectDeletedException;
 import org.hibernate.StaleObjectStateException;
 import org.hibernate.WrongClassException;
@@ -282,6 +283,7 @@ protected void entityIsTransient(MergeEvent event, Object id, MergeContext copyC
 
 		final Object entity = event.getEntity();
 		final EventSource session = event.getSession();
+		final Interceptor interceptor = session.getInterceptor();
 		final String entityName = event.getEntityName();
 		final EntityPersister persister = session.getEntityPersister( entityName, entity );
 		final String[] propertyNames = persister.getPropertyNames();
@@ -294,7 +296,7 @@ protected void entityIsTransient(MergeEvent event, Object id, MergeContext copyC
 		super.cascadeBeforeSave( session, persister, entity, copyCache );
 
 		final Object[] sourceValues = persister.getValues( entity );
-		session.getInterceptor().preMerge( entity, sourceValues, propertyNames, propertyTypes );
+		interceptor.preMerge( entity, sourceValues, propertyNames, propertyTypes );
 		final Object[] copiedValues = TypeHelper.replace(
 				sourceValues,
 				persister.getValues( copy ),
@@ -326,7 +328,7 @@ protected void entityIsTransient(MergeEvent event, Object id, MergeContext copyC
 				ForeignKeyDirection.TO_PARENT
 		);
 		persister.setValues( copy, targetValues );
-		session.getInterceptor().postMerge( entity, copy, targetValues, null, propertyNames, propertyTypes );
+		interceptor.postMerge( entity, copy, id, targetValues, null, propertyNames, propertyTypes );
 
 		// saveTransientEntity has been called using a copy that contains empty collections
 		// (copyValues uses ForeignKeyDirection.FROM_PARENT) then the PC may contain a wrong
@@ -341,9 +343,9 @@ protected void entityIsTransient(MergeEvent event, Object id, MergeContext copyC
 		event.setResult( copy );
 
 		if ( isPersistentAttributeInterceptable( copy ) ) {
-			final PersistentAttributeInterceptor interceptor =
+			final PersistentAttributeInterceptor attributeInterceptor =
 					asPersistentAttributeInterceptable( copy ).$$_hibernate_getInterceptor();
-			if ( interceptor == null ) {
+			if ( attributeInterceptor == null ) {
 				persister.getBytecodeEnhancementMetadata().injectInterceptor( copy, id, session );
 			}
 		}
@@ -453,12 +455,13 @@ protected void entityIsDetached(MergeEvent event, Object copiedId, Object origin
 			// copy created before we actually copy
 			cascadeOnMerge( session, persister, entity, copyCache );
 
+			final Interceptor interceptor = session.getInterceptor();
 			final String[] propertyNames = persister.getPropertyNames();
 			final Type[] propertyTypes = persister.getPropertyTypes();
 
 			final Object[] sourceValues = persister.getValues( entity );
 			final Object[] originalValues = persister.getValues( target );
-			session.getInterceptor().preMerge( entity, sourceValues, propertyNames, propertyTypes );
+			interceptor.preMerge( entity, sourceValues, propertyNames, propertyTypes );
 			final Object[] targetValues = TypeHelper.replace(
 					sourceValues,
 					originalValues,
@@ -468,7 +471,7 @@ protected void entityIsDetached(MergeEvent event, Object copiedId, Object origin
 					copyCache
 			);
 			persister.setValues( target, targetValues );
-			session.getInterceptor().postMerge( entity, target, targetValues, originalValues, propertyNames, propertyTypes );
+			interceptor.postMerge( entity, target, id, targetValues, originalValues, propertyNames, propertyTypes );
 			//copyValues works by reflection, so explicitly mark the entity instance dirty
 			markInterceptorDirty( entity, target );
 			event.setResult( result );