HHH-18992 pass LockOptions correctly to multiple id loaders

Author: gavinking

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderArrayParam.java

@@ -18,6 +18,7 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.query.spi.QueryOptionsAdapter;
 import org.hibernate.sql.ast.tree.expression.JdbcParameter;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
@@ -121,7 +122,12 @@ protected void loadEntitiesById(
 
 		getJdbcSelectExecutor().executeQuery(
 				getSqlAstTranslatorFactory().buildSelectTranslator( getSessionFactory(), sqlAst )
-						.translate( NO_BINDINGS, QueryOptions.NONE ),
+						.translate( NO_BINDINGS, new QueryOptionsAdapter() {
+							@Override
+							public LockOptions getLockOptions() {
+								return lockOptions;
+							}
+						} ),
 				jdbcParameterBindings,
 				new ExecutionContextWithSubselectFetchHandler(
 						session,

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiIdEntityLoaderStandard.java

@@ -18,7 +18,7 @@
 import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
 import org.hibernate.loader.ast.spi.MultiKeyLoadSizingStrategy;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.query.spi.QueryOptions;
+import org.hibernate.query.spi.QueryOptionsAdapter;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
@@ -163,7 +163,12 @@ private List<T> performRegularMultiLoad(
 
 		return getJdbcSelectExecutor().list(
 				getSqlAstTranslatorFactory().buildSelectTranslator( getSessionFactory(), sqlAst )
-						.translate( jdbcParameterBindings, QueryOptions.NONE ),
+						.translate( jdbcParameterBindings, new QueryOptionsAdapter() {
+							@Override
+							public LockOptions getLockOptions() {
+								return lockOptions;
+							}
+						} ),
 				jdbcParameterBindings,
 				new ExecutionContextWithSubselectFetchHandler(
 						session,

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoaderArrayParam.java

@@ -99,6 +99,7 @@ public <K> List<E> multiLoad(K[] naturalIds, MultiNaturalIdLoadOptions loadOptio
 				.getJdbcEnvironment()
 				.getSqlAstTranslatorFactory()
 				.buildSelectTranslator( sessionFactory, sqlAst )
+				// TODO: do we need to pass the LockOptions here?
 				.translate( JdbcParameterBindings.NO_BINDINGS, QueryOptions.NONE );
 
 		return LoaderHelper.loadByArrayParameter(

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/MultiNaturalIdLoadingBatcher.java

@@ -83,6 +83,7 @@ public MultiNaturalIdLoadingBatcher(
 		final SqlAstTranslatorFactory sqlAstTranslatorFactory =
 				sessionFactory.getJdbcServices().getJdbcEnvironment().getSqlAstTranslatorFactory();
 		this.jdbcSelect = sqlAstTranslatorFactory.buildSelectTranslator( sessionFactory, sqlSelect )
+				//TODO: do we need to pass the LockOptions here?
 				.translate( null, QueryOptions.NONE );
 	}
 

hibernate-core/src/main/java/org/hibernate/sql/ForUpdateFragment.java

@@ -23,7 +23,7 @@ public class ForUpdateFragment {
 	private final Dialect dialect;
 	private final LockOptions lockOptions;
 
-	public ForUpdateFragment(Dialect dialect, LockOptions lockOptions, Map<String, String[]> keyColumnNames) throws QueryException {
+	public ForUpdateFragment(Dialect dialect, LockOptions lockOptions, Map<String, String[]> keyColumnNames) {
 		this.dialect = dialect;
 		LockMode upgradeType = null;
 		this.lockOptions =  lockOptions;
@@ -62,15 +62,15 @@ public ForUpdateFragment(Dialect dialect, LockOptions lockOptions, Map<String, S
 	}
 
 	public ForUpdateFragment addTableAlias(String alias) {
-		if ( aliases.length() > 0 ) {
+		if ( !aliases.isEmpty() ) {
 			aliases.append( ", " );
 		}
 		aliases.append( alias );
 		return this;
 	}
 
 	public String toFragmentString() {
-		if ( aliases.length() == 0) {
+		if ( aliases.isEmpty() ) {
 			return dialect.getForUpdateString( lockOptions );
 		}
 		else {