HHH-12713 - Fix metamodel contracts to extend Hibernate JPA extension contracts.

This commit is contained in:
Chris Cranford 2018-11-12 09:33:10 -05:00
parent 27118f765c
commit ea42f43881
4 changed files with 11 additions and 4 deletions

View File

@ -8,6 +8,7 @@ package org.hibernate.metamodel.model.domain.spi;
import javax.persistence.metamodel.EmbeddableType; import javax.persistence.metamodel.EmbeddableType;
import org.hibernate.metamodel.model.domain.EmbeddedDomainType;
import org.hibernate.type.ComponentType; import org.hibernate.type.ComponentType;
/** /**
@ -15,7 +16,7 @@ import org.hibernate.type.ComponentType;
* *
* @author Steve Ebersole * @author Steve Ebersole
*/ */
public interface EmbeddedTypeDescriptor<J> extends EmbeddableType<J>, ManagedTypeDescriptor<J> { public interface EmbeddedTypeDescriptor<J> extends EmbeddedDomainType<J>, ManagedTypeDescriptor<J> {
ComponentType getHibernateType(); ComponentType getHibernateType();
ManagedTypeDescriptor<?> getParent(); ManagedTypeDescriptor<?> getParent();

View File

@ -8,11 +8,13 @@ package org.hibernate.metamodel.model.domain.spi;
import javax.persistence.metamodel.EntityType; import javax.persistence.metamodel.EntityType;
import org.hibernate.metamodel.model.domain.EntityDomainType;
/** /**
* Hibernate extension to the JPA {@link EntityType} descriptor * Hibernate extension to the JPA {@link EntityType} descriptor
* *
* @author Steve Ebersole * @author Steve Ebersole
*/ */
public interface EntityTypeDescriptor<J> extends EntityType<J>, IdentifiableTypeDescriptor<J> { public interface EntityTypeDescriptor<J> extends EntityDomainType<J>, IdentifiableTypeDescriptor<J> {
} }

View File

@ -10,12 +10,14 @@ import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
import javax.persistence.metamodel.IdentifiableType; import javax.persistence.metamodel.IdentifiableType;
import org.hibernate.metamodel.model.domain.IdentifiableDomainType;
/** /**
* Hibernate extension to the JPA {@link IdentifiableType} descriptor * Hibernate extension to the JPA {@link IdentifiableType} descriptor
* *
* @author Steve Ebersole * @author Steve Ebersole
*/ */
public interface IdentifiableTypeDescriptor<J> extends IdentifiableType<J>, ManagedTypeDescriptor<J> { public interface IdentifiableTypeDescriptor<J> extends IdentifiableDomainType<J>, ManagedTypeDescriptor<J> {
boolean hasIdClass(); boolean hasIdClass();
SingularPersistentAttribute<? super J,?> locateIdAttribute(); SingularPersistentAttribute<? super J,?> locateIdAttribute();

View File

@ -8,10 +8,12 @@ package org.hibernate.metamodel.model.domain.spi;
import javax.persistence.metamodel.MappedSuperclassType; import javax.persistence.metamodel.MappedSuperclassType;
import org.hibernate.metamodel.model.domain.MappedSuperclassDomainType;
/** /**
* Hibernate extension to the JPA {@link MappedSuperclassType} descriptor * Hibernate extension to the JPA {@link MappedSuperclassType} descriptor
* *
* @author Steve Ebersole * @author Steve Ebersole
*/ */
public interface MappedSuperclassTypeDescriptor<J> extends MappedSuperclassType<J>, IdentifiableTypeDescriptor<J> { public interface MappedSuperclassTypeDescriptor<J> extends MappedSuperclassDomainType<J>, IdentifiableTypeDescriptor<J> {
} }