overload getMultiple() to accept EntityGraph

Author: gavinking

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

@@ -372,6 +372,45 @@ public interface StatelessSession extends SharedSessionContract {
 	 */
 	<T> List<T> getMultiple(Class<T> entityClass, List<?> ids, LockMode lockMode);
 
+	/**
+	 * Retrieve multiple rows, returning instances of the root
+	 * entity of the given {@link EntityGraph} with the fetched
+	 * associations specified by the graph, 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 entityGraph The {@link EntityGraph}, interpreted as a
+	 * {@linkplain org.hibernate.graph.GraphSemantic#LOAD load graph}
+	 * @param graphSemantic a {@link GraphSemantic} specifying
+	 *                      how the graph should be interpreted
+	 * @param ids The ids of the entities to retrieve
+	 * @return an ordered list of detached entity instances, with
+	 *         null elements representing missing entities
+	 * @since 7.0
+	 */
+	<T> List<T> getMultiple(EntityGraph<T> entityGraph, List<?> ids);
+
+	/**
+	 * Retrieve multiple rows, returning instances of the root
+	 * entity of the given {@link EntityGraph} with the fetched
+	 * associations specified by the graph, 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 entityGraph The {@link EntityGraph}
+	 * @param graphSemantic a {@link GraphSemantic} specifying
+	 *                      how the graph should be interpreted
+	 * @param ids The ids of the entities to retrieve
+	 * @return an ordered list of detached entity instances, with
+	 *         null elements representing missing entities
+	 * @since 7.0
+	 */
+	<T> List<T> getMultiple(EntityGraph<T> entityGraph, GraphSemantic graphSemantic, List<?> ids);
+
 	/**
 	 * Refresh the entity instance state from the database.
 	 *

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

@@ -801,11 +801,39 @@ public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids, LockMode lockM
 		}
 
 		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(EntityGraph<T> entityGraph, List<?> ids) {
+		return getMultiple( entityGraph, GraphSemantic.LOAD, ids );
+	}
+
+	@Override
+	public <T> List<T> getMultiple(EntityGraph<T> entityGraph, GraphSemantic graphSemantic, List<?> ids) {
+		for ( Object id : ids ) {
+			if ( id == null ) {
+				throw new IllegalArgumentException( "Null id" );
+			}
+		}
+
+		final RootGraphImplementor<T> rootGraph = (RootGraphImplementor<T>) entityGraph;
+
+		final EffectiveEntityGraph effectiveEntityGraph =
+				getLoadQueryInfluencers().getEffectiveEntityGraph();
+		effectiveEntityGraph.applyGraph( rootGraph, graphSemantic );
+
+		try {
+			final EntityPersister persister = requireEntityPersister( rootGraph.getGraphedType().getTypeName() );
+			final List<?> results = persister.multiLoad( ids.toArray(), this, MULTI_ID_LOAD_OPTIONS );
+			//noinspection unchecked
+			return (List<T>) results;
+		}
+		finally {
+			effectiveEntityGraph.clear();
+		}
+	}
 
 	@Override
 	public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids) {
@@ -816,7 +844,6 @@ public <T> List<T> getMultiple(Class<T> entityClass, List<?> ids) {
 		}
 
 		final EntityPersister persister = requireEntityPersister( entityClass.getName() );
-
 		final List<?> results = persister.multiLoad( ids.toArray(), this, MULTI_ID_LOAD_OPTIONS );
 		//noinspection unchecked
 		return (List<T>) results;