Graphpocalypse: deprecated funkily-named methods of Graph

 All of these methods now exist in the JPA supertype,
 without the funky naming. We need to guide users away
 from the non-standard ones, especially in light of the
 ugliness.

Author: gavinking

hibernate-core/src/main/java/org/hibernate/graph/AttributeNode.java

@@ -6,7 +6,8 @@
 
 
 import jakarta.persistence.Subgraph;
-import org.hibernate.metamodel.model.domain.ManagedDomainType;
+import jakarta.persistence.metamodel.ManagedType;
+import org.hibernate.Incubating;
 import org.hibernate.metamodel.model.domain.PersistentAttribute;
 
 import java.util.Map;
@@ -51,13 +52,17 @@ public interface AttributeNode<J> extends GraphNode<J>, jakarta.persistence.Attr
 
 	/**
 	 * All value subgraphs rooted at this node.
+	 * <p>
+	 * Includes treated subgraphs.
 	 *
 	 * @see jakarta.persistence.AttributeNode#getSubgraphs
 	 */
 	Map<Class<?>, ? extends SubGraph<?>> getSubGraphs();
 
 	/**
 	 * All key subgraphs rooted at this node.
+	 * <p>
+	 * Includes treated subgraphs.
 	 *
 	 * @see jakarta.persistence.AttributeNode#getKeySubgraphs
 	 */
@@ -89,27 +94,49 @@ public interface AttributeNode<J> extends GraphNode<J>, jakarta.persistence.Attr
 	 * Create and return a new value {@link SubGraph} rooted at this node,
 	 * with the given type, which may be a subtype of the value type,
 	 * or return an existing such {@link SubGraph} if there is one.
+	 * <p>
+	 * If the given type is a proper subtype of the value type, the result
+	 * is a treated subgraph.
+	 *
+	 * @param subtype The type or treated type of the value type
 	 */
 	<S> SubGraph<S> makeSubGraph(Class<S> subtype);
 
 	/**
 	 * Create and return a new value {@link SubGraph} rooted at this node,
 	 * with the given type, which may be a subtype of the key type,
 	 * or return an existing such {@link SubGraph} if there is one.
+	 * <p>
+	 * If the given type is a proper subtype of the key type, the result
+	 * is a treated subgraph.
+	 *
+	 * @param subtype The type or treated type of the key type
 	 */
 	<S> SubGraph<S> makeKeySubGraph(Class<S> subtype);
 
 	/**
 	 * Create and return a new value {@link SubGraph} rooted at this node,
 	 * with the given type, which may be a subtype of the value type,
 	 * or return an existing such {@link SubGraph} if there is one.
+	 * <p>
+	 * If the given type is a proper subtype of the value type, the result
+	 * is a treated subgraph.
+	 *
+	 * @param subtype The type or treated type of the value type
 	 */
-	<S> SubGraph<S> makeSubGraph(ManagedDomainType<S> subtype);
+	@Incubating
+	<S> SubGraph<S> makeSubGraph(ManagedType<S> subtype);
 
 	/**
 	 * Create and return a new value {@link SubGraph} rooted at this node,
 	 * with the given type, which may be a subtype of the key type,
 	 * or return an existing such {@link SubGraph} if there is one.
+	 * <p>
+	 * If the given type is a proper subtype of the key type, the result
+	 * is a treated subgraph.
+	 *
+	 * @param subtype The type or treated type of the key type
 	 */
-	<S> SubGraph<S> makeKeySubGraph(ManagedDomainType<S> subtype);
+	@Incubating
+	<S> SubGraph<S> makeKeySubGraph(ManagedType<S> subtype);
 }

hibernate-core/src/main/java/org/hibernate/graph/EntityGraphs.java

@@ -141,7 +141,7 @@ public static <R> void setFetchGraph(TypedQuery<R> query, EntityGraph<R> graph)
 	 * @since 7.0
 	 */
 	public <S> Subgraph<S> addTreatedSubgraph(Graph<? super S> graph, Class<S> subtype) {
-		return ((org.hibernate.graph.Graph<? super S>) graph).addTreatedSubGraph( subtype );
+		return ((org.hibernate.graph.Graph<? super S>) graph).addTreatedSubgraph( subtype );
 	}
 
 	/**