Skip to content

HHH-16144 AbstractManagedType should look up declared concrete generic attributes before super attributes #7630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

HHH-16144 AbstractManagedType should look up declared concrete generic attributes before super attributes #7630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b5c722
HHH-16144 AbstractManagedType should look up declared concrete generi…
quaff Dec 15, 2023
15e887d
Amend existing tests to adapt fix of HHH-16144
quaff Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
* Functionality common to all implementations of {@link ManagedType}.
*
* @author Steve Ebersole
* @author Yanming Zhou
*/
public abstract class AbstractManagedType<J>
extends AbstractDomainType<J>
Expand Down Expand Up @@ -152,7 +153,13 @@ public PersistentAttribute<? super J,?> getAttribute(String name) {
@Override
public PersistentAttribute<? super J,?> findAttribute(String name) {
// first look at declared attributes
final PersistentAttribute<J,?> attribute = findDeclaredAttribute( name );
PersistentAttribute<J,?> attribute = findDeclaredAttribute( name );
if ( attribute != null ) {
return attribute;
}

// second look at declared concrete generic attributes
attribute = findDeclaredConcreteGenericAttribute( name );
if ( attribute != null ) {
return attribute;
}
Expand Down
5 changes: 3 additions & 2 deletions ...st/java/org/hibernate/orm/test/annotations/generics/EmbeddedIdGenericsSuperclassTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

/**
* @author Marco Belladelli
* @author Yanming Zhou
*/
@DomainModel(annotatedClasses = {
EmbeddedIdGenericsSuperclassTest.Customer.class,
Expand Down Expand Up @@ -81,7 +82,7 @@ public void testCustomerCriteria(SessionFactoryScope scope) {
final CriteriaQuery<Customer> query = cb.createQuery( Customer.class );
final Root<Customer> root = query.from( Customer.class );
final Path<DomainEntityId> id = root.get( "id" );
assertThat( id.getJavaType() ).isEqualTo( DomainEntityId.class );
assertThat( id.getJavaType() ).isEqualTo( CustomerId.class );
assertThat( id.getModel() ).isSameAs( root.getModel().getAttribute( "id" ) );
assertThat( ( (SqmPath<?>) id ).getResolvedModel().getBindableJavaType() ).isEqualTo( CustomerId.class );
query.select( root ).where( cb.equal( id.get( "someDomainField" ), 1 ) );
Expand Down Expand Up @@ -111,7 +112,7 @@ public void testInvoiceCriteria(SessionFactoryScope scope) {
final CriteriaQuery<Invoice> query = cb.createQuery( Invoice.class );
final Root<Invoice> root = query.from( Invoice.class );
final Path<DomainEntityId> id = root.get( "id" );
assertThat( id.getJavaType() ).isEqualTo( DomainEntityId.class );
assertThat( id.getJavaType() ).isEqualTo( InvoiceId.class );
assertThat( id.getModel() ).isSameAs( root.getModel().getAttribute( "id" ) );
assertThat( ( (SqmPath<?>) id ).getResolvedModel().getBindableJavaType() ).isEqualTo( InvoiceId.class );
query.select( root ).where( cb.equal( id.get( "someOtherDomainField" ), 1 ) );
Expand Down
7 changes: 3 additions & 4 deletions ...src/test/java/org/hibernate/orm/test/annotations/generics/GenericBasicValuedPathTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

/**
* @author Marco Belladelli
* @author Yanming Zhou
*/
@SessionFactory
@DomainModel( annotatedClasses = {
Expand All @@ -53,8 +54,7 @@ public void testId(SessionFactoryScope scope) {
final CriteriaQuery<Object> query = cb.createQuery();
final Root<MyEntity> root = query.from( MyEntity.class );
final Path<String> idPath = root.get( "id" );
// generic attributes are always reported as Object java type
assertThat( idPath.getJavaType() ).isEqualTo( Object.class );
assertThat( idPath.getJavaType() ).isEqualTo( Integer.class );
assertThat( idPath.getModel() ).isSameAs( root.getModel().getAttribute( "id" ) );
assertThat( ( (SqmPath<?>) idPath ).getResolvedModel().getBindableJavaType() ).isEqualTo( Integer.class );
final Object result = session.createQuery( query.select( idPath ) ).getSingleResult();
Expand All @@ -69,8 +69,7 @@ public void testProperty(SessionFactoryScope scope) {
final CriteriaQuery<Object> query = cb.createQuery();
final Root<MyEntity> root = query.from( MyEntity.class );
final Path<String> dataPath = root.get( "data" );
// generic attributes are always reported as Object java type
assertThat( dataPath.getJavaType() ).isEqualTo( Object.class );
assertThat( dataPath.getJavaType() ).isEqualTo( String.class );
assertThat( dataPath.getModel() ).isSameAs( root.getModel().getAttribute( "data" ) );
assertThat( ( (SqmPath<?>) dataPath ).getResolvedModel().getBindableJavaType() ).isEqualTo( String.class );
final Object result = session.createQuery( query.select( dataPath ) ).getSingleResult();
Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/org/hibernate/orm/test/annotations/generics/GenericMapAssociationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

/**
* @author Marco Belladelli
* @author Yanming Zhou
*/
@SessionFactory
@DomainModel( annotatedClasses = {
Expand Down Expand Up @@ -81,8 +82,7 @@ public void testChildCriteriaQuery(SessionFactoryScope scope) {
final CriteriaQuery<Long> query = cb.createQuery( Long.class );
final Root<MapContainerEntity> root = query.from( MapContainerEntity.class );
final Join<MapContainerEntity, MapValueEntity> join = root.join( "map" );
// generic attributes are always reported as Object java type
assertThat( join.getJavaType() ).isEqualTo( Object.class );
assertThat( join.getJavaType() ).isEqualTo( MapValueEntity.class );
assertThat( join.getModel() ).isSameAs( root.getModel().getAttribute( "map" ) );
assertThat( ( (SqmPath<?>) join ).getResolvedModel()
.getBindableJavaType() ).isEqualTo( MapValueEntity.class );
Expand Down
3 changes: 2 additions & 1 deletion ...a/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassAssociationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

/**
* @author Marco Belladelli
* @author Yanming Zhou
*/
@DomainModel( annotatedClasses = {
GenericMappedSuperclassAssociationTest.Parent.class,
Expand Down Expand Up @@ -86,7 +87,7 @@ public void testCriteriaQuery(SessionFactoryScope scope) {
final CriteriaQuery<ChildB> cq = cb.createQuery( ChildB.class );
final Root<ChildB> from = cq.from( ChildB.class );
final Path<Object> parent = from.get( "parent" );
assertThat( parent.getModel().getBindableJavaType() ).isEqualTo( Parent.class );
assertThat( parent.getModel().getBindableJavaType() ).isEqualTo( ParentB.class );
assertThat( ( (SqmPath<?>) parent ).getResolvedModel().getBindableJavaType() ).isEqualTo( ParentB.class );
cq.select( from ).where( cb.equal( from.get( "parent" ).get( "id" ), 2L ) );
final ChildB result = session.createQuery( cq ).getSingleResult();
Expand Down
7 changes: 3 additions & 4 deletions ...c/test/java/org/hibernate/orm/test/annotations/generics/GenericToManyAssociationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
/**
* @author Yoann Rodière
* @author Marco Belladelli
* @author Yanming Zhou
*/
@SessionFactory
@DomainModel( annotatedClasses = {
Expand Down Expand Up @@ -82,8 +83,7 @@ public void testParentCriteriaQuery(SessionFactoryScope scope) {
final CriteriaQuery<Long> query = cb.createQuery( Long.class );
final Root<Child> root = query.from( Child.class );
final Path<Parent> parent = root.get( "parent" );
// generic attributes are always reported as Object java type
assertThat( parent.getJavaType() ).isEqualTo( Object.class );
assertThat( parent.getJavaType() ).isEqualTo( Parent.class );
assertThat( parent.getModel() ).isSameAs( root.getModel().getAttribute( "parent" ) );
assertThat( ( (SqmPath<?>) parent ).getResolvedModel().getBindableJavaType() ).isEqualTo( Parent.class );
final Long result = session.createQuery( query.select( parent.get( "id" ) ) ).getSingleResult();
Expand All @@ -106,8 +106,7 @@ public void testChildCriteriaQuery(SessionFactoryScope scope) {
final CriteriaQuery<Long> query = cb.createQuery( Long.class );
final Root<Parent> root = query.from( Parent.class );
final Join<Parent, Child> join = root.join( "children" );
// generic attributes are always reported as Object java type
assertThat( join.getJavaType() ).isEqualTo( Object.class );
assertThat( join.getJavaType() ).isEqualTo( Child.class );
assertThat( join.getModel() ).isSameAs( root.getModel().getAttribute( "children" ) );
assertThat( ( (SqmPath<?>) join ).getResolvedModel().getBindableJavaType() ).isEqualTo( Child.class );
final Long result = session.createQuery( query.select( join.get( "id" ) ) ).getSingleResult();
Expand Down
7 changes: 3 additions & 4 deletions ...rc/test/java/org/hibernate/orm/test/annotations/generics/GenericToOneAssociationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
/**
* @author Yoann Rodière
* @author Marco Belladelli
* @author Yanming Zhou
*/
@SessionFactory
@DomainModel( annotatedClasses = {
Expand Down Expand Up @@ -78,8 +79,7 @@ public void testParentCriteriaQuery(SessionFactoryScope scope) {
final CriteriaQuery<Long> query = cb.createQuery( Long.class );
final Root<Child> root = query.from( Child.class );
final Path<Parent> parent = root.get( "parent" );
// generic attributes are always reported as Object java type
assertThat( parent.getJavaType() ).isEqualTo( Object.class );
assertThat( parent.getJavaType() ).isEqualTo( Parent.class );
assertThat( parent.getModel() ).isSameAs( root.getModel().getAttribute( "parent" ) );
assertThat( ( (SqmPath<?>) parent ).getResolvedModel().getBindableJavaType() ).isEqualTo( Parent.class );
final Long result = session.createQuery( query.select( parent.get( "id" ) ) ).getSingleResult();
Expand All @@ -102,8 +102,7 @@ public void testChildCriteriaQuery(SessionFactoryScope scope) {
final CriteriaQuery<Long> query = cb.createQuery( Long.class );
final Root<Parent> root = query.from( Parent.class );
final Join<Parent, Child> join = root.join( "child" );
// generic attributes are always reported as Object java type
assertThat( join.getJavaType() ).isEqualTo( Object.class );
assertThat( join.getJavaType() ).isEqualTo( Child.class );
assertThat( join.getModel() ).isSameAs( root.getModel().getAttribute( "child" ) );
assertThat( ( (SqmPath<?>) join ).getResolvedModel().getBindableJavaType() ).isEqualTo( Child.class );
final Long result = session.createQuery( query.select( join.get( "id" ) ) ).getSingleResult();
Expand Down
9 changes: 5 additions & 4 deletions ...c/test/java/org/hibernate/orm/test/annotations/generics/MultipleEmbeddedGenericsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

/**
* @author Marco Belladelli
* @author Yanming Zhou
*/
@DomainModel(annotatedClasses = {
MultipleEmbeddedGenericsTest.Customer.class,
Expand Down Expand Up @@ -74,12 +75,12 @@ public void testCustomerCriteria(SessionFactoryScope scope) {
final CriteriaQuery<Customer> query = cb.createQuery( Customer.class );
final Root<Customer> root = query.from( Customer.class );
final Path<CustomerEmbeddableOne> firstEmbedded = root.get( "firstEmbedded" );
assertThat( firstEmbedded.getJavaType() ).isEqualTo( GenericEmbeddableOne.class );
assertThat( firstEmbedded.getJavaType() ).isEqualTo( CustomerEmbeddableOne.class );
assertThat( firstEmbedded.getModel() ).isSameAs( root.getModel().getAttribute( "firstEmbedded" ) );
assertThat( ( (SqmPath<?>) firstEmbedded ).getResolvedModel().getBindableJavaType() )
.isEqualTo( CustomerEmbeddableOne.class );
final Path<CustomerEmbeddableTwo> secondEmbedded = root.get( "secondEmbedded" );
assertThat( secondEmbedded.getJavaType() ).isEqualTo( GenericEmbeddableTwo.class );
assertThat( secondEmbedded.getJavaType() ).isEqualTo( CustomerEmbeddableTwo.class );
assertThat( secondEmbedded.getModel() ).isSameAs( root.getModel().getAttribute( "secondEmbedded" ) );
assertThat( ( (SqmPath<?>) secondEmbedded ).getResolvedModel().getBindableJavaType() )
.isEqualTo( CustomerEmbeddableTwo.class );
Expand Down Expand Up @@ -110,12 +111,12 @@ public void testInvoiceCriteria(SessionFactoryScope scope) {
final CriteriaQuery<Invoice> query = cb.createQuery( Invoice.class );
final Root<Invoice> root = query.from( Invoice.class );
final Path<InvoiceEmbeddableOne> firstEmbedded = root.get( "firstEmbedded" );
assertThat( firstEmbedded.getJavaType() ).isEqualTo( GenericEmbeddableOne.class );
assertThat( firstEmbedded.getJavaType() ).isEqualTo( InvoiceEmbeddableOne.class );
assertThat( firstEmbedded.getModel() ).isSameAs( root.getModel().getAttribute( "firstEmbedded" ) );
assertThat( ( (SqmPath<?>) firstEmbedded ).getResolvedModel().getBindableJavaType() )
.isEqualTo( InvoiceEmbeddableOne.class );
final Path<InvoiceEmbeddableTwo> secondEmbedded = root.get( "secondEmbedded" );
assertThat( secondEmbedded.getJavaType() ).isEqualTo( GenericEmbeddableTwo.class );
assertThat( secondEmbedded.getJavaType() ).isEqualTo( InvoiceEmbeddableTwo.class );
assertThat( secondEmbedded.getModel() ).isSameAs( root.getModel().getAttribute( "secondEmbedded" ) );
assertThat( ( (SqmPath<?>) secondEmbedded ).getResolvedModel().getBindableJavaType() )
.isEqualTo( InvoiceEmbeddableTwo.class );
Expand Down
59 changes: 59 additions & 0 deletions ...a/org/hibernate/orm/test/metamodel/genericmodel/GenericMappedSuperclassMetamodelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.orm.test.metamodel.genericmodel;

import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.MappedSuperclass;
import jakarta.persistence.metamodel.EntityType;
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
import org.hibernate.testing.orm.junit.Jpa;
import org.junit.jupiter.api.Test;

import static org.junit.Assert.assertEquals;

/**
* @author Yanming Zhou
*/
@Jpa(
annotatedClasses = {
GenericMappedSuperclassMetamodelTest.Book.class,
GenericMappedSuperclassMetamodelTest.Owner.class,
GenericMappedSuperclassMetamodelTest.OwnerContainer.class
}
)
public class GenericMappedSuperclassMetamodelTest {

@Test
public void testGenericAttributeFromMappedSuperclassIsNotTypeErased(EntityManagerFactoryScope scope) {
scope.inTransaction( entityManager -> {
EntityType<Book> bookType = entityManager.getMetamodel().entity( Book.class );
assertEquals( Owner.class, bookType.getAttribute("owner").getJavaType() );
});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this assertion is correct. As with Java's reflection API, EntityType.getAttribute() gives you a representation of the inherited attribute as it was declared in the supertype. It does not do substitution of generic type arguments from the inheriting subclass, and I don't see any support anywhere in the JPA API or specification which hints that it should.

So I believe that it's correct for Hibernate to return Object.class here, and I think this PR should be closed.

}

@Entity
public static class Book extends OwnerContainer<Owner> {

@Id
private Long id;
}

@Entity
public static class Owner {
@Id
private Long id;
}

@MappedSuperclass
public static class OwnerContainer<T> {

@ManyToOne
T owner;
}
}