Skip to content

HHH-19181 - Remove LGPL-only contributions - Batch 3 #9826

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

Merged
merged 1 commit into from
Mar 3, 2025
Merged

HHH-19181 - Remove LGPL-only contributions - Batch 3 #9826

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
100 changes: 1 addition & 99 deletions ...core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphUsingFetchGraphTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
*/
package org.hibernate.orm.test.entitygraph;

import java.util.Collection;
import java.util.Date;
import java.util.List;
import jakarta.persistence.AttributeNode;

import jakarta.persistence.Entity;
import jakarta.persistence.EntityGraph;
import jakarta.persistence.EntityManager;
Expand All @@ -21,8 +20,6 @@
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.metamodel.Attribute;
import jakarta.persistence.metamodel.EntityType;

import org.hibernate.graph.GraphSemantic;

Expand All @@ -32,9 +29,7 @@
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.Test;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hibernate.testing.hamcrest.CollectionMatchers.hasSize;
import static org.hibernate.testing.hamcrest.InitializationCheckMatcher.isInitialized;

/**
Expand Down Expand Up @@ -143,68 +138,6 @@ void fetchAttributeNodeByStringFromSubgraph(SessionFactoryScope scope) {
query.setHint( GraphSemantic.LOAD.getJpaHintName(), entityGraph );
final List<CustomerOrder> results = query.getResultList();

assertEntityGraph( entityGraph );
assertThat( results, isInitialized() );
}
);
}

@Test
@JiraKey( value = "HHH-13233")
@SuppressWarnings({ "unchecked", "rawtypes" })
void fetchAttributeNodeByAttributeFromSubgraph(SessionFactoryScope scope) {
scope.inTransaction(
session -> {
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;
session.persist( address );
session.persist( orderPosition );
session.persist( product );
session.persist( customerOrder );
}
);

scope.inTransaction(
session -> {
final EntityManager em = session.unwrap( EntityManager.class );
final EntityGraph<CustomerOrder> entityGraph = em.createEntityGraph( CustomerOrder.class );
EntityType<CustomerOrder> customerOrderEntityType =
scope.getSessionFactory().getMetamodel().entity( CustomerOrder.class );
entityGraph.addAttributeNodes(
customerOrderEntityType.getAttribute( "shippingAddress" ),
customerOrderEntityType.getAttribute( "orderDate" )
);
entityGraph.addAttributeNodes( customerOrderEntityType.getAttribute( "shippingAddress" ) );

final Subgraph<OrderPosition> orderProductsSubgraph =
entityGraph.addSubgraph( (Attribute) customerOrderEntityType.getAttribute( "orderPosition" ) );
EntityType<OrderPosition> positionEntityType =
scope.getSessionFactory().getMetamodel().entity( OrderPosition.class );
orderProductsSubgraph.addAttributeNodes( positionEntityType.getAttribute( "amount" ) );
orderProductsSubgraph.addAttributeNodes( positionEntityType.getAttribute( "product" ) );

final Subgraph<Product> productSubgraph =
orderProductsSubgraph.addSubgraph( (Attribute) positionEntityType.getAttribute( "product" ) );
EntityType<Product> productEntityType = scope.getSessionFactory().getMetamodel().entity( Product.class );
productSubgraph.addAttributeNodes( productEntityType.getAttribute( "productName" ) );

TypedQuery<CustomerOrder> query = em.createQuery(
"SELECT o FROM CustomerOrder o", CustomerOrder.class
);
query.setHint( GraphSemantic.LOAD.getJpaHintName(), entityGraph );
final List<CustomerOrder> results = query.getResultList();

assertEntityGraph( entityGraph );
assertThat( results, isInitialized() );
}
);
Expand Down Expand Up @@ -250,37 +183,6 @@ void fetchUsingHql(SessionFactoryScope scope) {
);
}

/**
* Verify that entityGraph has expected state
*
* customerOrder - shippingAddress
* - orderDate
* - orderPosition - amount
* - product - productName
*
* @param entityGraph entityGraph
*/
private void assertEntityGraph(EntityGraph<CustomerOrder> entityGraph) {
assertThat(entityGraph.getAttributeNodes(), hasSize( 3 ) );
for ( AttributeNode<?> entityGraphAttributeNode : entityGraph.getAttributeNodes() ) {
if ( "orderPosition".equals( entityGraphAttributeNode.getAttributeName() ) ) {
Collection<Subgraph> orderPositionGraph = entityGraphAttributeNode.getSubgraphs().values();
assertThat( orderPositionGraph, hasSize( 1 ) );
List<AttributeNode<?>> orderPositionAttributes = orderPositionGraph.iterator().next().getAttributeNodes();
assertThat( orderPositionAttributes, hasSize( 2 ) );
for ( AttributeNode<?> orderPositionAttributeNode : orderPositionAttributes ) {
if ( "product".equals( orderPositionAttributeNode.getAttributeName() ) ) {
assertThat( orderPositionAttributeNode.getSubgraphs().entrySet(), hasSize( 1 ) );
} else {
assertThat( orderPositionAttributeNode.getSubgraphs().isEmpty(), is( true ) );
}
}
} else {
assertThat( entityGraphAttributeNode.getSubgraphs().isEmpty(), is( true ) );
}
}
}

@Entity(name = "CustomerOrder")
@Table(name = "customerOrder")
public static class CustomerOrder {
Expand Down