HHH-18025 RefreshOptions and LockOptions

Signed-off-by: Gavin King <gavin@hibernate.org>

Author: gavinking

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

@@ -7,6 +7,7 @@
 package org.hibernate;
 
 import jakarta.persistence.FindOption;
+import jakarta.persistence.RefreshOption;
 import org.hibernate.jpa.internal.util.LockModeTypeHelper;
 
 import jakarta.persistence.LockModeType;
@@ -43,7 +44,7 @@
  * @see LockOptions
  * @see org.hibernate.annotations.OptimisticLocking
  */
-public enum LockMode implements FindOption {
+public enum LockMode implements FindOption, RefreshOption {
 	/**
 	 * No lock required. If an object is requested with this lock
 	 * mode, a {@link #READ} lock will be obtained if it turns out

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

@@ -16,6 +16,7 @@
 
 import jakarta.persistence.FindOption;
 import jakarta.persistence.PessimisticLockScope;
+import jakarta.persistence.RefreshOption;
 import org.hibernate.query.Query;
 import org.hibernate.query.spi.QueryOptions;
 
@@ -52,7 +53,7 @@
  *
  * @author Scott Marlow
  */
-public class LockOptions implements FindOption, Serializable {
+public class LockOptions implements FindOption, RefreshOption, Serializable {
 	/**
 	 * Represents {@link LockMode#NONE}, to which timeout and scope are
 	 * not applicable.

hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java

@@ -2564,10 +2564,10 @@ public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode
 
 	private <T> IdentifierLoadAccessImpl<T> loadAccessWithOptions(Class<T> entityClass, FindOption[] options) {
 		final IdentifierLoadAccessImpl<T> loadAccess = byId(entityClass);
-		CacheStoreMode storeMode = null;
-		CacheRetrieveMode retrieveMode = null;
+		CacheStoreMode storeMode = getCacheStoreMode();
+		CacheRetrieveMode retrieveMode = getCacheRetrieveMode();
 		LockOptions lockOptions = new LockOptions();
-		for ( FindOption option : options) {
+		for ( FindOption option : options ) {
 			if ( option instanceof CacheStoreMode ) {
 				storeMode = (CacheStoreMode) option;
 			}
@@ -2591,7 +2591,7 @@ else if ( option instanceof Timeout ) {
 				lockOptions.setTimeOut( timeout.milliseconds() );
 			}
 			else if ( option instanceof EnabledFetchProfile ) {
-				EnabledFetchProfile enabledFetchProfile = (EnabledFetchProfile) option;
+				final EnabledFetchProfile enabledFetchProfile = (EnabledFetchProfile) option;
 				loadAccess.enableFetchProfile( enabledFetchProfile.profileName() );
 			}
 			else if ( option instanceof ReadOnlyMode ) {
@@ -2717,8 +2717,17 @@ public void lock(Object entity, LockModeType lockModeType, Map<String, Object> p
 
 	@Override
 	public void lock(Object entity, LockModeType lockMode, LockOption... options) {
-		// todo (jpa 3.2) : implement
-		throw new UnsupportedOperationException( "Not yet implemented" );
+		LockOptions lockOptions = new LockOptions( LockModeTypeHelper.getLockMode(lockMode) );
+		for ( LockOption option : options ) {
+			if ( option instanceof PessimisticLockScope ) {
+				lockOptions.setLockScope( (PessimisticLockScope) option );
+			}
+			else if ( option instanceof Timeout ) {
+				final Timeout timeout = (Timeout) option;
+				lockOptions.setTimeOut( timeout.milliseconds() );
+			}
+		}
+		lock( entity, lockOptions );
 	}
 
 	@Override
@@ -2768,8 +2777,40 @@ public void refresh(Object entity, LockModeType lockModeType, Map<String, Object
 
 	@Override
 	public void refresh(Object entity, RefreshOption... options) {
-		// todo (jpa 3.2) : implement
-		throw new UnsupportedOperationException( "Not yet implemented" );
+		CacheStoreMode storeMode = getCacheStoreMode();
+		LockOptions lockOptions = new LockOptions();
+		for ( RefreshOption option : options ) {
+			if ( option instanceof CacheStoreMode ) {
+				storeMode = (CacheStoreMode) option;
+			}
+			else if ( option instanceof LockModeType ) {
+				lockOptions.setLockMode( LockModeTypeHelper.getLockMode( (LockModeType) option ) );
+			}
+			else if ( option instanceof LockMode ) {
+				lockOptions.setLockMode( (LockMode) option );
+			}
+			else if ( option instanceof LockOptions ) {
+				lockOptions = (LockOptions) option;
+			}
+			else if ( option instanceof PessimisticLockScope ) {
+				lockOptions.setLockScope( (PessimisticLockScope) option );
+			}
+			else if ( option instanceof Timeout ) {
+				final Timeout timeout = (Timeout) option;
+				lockOptions.setTimeOut( timeout.milliseconds() );
+			}
+		}
+
+		final CacheMode previousCacheMode = getCacheMode();
+		if ( storeMode != null ) {
+			setCacheStoreMode( storeMode );
+		}
+		try {
+			refresh( entity, lockOptions );
+		}
+		finally {
+			setCacheMode( previousCacheMode );
+		}
 	}
 
 	private LockOptions buildLockOptions(LockModeType lockModeType, Map<String, Object> properties) {