HHH-19829 - Restrict use of MultiFindOptions to the findMultiple operations

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

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

@@ -10,5 +10,5 @@
 /**
  * Simple marker interface for FindOptions which can be applied to multiple id loading.
  */
-interface MultiFindOption extends FindOption {
+public interface MultiFindOption extends FindOption {
 }

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

@@ -2300,6 +2300,9 @@ else if ( option instanceof EnabledFetchProfile enabledFetchProfile ) {
 			else if ( option instanceof ReadOnlyMode ) {
 				loadAccess.withReadOnly( option == ReadOnlyMode.READ_ONLY );
 			}
+			else if ( option instanceof MultiFindOption multiFindOption ) {
+				throw new IllegalArgumentException( "Option '" + multiFindOption + "' can only be used in 'findMultiple()'" );
+			}
 		}
 		if ( lockOptions.getLockMode().isPessimistic() ) {
 			if ( lockOptions.getTimeOut() == WAIT_FOREVER_MILLI ) {

hibernate-core/src/test/java/org/hibernate/orm/test/dynamicmap/FindOperationTests.java

@@ -4,7 +4,10 @@
  */
 package org.hibernate.orm.test.dynamicmap;
 
+import org.hibernate.IncludeRemovals;
+import org.hibernate.OrderedReturn;
 import org.hibernate.ReadOnlyMode;
+import org.hibernate.SessionChecking;
 import org.hibernate.graph.RootGraph;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -17,6 +20,7 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @author Steve Ebersole
@@ -58,6 +62,15 @@ void testFindWithOptions(SessionFactoryScope factoryScope) {
 		} );
 	}
 
+	@Test
+	void testFindWithIllegalOptions(SessionFactoryScope factoryScope) {
+		factoryScope.inTransaction( (session) -> {
+			assertThrows( IllegalArgumentException.class, () ->session.find( "artist", 1, SessionChecking.ENABLED ) );
+			assertThrows( IllegalArgumentException.class, () ->session.find( "artist", 1, OrderedReturn.ORDERED ) );
+			assertThrows( IllegalArgumentException.class, () ->session.find( "artist", 1, IncludeRemovals.INCLUDE ) );
+		} );
+	}
+
 	@Test
 	void testFindWithGraph(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( (session) -> {