From ea42f43881fbeced6ba5be413d97e0368e1ccdff Mon Sep 17 00:00:00 2001
From: Chris Cranford <chris@hibernate.org>
Date: Mon, 12 Nov 2018 09:33:10 -0500
Subject: [PATCH] HHH-12713 - Fix metamodel contracts to extend Hibernate JPA
 extension contracts.

---
 .../metamodel/model/domain/spi/EmbeddedTypeDescriptor.java    | 3 ++-
 .../metamodel/model/domain/spi/EntityTypeDescriptor.java      | 4 +++-
 .../model/domain/spi/IdentifiableTypeDescriptor.java          | 4 +++-
 .../model/domain/spi/MappedSuperclassTypeDescriptor.java      | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/EmbeddedTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/EmbeddedTypeDescriptor.java
index 8422f721d4..3190d74358 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/EmbeddedTypeDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/EmbeddedTypeDescriptor.java
@@ -8,6 +8,7 @@ package org.hibernate.metamodel.model.domain.spi;
 
 import javax.persistence.metamodel.EmbeddableType;
 
+import org.hibernate.metamodel.model.domain.EmbeddedDomainType;
 import org.hibernate.type.ComponentType;
 
 /**
@@ -15,7 +16,7 @@ import org.hibernate.type.ComponentType;
  *
  * @author Steve Ebersole
  */
-public interface EmbeddedTypeDescriptor<J> extends EmbeddableType<J>, ManagedTypeDescriptor<J> {
+public interface EmbeddedTypeDescriptor<J> extends EmbeddedDomainType<J>, ManagedTypeDescriptor<J> {
 	ComponentType getHibernateType();
 
 	ManagedTypeDescriptor<?> getParent();
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/EntityTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/EntityTypeDescriptor.java
index abd3a72c05..486cd65edb 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/EntityTypeDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/EntityTypeDescriptor.java
@@ -8,11 +8,13 @@ package org.hibernate.metamodel.model.domain.spi;
 
 import javax.persistence.metamodel.EntityType;
 
+import org.hibernate.metamodel.model.domain.EntityDomainType;
+
 /**
  * Hibernate extension to the JPA {@link EntityType} descriptor
  *
  * @author Steve Ebersole
  */
-public interface EntityTypeDescriptor<J> extends EntityType<J>, IdentifiableTypeDescriptor<J> {
+public interface EntityTypeDescriptor<J> extends EntityDomainType<J>, IdentifiableTypeDescriptor<J> {
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/IdentifiableTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/IdentifiableTypeDescriptor.java
index f37f045ec8..9be3d97b7c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/IdentifiableTypeDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/IdentifiableTypeDescriptor.java
@@ -10,12 +10,14 @@ import java.util.Set;
 import java.util.function.Consumer;
 import javax.persistence.metamodel.IdentifiableType;
 
+import org.hibernate.metamodel.model.domain.IdentifiableDomainType;
+
 /**
  * Hibernate extension to the JPA {@link IdentifiableType} descriptor
  *
  * @author Steve Ebersole
  */
-public interface IdentifiableTypeDescriptor<J> extends IdentifiableType<J>, ManagedTypeDescriptor<J> {
+public interface IdentifiableTypeDescriptor<J> extends IdentifiableDomainType<J>, ManagedTypeDescriptor<J> {
 	boolean hasIdClass();
 
 	SingularPersistentAttribute<? super J,?> locateIdAttribute();
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/MappedSuperclassTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/MappedSuperclassTypeDescriptor.java
index c14dbcd380..1c633981ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/MappedSuperclassTypeDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/spi/MappedSuperclassTypeDescriptor.java
@@ -8,10 +8,12 @@ package org.hibernate.metamodel.model.domain.spi;
 
 import javax.persistence.metamodel.MappedSuperclassType;
 
+import org.hibernate.metamodel.model.domain.MappedSuperclassDomainType;
+
 /**
  * Hibernate extension to the JPA {@link MappedSuperclassType} descriptor
  *
  * @author Steve Ebersole
  */
-public interface MappedSuperclassTypeDescriptor<J> extends MappedSuperclassType<J>, IdentifiableTypeDescriptor<J> {
+public interface MappedSuperclassTypeDescriptor<J> extends MappedSuperclassDomainType<J>, IdentifiableTypeDescriptor<J> {
 }