add overload of StatelessSession.getMultiple accepting a LockMode

Author: gavinking

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

@@ -355,6 +355,23 @@ public interface StatelessSession extends SharedSessionContract {
 	 */
 	<T> List<T> getMultiple(Class<T> entityClass, List<?> ids);
 
+	/**
+	 * Retrieve multiple rows, obtaining the specified lock mode,
+	 * and returning entity instances in a list where the position
+	 * of an instance in the list matches the position of its
+	 * identifier in the given array, and the list contains a null
+	 * value if there is no persistent instance matching a given
+	 * identifier.
+	 *
+	 * @param entityClass The class of the entity to retrieve
+	 * @param ids         The ids of the entities to retrieve
+	 * @param lockMode    The lock mode to apply to the entities
+	 * @return an ordered list of detached entity instances, with
+	 *         null elements representing missing entities
+	 * @since 7.0
+	 */
+	<T> List<T> getMultiple(Class<T> entityClass, List<?> ids, LockMode lockMode);
+
 	/**
 	 * Refresh the entity instance state from the database.
 	 *

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

@@ -128,42 +128,7 @@
 public class StatelessSessionImpl extends AbstractSharedSessionContract implements StatelessSession {
 	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( StatelessSessionImpl.class );
 
-	public static final MultiIdLoadOptions MULTI_ID_LOAD_OPTIONS = new MultiIdLoadOptions() {
-		@Override
-		public boolean isSessionCheckingEnabled() {
-			return false;
-		}
-
-		@Override
-		public boolean isSecondLevelCacheCheckingEnabled() {
-			return true;
-		}
-
-		@Override
-		public Boolean getReadOnly(SessionImplementor session) {
-			return null;
-		}
-
-		@Override
-		public boolean isReturnOfDeletedEntitiesEnabled() {
-			return false;
-		}
-
-		@Override
-		public boolean isOrderReturnEnabled() {
-			return true;
-		}
-
-		@Override
-		public LockOptions getLockOptions() {
-			return null;
-		}
-
-		@Override
-		public Integer getBatchSize() {
-			return null;
-		}
-	};
+	public static final MultiIdLoadOptions MULTI_ID_LOAD_OPTIONS = new MultiLoadOptions();
 
 	private final LoadQueryInfluencers influencers;
 	private final PersistenceContext temporaryPersistenceContext;
@@ -802,9 +767,24 @@ public  <T> T get(
 		}
 	}
 
+	@Override
+	public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids, LockMode lockMode) {
+		for ( Object id : ids ) {
+			if ( id == null ) {
+				throw new IllegalArgumentException( "Null id" );
+			}
+		}
+
+		final EntityPersister persister = requireEntityPersister( entityClass.getName() );
+
+		final List<?> results = persister.multiLoad( ids.toArray(), this, new MultiLoadOptions(lockMode) );
+		//noinspection unchecked
+		return (List<T>) results;
+	}
+
 	@Override
 	public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids) {
-		for (Object id : ids) {
+		for ( Object id : ids ) {
 			if ( id == null ) {
 				throw new IllegalArgumentException("Null id");
 			}
@@ -1407,4 +1387,50 @@ public Object loadFromSecondLevelCache(EntityPersister persister, EntityKey enti
 		return CacheLoadHelper.loadFromSecondLevelCache( this, instanceToLoad, lockMode, persister, entityKey );
 	}
 
+	private static final class MultiLoadOptions implements MultiIdLoadOptions {
+		private final  LockOptions lockOptions;
+
+		private MultiLoadOptions() {
+			this.lockOptions = null;
+		}
+
+		private MultiLoadOptions(LockMode lockOptions) {
+			this.lockOptions = new LockOptions( lockOptions );
+		}
+
+		@Override
+		public boolean isSessionCheckingEnabled() {
+			return false;
+		}
+
+		@Override
+		public boolean isSecondLevelCacheCheckingEnabled() {
+			return true;
+		}
+
+		@Override
+		public Boolean getReadOnly(SessionImplementor session) {
+			return null;
+		}
+
+		@Override
+		public boolean isReturnOfDeletedEntitiesEnabled() {
+			return false;
+		}
+
+		@Override
+		public boolean isOrderReturnEnabled() {
+			return true;
+		}
+
+		@Override
+		public LockOptions getLockOptions() {
+			return lockOptions;
+		}
+
+		@Override
+		public Integer getBatchSize() {
+			return null;
+		}
+	}
 }