Graphpocalypse: major revision/refactoring of EntityGraph support

 - sort out handling of mutability
 - try to minimize diff

Author: gavinking

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

@@ -5,11 +5,14 @@
 package org.hibernate.graph;
 
 
+import jakarta.persistence.Subgraph;
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.metamodel.model.domain.PersistentAttribute;
 
 import java.util.Map;
 
+import static java.util.Collections.unmodifiableMap;
+
 /**
  * Extends the JPA-defined {@link AttributeNode} with additional operations.
  *
@@ -24,6 +27,16 @@ public interface AttributeNode<J> extends GraphNode<J>, jakarta.persistence.Attr
 	Map<Class<?>, ? extends SubGraph<?>> getSubGraphs();
 	Map<Class<?>, ? extends SubGraph<?>> getKeySubGraphs();
 
+	@Override
+	default @SuppressWarnings("rawtypes") Map<Class, Subgraph> getSubgraphs() {
+		return unmodifiableMap( getSubGraphs() );
+	}
+
+	@Override
+	default @SuppressWarnings("rawtypes") Map<Class, Subgraph> getKeySubgraphs() {
+		return unmodifiableMap( getKeySubGraphs() );
+	}
+
 	SubGraph<?> makeSubGraph();
 	SubGraph<?> makeKeySubGraph();
 

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

@@ -117,8 +117,7 @@ default boolean hasAttributeNode(Attribute<? super J, ?> attribute) {
 	 *
 	 * @see #addAttributeNode(Attribute)
 	 */
-	<AJ> AttributeNode<AJ> addAttributeNode(PersistentAttribute<? super J,AJ> attribute)
-			throws CannotContainSubGraphException;
+	<AJ> AttributeNode<AJ> addAttributeNode(PersistentAttribute<? super J,AJ> attribute);
 
 	@Override
 	default <Y> AttributeNode<Y> addAttributeNode(Attribute<? super J, Y> attribute) {
@@ -140,32 +139,42 @@ default <Y> AttributeNode<Y> addAttributeNode(Attribute<? super J, Y> attribute)
 	 * @apiNote If no such AttributeNode exists yet, it is created.
 	 */
 	@Deprecated
-	<AJ> SubGraph<AJ> addSubGraph(String attributeName);
+	<AJ> SubGraph<AJ> addSubGraph(String attributeName)
+			throws CannotContainSubGraphException;
 
-	<AJ> SubGraph<AJ> addSubGraph(String attributeName, Class<AJ> type);
+	<AJ> SubGraph<AJ> addSubGraph(String attributeName, Class<AJ> type)
+			throws CannotContainSubGraphException;
 
 	/**
 	 * Create and return a new (mutable) {@link SubGraph} associated with
 	 * the {@link AttributeNode} for the given attribute.
 	 *
 	 * @apiNote If no such AttributeNode exists yet, it is created.
 	 */
-	<AJ> SubGraph<AJ> addSubGraph(PersistentAttribute<? super J, AJ> attribute);
+	<AJ> SubGraph<AJ> addSubGraph(PersistentAttribute<? super J, AJ> attribute)
+			throws CannotContainSubGraphException;
 
-	<AJ> SubGraph<AJ> addSubGraph(PersistentAttribute<? super J, ? super AJ> attribute, Class<AJ> type);
+	<AJ> SubGraph<AJ> addSubGraph(PersistentAttribute<? super J, ? super AJ> attribute, Class<AJ> type)
+			throws CannotContainSubGraphException;
 
-	<AJ> SubGraph<AJ> addSubGraph(PersistentAttribute<? super J, ? super AJ> attribute, ManagedDomainType<AJ> type);
+	<AJ> SubGraph<AJ> addSubGraph(PersistentAttribute<? super J, ? super AJ> attribute, ManagedDomainType<AJ> type)
+			throws CannotContainSubGraphException;
 
-	<AJ> SubGraph<AJ> addElementSubGraph(PluralPersistentAttribute<? super J, ?, ? super AJ> attribute, Class<AJ> type);
+	<AJ> SubGraph<AJ> addElementSubGraph(PluralPersistentAttribute<? super J, ?, ? super AJ> attribute, Class<AJ> type)
+			throws CannotContainSubGraphException;
 
-	<AJ> SubGraph<AJ> addElementSubGraph(PluralPersistentAttribute<? super J, ?, ? super AJ> attribute, ManagedDomainType<AJ> type);
+	<AJ> SubGraph<AJ> addElementSubGraph(PluralPersistentAttribute<? super J, ?, ? super AJ> attribute, ManagedDomainType<AJ> type)
+			throws CannotContainSubGraphException;
 
 	@Deprecated
-	<AJ> SubGraph<AJ> addKeySubGraph(String attributeName);
+	<AJ> SubGraph<AJ> addKeySubGraph(String attributeName)
+			throws CannotContainSubGraphException;
 
-	<AJ> SubGraph<AJ> addKeySubGraph(String attributeName, Class<AJ> type);
+	<AJ> SubGraph<AJ> addKeySubGraph(String attributeName, Class<AJ> type)
+			throws CannotContainSubGraphException;
 
-	<AJ> SubGraph<AJ> addKeySubGraph(MapPersistentAttribute<? super J, ? super AJ, ?> attribute, ManagedDomainType<AJ> type);
+	<AJ> SubGraph<AJ> addKeySubGraph(MapPersistentAttribute<? super J, ? super AJ, ?> attribute, ManagedDomainType<AJ> type)
+			throws CannotContainSubGraphException;
 
 	@Override
 	default <Y> SubGraph<Y> addTreatedSubgraph(Attribute<? super J, ? super Y> attribute, Class<Y> type) {
@@ -219,11 +228,11 @@ default <AJ> SubGraph<AJ> addPluralSubgraph(PluralAttribute<? super J, ?, AJ> at
 
 	@Override @Deprecated(forRemoval = true)
 	default <X> SubGraph<X> addKeySubgraph(Attribute<? super J, X> attribute) {
-		throw new UnsupportedOperationException("This operation will be removed in JPA 4");
+		throw new UnsupportedOperationException( "This operation will be removed in JPA 4" );
 	}
 
 	@Override @Deprecated(forRemoval = true)
 	default <X> SubGraph<? extends X> addKeySubgraph(Attribute<? super J, X> attribute, Class<? extends X> type) {
-		throw new UnsupportedOperationException("This operation will be removed in JPA 4");
+		throw new UnsupportedOperationException( "This operation will be removed in JPA 4" );
 	}
 }