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

HHH-8388 - pull in final jpa-api 2.1

This commit is contained in:
Steve Ebersole 2013-07-26 14:22:53 -05:00
parent 8b7a92e170
commit cf9bd9d13f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/EntityManagerImpl.java
View File

@ -197,7 +197,7 @@ public class EntityManagerImpl extends AbstractEntityManagerImpl implements Sess
@Override
@SuppressWarnings("unchecked")
public <T> EntityGraph<T> getEntityGraph(String graphName) {
public EntityGraph<?> getEntityGraph(String graphName) {
checkOpen();
final EntityGraphImpl named = getEntityManagerFactory().findEntityGraphByName( graphName );
if ( named == null ) {

3
hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/graphs/BasicEntityGraphTests.java
View File

@ -80,6 +80,7 @@ public class BasicEntityGraphTests extends BaseEntityManagerFunctionalTestCase {
}
@Test
@SuppressWarnings("unchecked")
public void testBasicGraphImmutability() {
EntityManager em = getOrCreateEntityManager();
EntityGraph<Entity1> graphRoot = em.createEntityGraph( Entity1.class );
@ -88,7 +89,7 @@ public class BasicEntityGraphTests extends BaseEntityManagerFunctionalTestCase {
em.getEntityManagerFactory().addNamedEntityGraph( "immutable", graphRoot );
graphRoot = em.getEntityGraph( "immutable" );
graphRoot = (EntityGraph<Entity1>) em.getEntityGraph( "immutable" );
assertEquals( "immutable", graphRoot.getName() );
assertEquals( 2, graphRoot.getAttributeNodes().size() );