Graphpocalypse: major revision/refactoring of EntityGraph support

- fix up typing issues with key/value subgraphs

Author: gavinking

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

@@ -6,6 +6,7 @@
 
 import java.util.Map;
 
+import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.metamodel.model.domain.PersistentAttribute;
 
 /**
@@ -19,15 +20,16 @@ public interface AttributeNode<J> extends GraphNode<J>, jakarta.persistence.Attr
 
 	PersistentAttribute<?, J> getAttributeDescriptor();
 
-	Map<Class<? extends J>, ? extends SubGraph<? extends J>> getSubGraphs();
-	Map<Class<? extends J>, ? extends SubGraph<? extends J>> getKeySubGraphs();
+	Map<Class<?>, ? extends SubGraph<?>> getSubGraphs();
+	Map<Class<?>, ? extends SubGraph<?>> getKeySubGraphs();
 
-	<S extends J> void addSubGraph(Class<S> subType, SubGraph<S> subGraph);
-	<S extends J> void addKeySubGraph(Class<S> subType, SubGraph<S> subGraph);
+	SubGraph<?> makeSubGraph();
+	SubGraph<?> makeKeySubGraph();
 
-	SubGraph<J> makeSubGraph();
-	SubGraph<J> makeKeySubGraph();
+	<S> SubGraph<S> makeSubGraph(Class<S> type);
+	<S> SubGraph<S> makeKeySubGraph(Class<S> type);
+
+	<S> SubGraph<S> makeSubGraph(ManagedDomainType<S> subtype);
+	<S> SubGraph<S> makeKeySubGraph(ManagedDomainType<S> subtype);
 
-	<S extends J> SubGraph<S> makeSubGraph(Class<S> subtype);
-	<S extends J> SubGraph<S> makeKeySubGraph(Class<S> subtype);
 }

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

@@ -188,17 +188,14 @@ default <X> SubGraph<X> addSubgraph(String name, Class<X> type) {
 	<AJ> SubGraph<AJ> addKeySubGraph(String attributeName);
 	<AJ> SubGraph<AJ> addKeySubGraph(String attributeName, Class<AJ> type);
 
-	<AJ> SubGraph<AJ> addKeySubGraph(PersistentAttribute<? super J,AJ> attribute);
-	<AJ> SubGraph<AJ> addKeySubGraph(PersistentAttribute<? super J,? super AJ> attribute, Class<AJ> type);
-
-	@Override
+	@Override @Deprecated(forRemoval = true)
 	default <X> SubGraph<X> addKeySubgraph(Attribute<? super J, X> attribute) {
-		return addKeySubGraph( (PersistentAttribute<? super J, X>) attribute );
+		throw new UnsupportedOperationException("This operation will be removed in JPA 4");
 	}
 
-	@Override
+	@Override @Deprecated(forRemoval = true)
 	default <X> SubGraph<? extends X> addKeySubgraph(Attribute<? super J, X> attribute, Class<? extends X> type) {
-		return addKeySubGraph( (PersistentAttribute<? super J, X>) attribute, type );
+		throw new UnsupportedOperationException("This operation will be removed in JPA 4");
 	}
 
 	@Override

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

@@ -29,7 +29,8 @@ public interface RootGraph<J> extends Graph<J>, EntityGraph<J> {
 	 * @deprecated Planned for removal in JPA 4
 	 */
 	@Override @Deprecated(forRemoval = true)
-	default <T1> SubGraph<? extends T1> addSubclassSubgraph(Class<? extends T1> type) {
-		throw new UnsupportedOperationException("This operation will be removed in JPA 4");
+	@SuppressWarnings("unchecked") // The JPA method was defined with an incorrect generic signature
+	default <T> SubGraph<? extends T> addSubclassSubgraph(Class<? extends T> type) {
+		return (SubGraph<? extends T>) addTreatedSubgraph( (Class<? extends J>) type );
 	}
 }

hibernate-core/src/main/java/org/hibernate/graph/internal/AbstractGraph.java

@@ -37,6 +37,7 @@
  * @author Steve Ebersole
  */
 public abstract class AbstractGraph<J> extends AbstractGraphNode<J> implements GraphImplementor<J> {
+
 	private final ManagedDomainType<J> managedType;
 	private Map<PersistentAttribute<? super J,?>, AttributeNodeImplementor<?>> attributeNodes;
 
@@ -109,6 +110,7 @@ private <T> void addAttributeNode(PersistentAttribute<? super J, ?> attribute, A
 		else {
 			// we assume the subgraph has been properly copied if needed
 			node.getSubGraphMap().forEach( (subtype, subgraph) -> attributeNode.addSubGraph( subgraph ) );
+			node.getKeySubGraphMap().forEach( (subtype, subgraph) -> attributeNode.addKeySubGraph( subgraph ) );
 		}
 	}
 
@@ -247,19 +249,19 @@ public <AJ> SubGraphImplementor<AJ> addSubGraph(String attributeName)  {
 	}
 
 	@Override
-	public <AJ> SubGraphImplementor<AJ> addSubGraph(String attributeName, Class<AJ> subType) {
-		return findOrCreateAttributeNode( attributeName ).makeSubGraph( subType );
+	public <AJ> SubGraphImplementor<AJ> addSubGraph(String attributeName, Class<AJ> subtype) {
+		return findOrCreateAttributeNode( attributeName ).makeSubGraph( subtype );
 	}
 
 	@Override
 	public <AJ> SubGraphImplementor<AJ> addSubGraph(PersistentAttribute<? super J, AJ> attribute) {
-		return findOrCreateAttributeNode( attribute ).makeSubGraph();
+		return findOrCreateAttributeNode( attribute ).makeSubGraph( attribute.getJavaType() );
 	}
 
 	@Override
 	public <AJ> SubGraphImplementor<AJ> addSubGraph(
-			PersistentAttribute<? super J, ? super AJ> attribute, Class<AJ> subType) {
-		return findOrCreateAttributeNode( attribute ).makeSubGraph( subType );
+			PersistentAttribute<? super J, ? super AJ> attribute, Class<AJ> subtype) {
+		return findOrCreateAttributeNode( attribute ).makeSubGraph( subtype );
 	}
 
 	@Override
@@ -280,17 +282,6 @@ public <AJ> SubGraphImplementor<AJ> addKeySubGraph(String attributeName, Class<A
 		return findOrCreateAttributeNode( attributeName ).makeKeySubGraph( subtype );
 	}
 
-	@Override
-	public <AJ> SubGraphImplementor<AJ> addKeySubGraph(PersistentAttribute<? super J, AJ> attribute) {
-		return findOrCreateAttributeNode( attribute ).makeKeySubGraph();
-	}
-
-	@Override
-	public <AJ> SubGraphImplementor<AJ> addKeySubGraph(
-			PersistentAttribute<? super J, ? super AJ> attribute, Class<AJ> subType) {
-		return findOrCreateAttributeNode( attribute ).makeKeySubGraph( subType );
-	}
-
 	////////////////// TODO //////////////////
 
 	@Override