HHH-19336 - Proper implementation for JPA extended locking scope

HHH-19459 - LockScope, FollowOnLocking
HHH-19501 - Session#lock w/ pessimistic locks for scopes
HHH-19502 - Disallow SKIP_LOCKED with Session#lock

Author: sebersole

hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/SqlAstBasedLockingStrategy.java

@@ -61,14 +61,14 @@ public void lock(
 			int timeout,
 			SharedSessionContractImplementor session) throws StaleObjectStateException, LockingStrategyException {
 		if ( session instanceof EventSource eventSource ) {
-			doLock( id, version, object, timeout, eventSource );
+			doLock( id, version, timeout, eventSource );
 		}
 		else {
 			throw new UnsupportedOperationException( "Optimistic locking strategies not supported in stateless session" );
 		}
 	}
 
-	private void doLock(Object id, Object version, Object object, int timeout, EventSource eventSource) {
+	private void doLock(Object id, Object version, int timeout, EventSource eventSource) {
 		final SessionFactoryImplementor factory = eventSource.getFactory();
 
 		final LockOptions lockOptions = new LockOptions( lockMode );

hibernate-core/src/main/java/org/hibernate/event/spi/LockEvent.java

@@ -23,24 +23,27 @@ public class LockEvent extends AbstractEvent {
 	private final LockOptions lockOptions;
 	private String entityName;
 
-	public LockEvent(String entityName, Object object, LockMode lockMode, EventSource source) {
-		this( entityName, object, lockMode.toLockOptions(), source );
-	}
-
 	public LockEvent(String entityName, Object object, LockOptions lockOptions, EventSource source) {
 		super(source);
+
 		if (object == null) {
 			throw new IllegalArgumentException( "Entity may not be null" );
 		}
 		if (lockOptions == null) {
 			throw new IllegalArgumentException( "LockOptions may not be null" );
 		}
-		this.object = object;
-		this.lockOptions = lockOptions;
 		if ( lockOptions.getLockMode() == LockMode.UPGRADE_SKIPLOCKED
-			|| lockOptions.getTimeout().milliseconds() == Timeouts.SKIP_LOCKED_MILLI ) {
+			 || lockOptions.getTimeout().milliseconds() == Timeouts.SKIP_LOCKED_MILLI ) {
 			throw new IllegalArgumentException( ILLEGAL_SKIP_LOCKED );
 		}
+
+		this.entityName = entityName;
+		this.object = object;
+		this.lockOptions = lockOptions;
+	}
+
+	public LockEvent(String entityName, Object object, LockMode lockMode, EventSource source) {
+		this( entityName, object, lockMode.toLockOptions(), source );
 	}
 
 	public LockEvent(Object object, LockMode lockMode, EventSource source) {