Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-13233 Add missing implementation to add attribute to subgraphs

This commit is contained in:
David Steinkopff 2019-02-20 14:43:59 +01:00 committed by Guillaume Smet
parent 89f523c87f
commit d8faee0d2c
2 changed files with 105 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/java/org/hibernate/graph/internal/SubGraphImpl.java
View File

@ -12,6 +12,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.graph.spi.AttributeNodeImplementor;
import org.hibernate.graph.spi.SubGraphImplementor;
import org.hibernate.metamodel.model.domain.spi.ManagedTypeDescriptor;
import org.hibernate.metamodel.model.domain.spi.PersistentAttributeDescriptor;
/**
* @author Steve Ebersole
@ -48,8 +49,9 @@ public class SubGraphImpl<J> extends AbstractGraph<J> implements SubGraphImpleme
}
@Override
@SuppressWarnings("unchecked")
public <AJ> AttributeNodeImplementor<AJ> addAttributeNode(Attribute<? extends J, AJ> attribute) {
return null;
return addAttributeNode( (PersistentAttributeDescriptor) attribute );
}
@Override

104
hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/EntityGraphUsingFetchGraphTest.java
View File

@ -6,11 +6,11 @@
*/
package org.hibernate.jpa.test.graphs;
import javax.persistence.AttributeNode;
import javax.persistence.Entity;
import javax.persistence.EntityGraph;
import javax.persistence.EntityManager;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
@ -20,15 +20,19 @@ import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.TypedQuery;
import javax.persistence.metamodel.Attribute;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import org.hibernate.Hibernate;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.metamodel.model.domain.spi.EntityTypeDescriptor;
import org.hibernate.testing.TestForIssue;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
@ -93,7 +97,7 @@ public class EntityGraphUsingFetchGraphTest extends BaseEntityManagerFunctionalT
@Test
@TestForIssue( jiraKey = "HHH-9392")
public void fetchAttributeNodeFromSubgraph() {
public void fetchAttributeNodeByStringFromSubgraph() {
EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
@ -136,6 +140,70 @@ public class EntityGraphUsingFetchGraphTest extends BaseEntityManagerFunctionalT
query.setHint( "javax.persistence.loadgraph", entityGraph );
final List<CustomerOrder> results = query.getResultList();
assertEntityGraph( entityGraph );
assertTrue( Hibernate.isInitialized( results ) );
em.getTransaction().commit();
em.close();
}
@Test
@TestForIssue( jiraKey = "HHH-13233")
@SuppressWarnings({ "unchecked", "rawtypes" })
public void fetchAttributeNodeByAttributeFromSubgraph() {
EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Address address = new Address();
address.city = "TestCity";
CustomerOrder customerOrder = new CustomerOrder();
customerOrder.shippingAddress = address;
Product product = new Product();
OrderPosition orderPosition = new OrderPosition();
orderPosition.product = product;
customerOrder.orderPosition = orderPosition;
em.persist( address );
em.persist( orderPosition );
em.persist( product );
em.persist( customerOrder );
em.getTransaction().commit();
em.clear();
em.getTransaction().begin();
final EntityGraph<CustomerOrder> entityGraph = em.createEntityGraph( CustomerOrder.class );
EntityTypeDescriptor<CustomerOrder> customerOrderEntityType =
entityManagerFactory().getMetamodel().entity( CustomerOrder.class );
entityGraph.addAttributeNodes(
(Attribute) customerOrderEntityType.getAttribute( "shippingAddress" ),
(Attribute) customerOrderEntityType.getAttribute( "orderDate" )
);
entityGraph.addAttributeNodes( (Attribute) customerOrderEntityType.getAttribute( "shippingAddress" ) );
final Subgraph<OrderPosition> orderProductsSubgraph =
entityGraph.addSubgraph( (Attribute) customerOrderEntityType.getAttribute( "orderPosition" ) );
EntityTypeDescriptor<OrderPosition> positionEntityType =
entityManagerFactory().getMetamodel().entity( OrderPosition.class );
orderProductsSubgraph.addAttributeNodes( (Attribute) positionEntityType.getAttribute( "amount" ) );
orderProductsSubgraph.addAttributeNodes( (Attribute) positionEntityType.getAttribute( "product" ) );
final Subgraph<Product> productSubgraph =
orderProductsSubgraph.addSubgraph( (Attribute) positionEntityType.getAttribute( "product" ) );
EntityTypeDescriptor<Product> productEntityType = entityManagerFactory().getMetamodel().entity( Product.class );
productSubgraph.addAttributeNodes( (Attribute) productEntityType.getAttribute( "productName" ) );
TypedQuery<CustomerOrder> query = em.createQuery(
"SELECT o FROM EntityGraphUsingFetchGraphTest$CustomerOrder o", CustomerOrder.class
);
query.setHint( "javax.persistence.loadgraph", entityGraph );
final List<CustomerOrder> results = query.getResultList();
assertEntityGraph( entityGraph );
assertTrue( Hibernate.isInitialized( results ) );
em.getTransaction().commit();
@ -184,6 +252,38 @@ public class EntityGraphUsingFetchGraphTest extends BaseEntityManagerFunctionalT
em.close();
}
/**
* Verify that entityGraph has expected state
*
* customerOrder - shippingAddress
* - orderDate
* - orderPosition - amount
* - product - productName
*
* @param entityGraph entityGraph
*/
private void assertEntityGraph(EntityGraph<CustomerOrder> entityGraph) {
assertEquals(3, entityGraph.getAttributeNodes().size());
for ( AttributeNode<?> entityGraphAttributeNode : entityGraph.getAttributeNodes() ) {
if ( "orderPosition".equals( entityGraphAttributeNode.getAttributeName() ) ) {
Collection<Subgraph> orderPositionGraph = entityGraphAttributeNode.getSubgraphs().values();
assertEquals( 1, orderPositionGraph.size() );
List<AttributeNode<?>> orderPositionAttributes = orderPositionGraph.iterator().next().getAttributeNodes();
assertEquals( 2, orderPositionAttributes.size() );
for ( AttributeNode<?> orderPositionAttributeNode : orderPositionAttributes ) {
if ( "product".equals( orderPositionAttributeNode.getAttributeName() ) ) {
assertEquals( 1, orderPositionAttributeNode.getSubgraphs().size() );
} else {
assertTrue( orderPositionAttributeNode.getSubgraphs().isEmpty() );
}
}
} else {
assertTrue( entityGraphAttributeNode.getSubgraphs().isEmpty() );
}
}
}
@Entity
@Table(name = "customerOrder")
public static class CustomerOrder {