pull implementations down off SessionFactory

Author: gavinking

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

@@ -13,7 +13,6 @@
 import jakarta.persistence.TypedQueryReference;
 import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.engine.spi.FilterDefinition;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.graph.GraphParser;
 import org.hibernate.graph.InvalidGraphException;
 import org.hibernate.graph.RootGraph;
@@ -108,7 +107,7 @@
  *     SingularAttribute<Book,String>}.
  * </ul>
  * <p>
- * Use of these statically-typed metamodel references is the preferred way of
+ * Use of these statically typed metamodel references is the preferred way of
  * working with the {@linkplain jakarta.persistence.criteria.CriteriaBuilder
  * criteria query API}, and with {@linkplain EntityGraph}s.
  * <p>
@@ -266,7 +265,7 @@ default void inSession(Consumer<? super Session> action) {
 	 * @since 6.3
 	 */
 	default void inStatelessSession(Consumer<? super StatelessSession> action) {
-		try ( StatelessSession session = openStatelessSession() ) {
+		try ( var session = openStatelessSession() ) {
 			action.accept( session );
 		}
 	}
@@ -308,7 +307,7 @@ default void inStatelessTransaction(Consumer<? super StatelessSession> action) {
 	 * @see #fromTransaction(Function)
 	 */
 	default <R> R fromSession(Function<? super Session,R> action) {
-		try ( Session session = openSession() ) {
+		try ( var session = openSession() ) {
 			return action.apply( session );
 		}
 	}
@@ -331,7 +330,7 @@ default <R> R fromSession(Function<? super Session,R> action) {
 	 * @since 6.3
 	 */
 	default <R> R fromStatelessSession(Function<? super StatelessSession,R> action) {
-		try ( StatelessSession session = openStatelessSession() ) {
+		try ( var session = openStatelessSession() ) {
 			return action.apply( session );
 		}
 	}
@@ -522,9 +521,7 @@ default <T> RootGraph<T> createEntityGraph(Class<T> entityType) {
 	 *
 	 * @since 7.0
 	 */
-	default <T> RootGraph<T> parseEntityGraph(Class<T> rootEntityClass, CharSequence graphText) {
-		return GraphParser.parse( rootEntityClass, graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
-	}
+	<T> RootGraph<T> parseEntityGraph(Class<T> rootEntityClass, CharSequence graphText);
 
 	/**
 	 * Creates a {@link RootGraph} for the given {@code rootEntityName} and parses the graph
@@ -544,9 +541,7 @@ default <T> RootGraph<T> parseEntityGraph(Class<T> rootEntityClass, CharSequence
 	 * @since 7.0
 	 */
 	@Incubating
-	default <T> RootGraph<T> parseEntityGraph(String rootEntityName, CharSequence graphText) {
-		return GraphParser.parse( rootEntityName, graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
-	}
+	<T> RootGraph<T> parseEntityGraph(String rootEntityName, CharSequence graphText);
 
 	/**
 	 * Creates a {@link RootGraph} based on the passed string representation.  Here, the
@@ -562,9 +557,7 @@ default <T> RootGraph<T> parseEntityGraph(String rootEntityName, CharSequence gr
 	 * @since 7.0
 	 */
 	@Incubating
-	default <T> RootGraph<T> parseEntityGraph(CharSequence graphText) {
-		return GraphParser.parse( graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
-	}
+	<T> RootGraph<T> parseEntityGraph(CharSequence graphText);
 
 	/**
 	 * Obtain the set of names of all {@linkplain org.hibernate.annotations.FilterDef

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java

@@ -23,6 +23,8 @@
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.EntityCopyObserverFactory;
 import org.hibernate.event.spi.EventEngine;
+import org.hibernate.graph.GraphParser;
+import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.event.service.spi.EventListenerGroups;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
@@ -322,4 +324,18 @@ default JdbcSelectWithActionsBuilder getJdbcSelectWithActionsBuilder(){
 		return new JdbcSelectWithActions.Builder();
 	}
 
+	@Override
+	default <T> RootGraph<T> parseEntityGraph(Class<T> rootEntityClass, CharSequence graphText) {
+		return GraphParser.parse( rootEntityClass, graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
+	}
+
+	@Override @Incubating
+	default <T> RootGraph<T> parseEntityGraph(String rootEntityName, CharSequence graphText) {
+		return GraphParser.parse( rootEntityName, graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
+	}
+
+	@Override @Incubating
+	default <T> RootGraph<T> parseEntityGraph(CharSequence graphText) {
+		return GraphParser.parse( graphText.toString(), unwrap( SessionFactoryImplementor.class ) );
+	}
 }