From e0f55e5d5389e50f5eafccf064c37efb2f31dd56 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Mon, 19 Dec 2022 11:46:51 -0600
Subject: [PATCH] HHH-15894 - Clean-up EntityMappingType for API

---
 .../java/org/hibernate/metamodel/mapping/Discriminatable.java | 4 ----
 .../org/hibernate/metamodel/mapping/ManagedMappingType.java   | 4 +---
 .../java/org/hibernate/metamodel/mapping/Restrictable.java    | 4 +++-
 .../main/java/org/hibernate/sql/results/graph/Fetchable.java  | 3 ++-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminatable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminatable.java
index 64973ab2e2..01233ae793 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminatable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminatable.java
@@ -14,10 +14,6 @@ import org.hibernate.sql.ast.tree.predicate.Predicate;
 
 /**
  * Things that have a discriminator associated with it.
- *
- * @apiNote Plural-attributes are considered discriminatable, which only
- * has an effect for to-many collections and applies the discriminator from
- * the associated entity
  */
 public interface Discriminatable {
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ManagedMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ManagedMappingType.java
index 303de95089..d99adabb93 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ManagedMappingType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ManagedMappingType.java
@@ -14,9 +14,7 @@ import org.hibernate.sql.results.graph.FetchableContainer;
 import org.hibernate.type.descriptor.java.JavaType;
 
 /**
- * Mapping-model corollary to JPA's {@link jakarta.persistence.metamodel.ManagedType}
- *
- * @see jakarta.persistence.metamodel.ManagedType
+ * Mapping-model corollary to {@link jakarta.persistence.metamodel.ManagedType}
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java
index bddce7d0b9..44516d74ab 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Restrictable.java
@@ -17,7 +17,9 @@ import org.hibernate.sql.ast.tree.predicate.Predicate;
 
 /**
  * Things that can have {@link org.hibernate.annotations.Where},
- * and/or {@link org.hibernate.annotations.Filter} applied to them
+ * and/or {@link org.hibernate.annotations.Filter} applied to them.
+ * This is effectively {@linkplain EntityMappingType entities} and
+ * {@linkplain PluralAttributeMapping plural attributes}.
  */
 public interface Restrictable extends FilterRestrictable, WhereRestrictable {
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetchable.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetchable.java
index 55073267c5..9b6b68a171 100644
--- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetchable.java
+++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/Fetchable.java
@@ -16,7 +16,8 @@ import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.spi.NavigablePath;
 
 /**
- * Parts of the domain model that can be fetched
+ * Parts of the domain model that can be fetched.  In other words,
+ * a {@link ModelPart} which can produce {@link Fetch} references.
  *
  * @author Steve Ebersole
  */