From d38971f75b9c436bb096ee91f2a950d80dffa1c2 Mon Sep 17 00:00:00 2001 From: Gavin King Date: Thu, 29 Aug 2024 11:24:31 +0200 Subject: [PATCH] HHH-18539 update tests after removal of load() Signed-off-by: Gavin King --- .../bytecode/ProxyBreakingTest.java | 2 +- .../many2one/EmbeddableWithMany2OneTest.java | 2 +- .../entity/BasicHibernateAnnotationsTest.java | 8 +- .../IdClassGeneratedValueTest.java | 8 +- .../joined/JoinedSubclassTest.java | 4 +- .../test/annotations/loader/LoaderTest.java | 4 +- .../manytomany/ManyToManyTest.java | 10 +- .../annotations/manytoone/ManyToOneTest.java | 2 +- .../annotations/onetomany/OneToManyTest.java | 4 +- .../annotations/query/QueryAndSQLTest.java | 6 +- .../orm/test/batchfetch/BatchFetchTest.java | 4 +- .../InvocationTargetExceptionTest.java | 2 +- .../lazy/LazyCollectionLoadingTest.java | 4 +- .../lazy/LazyLoadingAndInheritanceTest.java | 2 +- .../lazy/LazyLoadingIntegrationTest.java | 2 +- .../enhancement/lazy/LazyLoadingTest.java | 2 +- .../lazy/MultiPathCascadeTest.java | 2 +- .../group/BasicAttributesLazyGroupTest.java | 8 +- .../lazy/proxy/BatchFetchProxyTest.java | 4 +- ...nhancedLazyLoadingOnDeletedEntityTest.java | 4 +- .../lazy/proxy/FetchGraphTest.java | 12 +-- .../LazyToOnesProxyWithSubclassesTest.java | 2 +- .../proxy/LoadANonExistingEntityTest.java | 6 +- ...adANonExistingNotFoundBatchEntityTest.java | 2 +- .../LoadANonExistingNotFoundEntityTest.java | 2 +- ...onExistingNotFoundLazyBatchEntityTest.java | 2 +- .../lazy/proxy/MergeProxyTest.java | 4 +- ...eInlineDirtyTrackingDynamicUpdateTest.java | 12 +-- ...alizeAndUpdateInlineDirtyTrackingTest.java | 12 +-- .../proxy/ProxyInitializeAndUpdateTest.java | 14 +-- .../SetIdentifierOnAEnhancedProxyTest.java | 12 +-- .../SimpleUpdateTestWithLazyLoading.java | 12 +-- ...WithLazyLoadingAndInlineDirtyTracking.java | 12 +-- ...ollectionInDefaultFetchGroupFalseTest.java | 12 +-- .../EntityWithMutableAttributesTest.java | 4 +- .../ondemandload/OnDemandLoadTest.java | 2 +- ...ollectionInDefaultFetchGroupFalseTest.java | 2 +- ...deEnhancedImmutableReferenceCacheTest.java | 2 +- .../orm/test/cache/CacheAnnotationTests.java | 2 +- .../orm/test/cache/ReferenceCacheTest.java | 2 +- .../test/cascade/MultiPathCascadeTest.java | 2 +- .../discriminatedcollections/TempTest.java | 2 +- .../test/ecid/EmbeddedCompositeIdTest.java | 4 +- .../embeddable/MappedByEmbeddableTest.java | 6 +- .../orm/test/filter/DynamicFilterTest.java | 8 +- .../TestClearBatchFetchQueueAfterFlush.java | 6 +- .../orm/test/hql/ASTParserLoadingTest.java | 6 +- .../orm/test/hql/BulkManipulationTest.java | 6 +- .../orm/test/hql/WithClauseTest.java | 2 +- .../hibernate/orm/test/idbag/IdBagTest.java | 8 +- .../orm/test/immutable/ImmutableTest.java | 4 +- .../InsertOrderingWithCascadeOnPersist.java | 2 +- .../orm/test/interceptor/InterceptorTest.java | 4 +- .../interfaceproxy/InterfaceProxyTest.java | 10 +- .../jpa/ops/GetLoadJpaComplianceTest.java | 4 +- .../orm/test/jpa/ops/GetLoadTest.java | 14 +-- .../orm/test/jpa/proxy/JPAProxyTest.java | 6 +- .../JpaSpecVersionValueUpdatingTest.java | 4 +- ...azyPersistWithDetachedAssociationTest.java | 2 +- .../lazyload/AtomikosJtaLazyLoadingTest.java | 4 +- .../orm/test/lazyload/JtaLazyLoadingTest.java | 4 +- .../test/lazyload/LazyLoadingLoggingTest.java | 4 +- .../lazyload/LazyLoadingNotFoundTest.java | 2 +- .../orm/test/lazyload/LazyLoadingTest.java | 6 +- .../hibernate/orm/test/legacy/ABCTest.java | 2 +- .../org/hibernate/orm/test/legacy/Qux.java | 2 +- .../LoadContainedInDoubleContainingTest.java | 2 +- .../loading/LoadParentChildEntityTest.java | 4 +- .../test/loading/multiLoad/MultiLoadTest.java | 18 ++-- .../collections/MapOperationTests.java | 2 +- .../collections/SetOperationTests.java | 4 +- .../converter/AttributeConverterTest.java | 2 +- .../ElementCollectionTests.java | 2 +- .../batch/SimpleBatchFetchBaselineTests.java | 4 +- .../fetch/batch/SimpleBatchFetchTests.java | 4 +- .../SimpleNestedSubSelectFetchTests.java | 6 +- ...SubselectFetchCollectionFromBatchTest.java | 8 +- .../fetch/subselect/SubselectFetchTest.java | 6 +- .../inheritance/BaseIdEntityByteCodeTest.java | 2 +- .../discriminator/DiscriminatorTest.java | 6 +- .../discriminator/SimpleInheritanceTest.java | 4 +- .../hibernate/orm/test/mixed/MixedTest.java | 10 +- .../DiscriminatorMultiTenancyTest.java | 10 +- .../AbstractSchemaBasedMultiTenancyTest.java | 8 +- .../test/notfound/EagerProxyNotFoundTest.java | 16 +-- .../test/ondemandload/LazyLoadingTest.java | 2 +- ...ctRecursiveBidirectionalOneToManyTest.java | 6 +- .../onetoone/formula/OneToOneFormulaTest.java | 2 +- .../optional/OptionalOneToOneTest.java | 2 +- .../hibernate/orm/test/ops/CreateTest.java | 2 +- .../hibernate/orm/test/ops/GetLoadTest.java | 8 +- .../hibernate/orm/test/ops/SimpleOpsTest.java | 2 +- .../genericApi/BasicGetLoadAccessTest.java | 6 +- .../orm/test/optlock/OptimisticLockTest.java | 4 +- .../orm/test/orphan/PropertyRefTest.java | 2 +- .../PolymorphicAssociationTest.java | 4 +- .../PolymorphicAssociationTest2.java | 4 +- .../property/DirectPropertyAccessorTest.java | 2 +- .../orm/test/proxy/FinalGetterSetterTest.java | 28 ++--- .../MultipleSessionFactoriesProxyTest.java | 2 +- .../hibernate/orm/test/proxy/ProxyTest.java | 50 ++++----- .../test/proxy/narrow/ProxyNarrowingTest.java | 2 +- .../orm/test/readonly/ReadOnlyProxyTest.java | 100 +++++++++--------- .../ReadOnlySessionLazyNonLazyTest.java | 6 +- .../test/readonly/ReadOnlySessionTest.java | 8 +- .../orm/test/readonly/ReadOnlyTest.java | 2 +- .../readonly/ReadOnlyVersionedNodesTest.java | 2 +- .../reattachment/ProxyReattachmentTest.java | 6 +- .../MapProxySerializationTest.java | 8 +- .../orm/test/unidir/BackrefTest.java | 2 +- .../orm/test/version/db/DbVersionTest.java | 8 +- .../sybase/SybaseTimestampVersioningTest.java | 10 +- .../id/VirtualEntitySingleIdMapper.java | 2 +- .../OneToOnePrimaryKeyJoinColumnMapper.java | 2 +- ...tedDynamicComponentsAdvancedCasesTest.java | 2 +- .../components/dynamic/SanityCheckTest.java | 2 +- .../proxy/QueryingWithProxyObjectTest.java | 2 +- .../EvictAuditDataAfterCommitTest.java | 8 +- .../orm/test/jcache/domain/EventManager.java | 16 +-- .../event/jfr/DirtyCalculationEventTests.java | 2 +- 120 files changed, 386 insertions(+), 386 deletions(-) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java index 9bde65afb9..fe24ca3a8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java @@ -30,7 +30,7 @@ public class ProxyBreakingTest extends BaseCoreFunctionalTestCase { s.flush(); s.clear(); assertNotNull( "The proxy creation failure is breaking things", h.getId() ); - h = (Hammer) s.load( Hammer.class, h.getId() ); + h = (Hammer) s.getReference( Hammer.class, h.getId() ); assertFalse( Hibernate.isInitialized( h ) ); tx.rollback(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java index 8276fd4ff2..30951d20d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java @@ -61,7 +61,7 @@ public class EmbeddableWithMany2OneTest { // same query! session.createQuery( "from Person p where p.address.country.id = 'US'" ) .list(); - Person p = session.load( Person.class, person.getId() ); + Person p = session.getReference( Person.class, person.getId() ); session.remove( p ); List countries = session.createQuery( "from Country" ).list(); assertEquals( 1, countries.size() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java index 28884268af..f2c6198c0b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java @@ -295,10 +295,10 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - topic = (Topic) s.load( Topic.class, topic.getId() ); + topic = (Topic) s.getReference( Topic.class, topic.getId() ); s.enableFilter("byState").setParameter("state", "published"); - topic = (Topic) s.load( Topic.class, topic.getId() ); + topic = (Topic) s.getReference( Topic.class, topic.getId() ); assertNotNull(topic); assertTrue(topic.getNarratives().size() == 1); assertEquals("published", topic.getNarratives().iterator().next().getState()); @@ -392,8 +392,8 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase { tx = s.beginTransaction(); s.clear(); - team2 = (SoccerTeam)s.load(team2.getClass(), team2.getId()); - team = (SoccerTeam)s.load(team.getClass(), team.getId()); + team2 = (SoccerTeam)s.getReference(team2.getClass(), team2.getId()); + team = (SoccerTeam)s.getReference(team.getClass(), team.getId()); int count = ( (Long) s.createQuery( "select count(*) from Player" ).list().get( 0 ) ).intValue(); assertEquals("expected count of 2 but got = " + count, count, 2); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java index 07a1785ad0..53859c077e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java @@ -61,7 +61,7 @@ public class IdClassGeneratedValueTest { session -> { List simpleList = session.createQuery( "select s from Simple s" ).list(); assertEquals( 2, simpleList.size() ); - Simple s1 = session.load( Simple.class, new SimplePK( 1L, 2L ) ); + Simple s1 = session.getReference( Simple.class, new SimplePK( 1L, 2L ) ); assertEquals( s1.getQuantity(), 10 ); session.clear(); } @@ -82,7 +82,7 @@ public class IdClassGeneratedValueTest { session -> { List simpleList = session.createQuery( "select s from Simple s" ).list(); assertEquals( 1, simpleList.size() ); - Simple s1 = session.load( Simple.class, new SimplePK( 1L, 2L ) ); + Simple s1 = session.getReference( Simple.class, new SimplePK( 1L, 2L ) ); assertEquals( s1.getQuantity(), 10 ); } ); @@ -105,7 +105,7 @@ public class IdClassGeneratedValueTest { session -> { List simpleList = session.createQuery( "select s from Simple2 s" ).list(); assertEquals( simpleList.size(), 2 ); - Simple2 s1 = session.load( Simple2.class, new SimplePK( s1Id1, 200L ) ); + Simple2 s1 = session.getReference( Simple2.class, new SimplePK( s1Id1, 200L ) ); assertEquals( s1.getQuantity(), 10 ); session.clear(); } @@ -132,7 +132,7 @@ public class IdClassGeneratedValueTest { session -> { List simpleList = session.createQuery( "select m from Multiple m" ).list(); assertEquals( simpleList.size(), 2 ); - Multiple m1 = session.load( + Multiple m1 = session.getReference( Multiple.class, new MultiplePK( m1Ids.get( 0 ), m1Ids.get( 1 ), 1000L ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java index 945a05f4e6..8532399d68 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java @@ -167,13 +167,13 @@ public class JoinedSubclassTest { session.flush(); session.clear(); - c1 = session.load( Client.class, c1.getId() ); + c1 = session.getReference( Client.class, c1.getId() ); assertEquals( 5000.0, c1.getAccount().getBalance(), 0.01 ); session.flush(); session.clear(); - a1 = session.load( Account.class, a1.getId() ); + a1 = session.getReference( Account.class, a1.getId() ); Set clients = a1.getClients(); assertEquals( 1, clients.size() ); Iterator it = clients.iterator(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderTest.java index d97587228d..5f96c68b05 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderTest.java @@ -50,7 +50,7 @@ public class LoaderTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - Team t2 = s.load( Team.class, t.getId() ); + Team t2 = s.getReference( Team.class, t.getId() ); Set players = t2.getPlayers(); Iterator iterator = players.iterator(); assertEquals( "me", iterator.next().getName() ); @@ -75,7 +75,7 @@ public class LoaderTest extends BaseCoreFunctionalTestCase { try { long notExistingId = 1l; - s.load( Team.class, notExistingId ); + s.getReference( Team.class, notExistingId ); s.get( Team.class, notExistingId ); s.getTransaction().commit(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java index fc57fa7c73..812cc6803f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java @@ -245,7 +245,7 @@ public class ManyToManyTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - er = s.load( Employer.class, er.getId() ); + er = s.getReference( Employer.class, er.getId() ); assertNotNull( er ); assertNotNull( er.getEmployees() ); assertEquals( 1, er.getEmployees().size() ); @@ -384,7 +384,7 @@ public class ManyToManyTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - er = s.load( Employer.class, er.getId() ); + er = s.getReference( Employer.class, er.getId() ); assertNotNull( er ); assertNotNull( er.getEmployees() ); assertEquals( 2, er.getEmployees().size() ); @@ -441,7 +441,7 @@ public class ManyToManyTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - f = s.load( Friend.class, f.getId() ); + f = s.getReference( Friend.class, f.getId() ); assertNotNull( f ); assertNotNull( f.getFriends() ); assertEquals( 1, f.getFriends().size() ); @@ -509,10 +509,10 @@ public class ManyToManyTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - m1 = s.load( Man.class, m1pk ); + m1 = s.getReference( Man.class, m1pk ); assertFalse( m1.getWomens().isEmpty() ); assertEquals( 1, m1.getWomens().size() ); - w1 = s.load( Woman.class, w1pk ); + w1 = s.getReference( Woman.class, w1pk ); assertFalse( w1.getMens().isEmpty() ); assertEquals( 2, w1.getMens().size() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java index 098ff8537b..4898ba2d0e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java @@ -189,7 +189,7 @@ public class ManyToOneTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - discount = s.load( Discount.class, discount.getId() ); + discount = s.getReference( Discount.class, discount.getId() ); assertNotNull( discount ); assertFalse( Hibernate.isInitialized( discount.getOwner() ) ); tx.commit(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java index 9889f38fc9..9ac0d7725e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java @@ -428,7 +428,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - c = ( Customer ) s.load( Customer.class, c.getId() ); + c = ( Customer ) s.getReference( Customer.class, c.getId() ); assertNotNull( c ); assertTrue( Hibernate.isInitialized( c.getTickets() ) ); assertNotNull( c.getTickets() ); @@ -458,7 +458,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - c = ( Customer ) s.load( Customer.class, c.getId() ); + c = ( Customer ) s.getReference( Customer.class, c.getId() ); assertNotNull( c ); assertFalse( Hibernate.isInitialized( c.getDiscountTickets() ) ); assertNotNull( c.getDiscountTickets() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java index 6815e429ab..5aa82292ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java @@ -652,7 +652,7 @@ public class QueryAndSQLTest { session.clear(); session.getSessionFactory().getCache().evictEntityData( Chaos.class ); - Chaos resultChaos = session.load( Chaos.class, chaos.getId() ); + Chaos resultChaos = session.getReference( Chaos.class, chaos.getId() ); assertEquals( upperName, resultChaos.getName() ); assertEquals( "nickname", resultChaos.getNickname() ); } @@ -686,14 +686,14 @@ public class QueryAndSQLTest { session.clear(); session.getSessionFactory().getCache().evictEntityData( Chaos.class ); - Chaos resultChaos = session.load( Chaos.class, chaos.getId() ); + Chaos resultChaos = session.getReference( Chaos.class, chaos.getId() ); assertEquals( 2, resultChaos.getParticles().size() ); resultChaos.getParticles().remove( resultChaos.getParticles().iterator().next() ); resultChaos.getParticles().remove( resultChaos.getParticles().iterator().next() ); session.flush(); session.clear(); - resultChaos = session.load( Chaos.class, chaos.getId() ); + resultChaos = session.getReference( Chaos.class, chaos.getId() ); assertEquals( 0, resultChaos.getParticles().size() ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchTest.java index 8f772c8512..09d4e7e89f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchTest.java @@ -149,13 +149,13 @@ public class BatchFetchTest { session -> { // load them all as proxies for ( int i = 0; i < size; i++ ) { - BatchLoadableEntity entity = session.load( BatchLoadableEntity.class, i ); + BatchLoadableEntity entity = session.getReference( BatchLoadableEntity.class, i ); assertFalse( Hibernate.isInitialized( entity ) ); } scope.getSessionFactory().getStatistics().clear(); // now start initializing them... for ( int i = 0; i < size; i++ ) { - BatchLoadableEntity entity = session.load( BatchLoadableEntity.class, i ); + BatchLoadableEntity entity = session.getReference( BatchLoadableEntity.class, i ); Hibernate.initialize( entity ); assertTrue( Hibernate.isInitialized( entity ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java index 17817442cc..686d716878 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/InvocationTargetExceptionTest.java @@ -41,7 +41,7 @@ public class InvocationTargetExceptionTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - bean = ( Bean ) s.load( Bean.class, bean.getSomeString() ); + bean = ( Bean ) s.getReference( Bean.class, bean.getSomeString() ); assertFalse( Hibernate.isInitialized( bean ) ); try { bean.throwException(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java index a608d1a27e..38f48a2709 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionLoadingTest.java @@ -91,7 +91,7 @@ public class LazyCollectionLoadingTest { @Test public void testTransaction(SessionFactoryScope scope) { scope.inTransaction( s -> { - Parent parent = s.load( Parent.class, parentID ); + Parent parent = s.getReference( Parent.class, parentID ); assertThat( parent, notNullValue() ); assertThat( parent, not( instanceOf( HibernateProxy.class ) ) ); assertFalse( isPropertyInitialized( parent, "children" ) ); @@ -141,7 +141,7 @@ public class LazyCollectionLoadingTest { @Test public void testNoTransaction(SessionFactoryScope scope) { scope.inTransaction( s -> { - parent = s.load( Parent.class, parentID ); + parent = s.getReference( Parent.class, parentID ); assertThat( parent, notNullValue() ); assertThat( parent, not( instanceOf( HibernateProxy.class ) ) ); assertFalse( isPropertyInitialized( parent, "children" ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndInheritanceTest.java index 0f48029531..334deae04c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingAndInheritanceTest.java @@ -64,7 +64,7 @@ public class LazyLoadingAndInheritanceTest { @Test public void test(SessionFactoryScope scope) { scope.inTransaction( s -> { - Containing containing = s.load( Containing.class, containingID ); + Containing containing = s.getReference( Containing.class, containingID ); Contained contained = containing.contained; assertThat( contained ).isNotNull(); assertThat( Hibernate.isPropertyInitialized( contained, "name" ) ).isFalse(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java index a694e154af..999726a200 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingIntegrationTest.java @@ -73,7 +73,7 @@ public class LazyLoadingIntegrationTest { @Test public void test(SessionFactoryScope scope) { scope.inTransaction( s -> { - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); checkDirtyTracking( loadedChild ); loadedChild.name = "Barrabas"; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingTest.java index ad92ad10f2..e6fdb8bc50 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyLoadingTest.java @@ -86,7 +86,7 @@ public class LazyLoadingTest { @Test public void test(SessionFactoryScope scope) { scope.inTransaction( s -> { - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); assertThat( loadedChild, not( instanceOf( HibernateProxy.class ) ) ); assertThat( loadedChild, instanceOf( PersistentAttributeInterceptable.class ) ); final PersistentAttributeInterceptable interceptable = (PersistentAttributeInterceptable) loadedChild; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java index 990e747a6d..7c025ad66c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java @@ -90,7 +90,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> { - A aLoaded = session.load( A.class, new Long( a.getId() ) ); + A aLoaded = session.getReference( A.class, new Long( a.getId() ) ); assertInstanceOf( HibernateProxy.class, aLoaded ); assertSame( aLoaded, session.merge( a ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BasicAttributesLazyGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BasicAttributesLazyGroupTest.java index e4a210242b..249d7630bc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BasicAttributesLazyGroupTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/BasicAttributesLazyGroupTest.java @@ -71,7 +71,7 @@ public class BasicAttributesLazyGroupTest { @Test public void testLoad(SessionFactoryScope scope) { scope.inTransaction( session -> { - final Review review = session.load( Review.class, 1L ); + final Review review = session.getReference( Review.class, 1L ); assertFalse( Hibernate.isPropertyInitialized( review, "rating" ) ); assertFalse( Hibernate.isPropertyInitialized( review, "comment" ) ); @@ -86,7 +86,7 @@ public class BasicAttributesLazyGroupTest { @Test public void testLoad2(SessionFactoryScope scope) { scope.inTransaction( session -> { - final Review review = session.load( Review.class, 1L ); + final Review review = session.getReference( Review.class, 1L ); assertFalse( Hibernate.isPropertyInitialized( review, "rating" ) ); assertFalse( Hibernate.isPropertyInitialized( review, "comment" ) ); @@ -101,7 +101,7 @@ public class BasicAttributesLazyGroupTest { @Test public void testLoad3(SessionFactoryScope scope) { scope.inTransaction( session -> { - final Review review = session.load( Review.class, 1L ); + final Review review = session.getReference( Review.class, 1L ); assertThat( review.getComment(), is( "My first review" ) ); assertThat( review.getRating(), is( Rating.ONE ) ); @@ -111,7 +111,7 @@ public class BasicAttributesLazyGroupTest { @Test public void testLoad4(SessionFactoryScope scope) { scope.inTransaction( session -> { - final Review review = session.load( Review.class, 1L ); + final Review review = session.getReference( Review.class, 1L ); assertThat( review.getRating(), is( Rating.ONE ) ); assertThat( review.getComment(), is( "My first review" ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java index 4fcd2bfca9..63dd5bf913 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BatchFetchProxyTest.java @@ -134,7 +134,7 @@ public class BatchFetchProxyTest { List employers = new ArrayList<>(); for ( int i = 0 ; i < NUMBER_OF_ENTITIES ; i++ ) { - employers.add( session.load( Employer.class, i + 1) ); + employers.add( session.getReference( Employer.class, i + 1) ); } assertEquals( 0, statistics.getPrepareStatementCount() ); @@ -167,7 +167,7 @@ public class BatchFetchProxyTest { List employers = new ArrayList<>(); for ( int i = 0 ; i < NUMBER_OF_ENTITIES ; i++ ) { - employers.add( session.load( Employer.class, i + 1) ); + employers.add( session.getReference( Employer.class, i + 1) ); } assertEquals( 0, statistics.getPrepareStatementCount() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java index 8bc638c961..ea2710cf62 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/BytecodeEnhancedLazyLoadingOnDeletedEntityTest.java @@ -74,7 +74,7 @@ public class BytecodeEnhancedLazyLoadingOnDeletedEntityTest { s.persist( owner ); } ); assertThatThrownBy( () -> scope.inTransaction( session -> { - AssociationOwner owner = session.load( AssociationOwner.class, 1 ); + AssociationOwner owner = session.getReference( AssociationOwner.class, 1 ); session.remove( owner ); session.flush(); owner.getNonOwners().size(); @@ -92,7 +92,7 @@ public class BytecodeEnhancedLazyLoadingOnDeletedEntityTest { s.persist( nonOwner ); } ); assertThatThrownBy( () -> scope.inTransaction( session -> { - AssociationNonOwner nonOwner = session.load( AssociationNonOwner.class, 1 ); + AssociationNonOwner nonOwner = session.getReference( AssociationNonOwner.class, 1 ); session.remove( nonOwner ); session.flush(); nonOwner.getOwners().size(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java index d073a4ec54..d92e1ea99a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/FetchGraphTest.java @@ -107,7 +107,7 @@ public class FetchGraphTest { scope.inSession( session -> { - final DEntity entityD = session.load( DEntity.class, 1L ); + final DEntity entityD = session.getReference( DEntity.class, 1L ); assertThat( stats.getPrepareStatementCount(), is( 0L ) ); assert !Hibernate.isPropertyInitialized( entityD, "a" ); assert !Hibernate.isPropertyInitialized( entityD, "c" ); @@ -141,7 +141,7 @@ public class FetchGraphTest { scope.inSession( session -> { - final EEntity entityE = session.load( EEntity.class, 17L ); + final EEntity entityE = session.getReference( EEntity.class, 17L ); assertThat( stats.getPrepareStatementCount(), is( 0L ) ); assert !Hibernate.isPropertyInitialized( entityE, "d" ); @@ -356,7 +356,7 @@ public class FetchGraphTest { session -> { final AEntity entityA = session.get( AEntity.class, 1L ); - final DEntity entityD = session.load( DEntity.class, 1L ); + final DEntity entityD = session.getReference( DEntity.class, 1L ); assert !Hibernate.isInitialized( entityD ); Hibernate.initialize( entityD ); assert Hibernate.isPropertyInitialized( entityD, "a" ); @@ -383,7 +383,7 @@ public class FetchGraphTest { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Load a D - final DEntity entityD = session.load( DEntity.class, 1L ); + final DEntity entityD = session.getReference( DEntity.class, 1L ); assertThat( entityD instanceof HibernateProxy, is( false ) ); assertThat( entityD instanceof PersistentAttributeInterceptable, is( true ) ); @@ -611,7 +611,7 @@ public class FetchGraphTest { public void testLoadAndDeleteDEntity(SessionFactoryScope scope) { scope.inTransaction( session -> { - DEntity entity = session.load( DEntity.class, 1L ); + DEntity entity = session.getReference( DEntity.class, 1L ); session.remove( entity ); session.remove( entity.getE() ); session.remove( entity.getA() ); @@ -654,7 +654,7 @@ public class FetchGraphTest { public void testLoadAndDeleteEEntity(SessionFactoryScope scope) { scope.inTransaction( session -> { - EEntity entity = session.load( EEntity.class, 17L ); + EEntity entity = session.getReference( EEntity.class, 17L ); session.remove( entity ); session.remove( entity.getD() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java index f9809b0f16..8377ed64ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyToOnesProxyWithSubclassesTest.java @@ -80,7 +80,7 @@ public class LazyToOnesProxyWithSubclassesTest { assertEquals( 1, stats.getPrepareStatementCount() ); - Animal animal = session.load( Animal.class, "A Human" ); + Animal animal = session.getReference( Animal.class, "A Human" ); assertFalse( Hibernate.isInitialized( animal ) ); assertEquals( 1, stats.getPrepareStatementCount() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java index adbd5d6b56..75cd70e4ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingEntityTest.java @@ -72,7 +72,7 @@ public class LoadANonExistingEntityTest { statistics.clear(); scope.inTransaction( session -> { - Employer nonExisting = session.load( Employer.class, -1 ); + Employer nonExisting = session.getReference( Employer.class, -1 ); assertEquals( 0, statistics.getPrepareStatementCount() ); assertFalse( Hibernate.isInitialized( nonExisting ) ); try { @@ -93,7 +93,7 @@ public class LoadANonExistingEntityTest { final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); statistics.clear(); scope.inTransaction( session -> { - Employer nonExisting = session.load( Employer.class, -1 ); + Employer nonExisting = session.getReference( Employer.class, -1 ); assertEquals( 0, statistics.getPrepareStatementCount() ); assertFalse( Hibernate.isInitialized( nonExisting ) ); try { @@ -114,7 +114,7 @@ public class LoadANonExistingEntityTest { final StatisticsImplementor statistics = scope.getSessionFactory().getStatistics(); statistics.clear(); scope.inTransaction( session -> { - Employer nonExisting = session.load( Employer.class, -1 ); + Employer nonExisting = session.getReference( Employer.class, -1 ); assertEquals( 0, statistics.getPrepareStatementCount() ); assertFalse( Hibernate.isInitialized( nonExisting ) ); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java index a0c8d381b0..3645f9af85 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundBatchEntityTest.java @@ -82,7 +82,7 @@ public class LoadANonExistingNotFoundBatchEntityTest { scope.inTransaction( (session) -> { List employees = new ArrayList<>( NUMBER_OF_ENTITIES ); for ( int i = 0 ; i < NUMBER_OF_ENTITIES ; i++ ) { - employees.add( session.load( Employee.class, i + 1 ) ); + employees.add( session.getReference( Employee.class, i + 1 ) ); } for ( int i = 0 ; i < NUMBER_OF_ENTITIES ; i++ ) { Hibernate.initialize( employees.get( i ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java index bebee952fb..5561348e4a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundEntityTest.java @@ -75,7 +75,7 @@ public class LoadANonExistingNotFoundEntityTest { statistics.clear(); scope.inTransaction( session -> { - Employee employee = session.load( Employee.class, 1 ); + Employee employee = session.getReference( Employee.class, 1 ); Hibernate.initialize( employee ); assertNull( employee.employer ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java index 5cba645840..8091acd64f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LoadANonExistingNotFoundLazyBatchEntityTest.java @@ -83,7 +83,7 @@ public class LoadANonExistingNotFoundLazyBatchEntityTest { scope.inTransaction( (session) -> { List employees = new ArrayList<>( NUMBER_OF_ENTITIES ); for ( int i = 0 ; i < NUMBER_OF_ENTITIES ; i++ ) { - employees.add( session.load( Employee.class, i + 1 ) ); + employees.add( session.getReference( Employee.class, i + 1 ) ); } for ( int i = 0 ; i < NUMBER_OF_ENTITIES ; i++ ) { Hibernate.initialize( employees.get( i ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeProxyTest.java index ccd0ec5377..a6f77e823e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/MergeProxyTest.java @@ -95,7 +95,7 @@ public class MergeProxyTest { public void testMergeDetachInitializedProxy(SessionFactoryScope scope) { final Activity activityProxy = scope.fromTransaction( session -> { - final Activity activity = session.load( Activity.class, 0 ); + final Activity activity = session.getReference( Activity.class, 0 ); assertFalse( Hibernate.isInitialized( activity) ); Hibernate.initialize( activity ); return activity; @@ -140,7 +140,7 @@ public class MergeProxyTest { public void testMergeDetachInitializedByAccessProxy(SessionFactoryScope scope) { final Activity activityProxy = scope.fromTransaction( session -> { - final Activity activity = session.load( Activity.class, 0 ); + final Activity activity = session.getReference( Activity.class, 0 ); assertFalse( Hibernate.isInitialized( activity) ); activity.getDescription(); return activity; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java index ed6154133b..28ab9a5bd8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest.java @@ -70,7 +70,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest { scope.inTransaction( session -> { - Animal animal = session.load( Animal.class, "animal" ); + Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); assertEquals( LoadState.NOT_LOADED , PersistenceUtilHelper.isLoadedWithoutReference( animal, "sex", metadataCache ) ); assertEquals( "female", animal.getSex() ); @@ -108,7 +108,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest { scope.inTransaction( session -> { - Animal animal = session.load( Animal.class, "animal" ); + Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); assertEquals( LoadState.NOT_LOADED , PersistenceUtilHelper.isLoadedWithoutReference( animal, "sex", metadataCache ) ); animal.setSex( "other" ); @@ -156,7 +156,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest { scope.inTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); assertEquals( LoadState.NOT_LOADED , PersistenceUtilHelper.isLoadedWithoutReference( animal, "age", metadataCache ) ); session.merge( animalInitialized ); @@ -236,7 +236,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest { ); final Animal animalUninitialized = scope.fromTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); assertEquals( LoadState.NOT_LOADED , PersistenceUtilHelper.isLoadedWithoutReference( animal, "age", metadataCache ) ); assertFalse( Hibernate.isInitialized( animal ) ); //checking again against side effects of using PersistenceUtilHelper @@ -246,7 +246,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest { scope.inTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); assertEquals( LoadState.NOT_LOADED , PersistenceUtilHelper.isLoadedWithoutReference( animal, "age", metadataCache ) ); session.merge( animalUninitialized ); @@ -279,7 +279,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingDynamicUpdateTest { ); final Animal animalUninitialized = scope.fromTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); assertEquals( LoadState.NOT_LOADED , PersistenceUtilHelper.isLoadedWithoutReference( animal, "age", metadataCache ) ); assertFalse( Hibernate.isInitialized( animal ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java index ffd4b08518..adcf4da863 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateInlineDirtyTrackingTest.java @@ -65,7 +65,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingTest { scope.inTransaction( session -> { - Animal animal = session.load( Animal.class, "animal" ); + Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); assertEquals( "female", animal.getSex() ); assertTrue( Hibernate.isInitialized( animal ) ); @@ -100,7 +100,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingTest { scope.inTransaction( session -> { - Animal animal = session.load( Animal.class, "animal" ); + Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); animal.setSex( "other" ); // Setting the attribute value should have initialized animal. @@ -145,7 +145,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingTest { scope.inTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); session.merge( animalInitialized ); assertTrue( Hibernate.isInitialized( animal ) ); @@ -223,7 +223,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingTest { ); final Animal animalUninitialized = scope.fromTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); return animal; } @@ -231,7 +231,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingTest { scope.inTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); session.merge( animalUninitialized ); assertFalse( Hibernate.isInitialized( animal ) ); @@ -261,7 +261,7 @@ public class ProxyInitializeAndUpdateInlineDirtyTrackingTest { ); final Animal animalUninitialized = scope.fromTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); return animal; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java index 5e1e9c8487..80547a347e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyInitializeAndUpdateTest.java @@ -66,7 +66,7 @@ public class ProxyInitializeAndUpdateTest { scope.inTransaction( session -> { - Animal animal = session.load( Animal.class, "animal" ); + Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); assertEquals( "female", animal.getSex() ); assertTrue( Hibernate.isInitialized( animal ) ); @@ -101,7 +101,7 @@ public class ProxyInitializeAndUpdateTest { scope.inTransaction( session -> { - Animal animal = session.load( Animal.class, "animal" ); + Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); animal.setSex( "other" ); // Setting the attribute value should have initialized animal. @@ -146,7 +146,7 @@ public class ProxyInitializeAndUpdateTest { scope.inTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); final Animal animalMerged = (Animal) session.merge( animalInitialized ); assertSame( animal, animalMerged ); @@ -226,7 +226,7 @@ public class ProxyInitializeAndUpdateTest { ); final Animal animalUninitialized = scope.fromTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); return animal; } @@ -234,7 +234,7 @@ public class ProxyInitializeAndUpdateTest { scope.inTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); final Animal animalMerged = (Animal) session.merge( animalUninitialized ); assertSame( animal, animalMerged ); @@ -265,7 +265,7 @@ public class ProxyInitializeAndUpdateTest { ); final Animal animalUninitialized = scope.fromTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); return animal; } @@ -273,7 +273,7 @@ public class ProxyInitializeAndUpdateTest { scope.inTransaction( session -> { - final Animal animal = session.load( Animal.class, "animal" ); + final Animal animal = session.getReference( Animal.class, "animal" ); assertFalse( Hibernate.isInitialized( animal ) ); animal.setSex( "other" ); assertTrue( Hibernate.isInitialized( animal ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java index e30abf7394..22cd522a4a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SetIdentifierOnAEnhancedProxyTest.java @@ -85,7 +85,7 @@ public class SetIdentifierOnAEnhancedProxyTest { scope.inTransaction( session -> { stats.clear(); - Child loadedChild = session.load( Child.class, lastChildID ); + Child loadedChild = session.getReference( Child.class, lastChildID ); final PersistentAttributeInterceptable interceptable = (PersistentAttributeInterceptable) loadedChild; final PersistentAttributeInterceptor interceptor = interceptable.$$_hibernate_getInterceptor(); @@ -102,7 +102,7 @@ public class SetIdentifierOnAEnhancedProxyTest { scope.inTransaction( session -> { - Child loadedChild = session.load( Child.class, lastChildID ); + Child loadedChild = session.getReference( Child.class, lastChildID ); assertThat( loadedChild ).isNotNull(); } ); @@ -120,7 +120,7 @@ public class SetIdentifierOnAEnhancedProxyTest { ModelId id = new ModelId(); id.setId1( 1L ); id.setId2( 2L ); - Parent parent = session.load( Parent.class, id ); + Parent parent = session.getReference( Parent.class, id ); final PersistentAttributeInterceptable interceptable = (PersistentAttributeInterceptable) parent; final PersistentAttributeInterceptor interceptor = interceptable.$$_hibernate_getInterceptor(); @@ -142,7 +142,7 @@ public class SetIdentifierOnAEnhancedProxyTest { scope.inTransaction( session -> { - Child loadedChild = session.load( Child.class, lastChildID ); + Child loadedChild = session.getReference( Child.class, lastChildID ); assertThat( loadedChild ).isNotNull(); } ); @@ -160,7 +160,7 @@ public class SetIdentifierOnAEnhancedProxyTest { ModelId id = new ModelId(); id.setId1( 1L ); id.setId2( 2L ); - Parent parent = session.load( Parent.class, id ); + Parent parent = session.getReference( Parent.class, id ); final PersistentAttributeInterceptable interceptable = (PersistentAttributeInterceptable) parent; final PersistentAttributeInterceptor interceptor = interceptable.$$_hibernate_getInterceptor(); @@ -189,7 +189,7 @@ public class SetIdentifierOnAEnhancedProxyTest { () -> scope.inTransaction( session -> { stats.clear(); - Child loadedChild = session.load( Child.class, lastChildID ); + Child loadedChild = session.getReference( Child.class, lastChildID ); final PersistentAttributeInterceptable interceptable = (PersistentAttributeInterceptable) loadedChild; final PersistentAttributeInterceptor interceptor = interceptable.$$_hibernate_getInterceptor(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java index 50df45f289..c990973879 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoading.java @@ -120,7 +120,7 @@ public class SimpleUpdateTestWithLazyLoading { scope.inTransaction( session -> { stats.clear(); - Child loadedChild = session.load( Child.class, lastChildID ); + Child loadedChild = session.getReference( Child.class, lastChildID ); final PersistentAttributeInterceptable interceptable = (PersistentAttributeInterceptable) loadedChild; final PersistentAttributeInterceptor interceptor = interceptable.$$_hibernate_getInterceptor(); @@ -152,7 +152,7 @@ public class SimpleUpdateTestWithLazyLoading { scope.inTransaction( session -> { - Child loadedChild = session.load( Child.class, lastChildID ); + Child loadedChild = session.getReference( Child.class, lastChildID ); assertThat( loadedChild.getName(), is( updatedName ) ); assertFalse( Hibernate.isInitialized( loadedChild.getRelatives() ) ); @@ -168,7 +168,7 @@ public class SimpleUpdateTestWithLazyLoading { scope.inTransaction( s -> { final Statistics stats = scope.getSessionFactory().getStatistics(); stats.clear(); - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); loadedChild.setName( updatedName ); @@ -184,7 +184,7 @@ public class SimpleUpdateTestWithLazyLoading { } ); scope.inTransaction( s -> { - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); assertThat( Hibernate.isInitialized( loadedChild ), is( false ) ); assertThat( loadedChild.getName(), is( updatedName ) ); assertThat( Hibernate.isInitialized( loadedChild ), is( true ) ); @@ -199,7 +199,7 @@ public class SimpleUpdateTestWithLazyLoading { scope.inTransaction( s -> { final Statistics stats = scope.getSessionFactory().getStatistics(); stats.clear(); - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); assertEquals( 0, stats.getPrepareStatementCount() ); @@ -213,7 +213,7 @@ public class SimpleUpdateTestWithLazyLoading { } ); scope.inTransaction( s -> { - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); assertThat( loadedChild.getRelatives().size(), is( 2 ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java index 8b09930336..622e56a9d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking.java @@ -108,7 +108,7 @@ public class SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking { String updatedName = "Barrabas_"; scope.inTransaction( s -> { stats.clear(); - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); final PersistentAttributeInterceptable interceptable = (PersistentAttributeInterceptable) loadedChild; final PersistentAttributeInterceptor interceptor = interceptable.$$_hibernate_getInterceptor(); @@ -124,7 +124,7 @@ public class SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking { assertEquals( 2, stats.getPrepareStatementCount() ); scope.inTransaction( s -> { - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); assertThat( loadedChild.getName(), is( updatedName ) ); } ); } @@ -136,7 +136,7 @@ public class SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking { scope.inTransaction( s -> { final Statistics stats = scope.getSessionFactory().getStatistics(); stats.clear(); - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); loadedChild.setName( updatedName ); @@ -152,7 +152,7 @@ public class SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking { } ); scope.inTransaction( s -> { - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); assertThat( loadedChild.getName(), is( updatedName ) ); assertThat( loadedChild.getParent().getName(), is( parentName ) ); } ); @@ -163,7 +163,7 @@ public class SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking { scope.inTransaction( s -> { final Statistics stats = scope.getSessionFactory().getStatistics(); stats.clear(); - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); assertEquals( 0, stats.getPrepareStatementCount() ); Person relative = new Person(); @@ -177,7 +177,7 @@ public class SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking { } ); scope.inTransaction( s -> { - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); assertThat( loadedChild.getRelatives().size(), is( 2 ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTest.java index 852b5b70a3..0d900e6665 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTest.java @@ -128,7 +128,7 @@ public class SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTe scope.inTransaction( session -> { stats.clear(); - Child loadedChild = session.load( Child.class, lastChildID ); + Child loadedChild = session.getReference( Child.class, lastChildID ); final PersistentAttributeInterceptable interceptable = (PersistentAttributeInterceptable) loadedChild; final PersistentAttributeInterceptor interceptor = interceptable.$$_hibernate_getInterceptor(); @@ -167,7 +167,7 @@ public class SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTe scope.inTransaction( session -> { - Child loadedChild = session.load( Child.class, lastChildID ); + Child loadedChild = session.getReference( Child.class, lastChildID ); assertThat( loadedChild.getName(), is( updatedName ) ); final EntityEntry entry = session.getPersistenceContext().getEntry( loadedChild ); @@ -187,7 +187,7 @@ public class SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTe scope.inTransaction( s -> { final Statistics stats = scope.getSessionFactory().getStatistics(); stats.clear(); - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); loadedChild.setName( updatedName ); @@ -203,7 +203,7 @@ public class SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTe } ); scope.inTransaction( s -> { - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); assertThat( Hibernate.isInitialized( loadedChild ), is( false ) ); assertThat( loadedChild.getName(), is( updatedName ) ); assertThat( Hibernate.isInitialized( loadedChild ), is( true ) ); @@ -218,7 +218,7 @@ public class SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTe scope.inTransaction( s -> { final Statistics stats = scope.getSessionFactory().getStatistics(); stats.clear(); - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); assertEquals( 0, stats.getPrepareStatementCount() ); @@ -232,7 +232,7 @@ public class SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTe } ); scope.inTransaction( s -> { - Child loadedChild = s.load( Child.class, lastChildID ); + Child loadedChild = s.getReference( Child.class, lastChildID ); assertThat( loadedChild.getRelatives().size(), is( 2 ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java index 9e14703d5c..de7eb1c95c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/EntityWithMutableAttributesTest.java @@ -100,7 +100,7 @@ public class EntityWithMutableAttributesTest { public void testLoad(SessionFactoryScope scope) { scope.inTransaction( session -> { - User user = session.load( User.class, 1 ); + User user = session.getReference( User.class, 1 ); assertThat( user, instanceOf( PersistentAttributeInterceptable.class ) ); @@ -117,7 +117,7 @@ public class EntityWithMutableAttributesTest { public void testMutableAttributeIsUpdated(SessionFactoryScope scope) { scope.inTransaction( session -> { - User user = session.load( User.class, 1 ); + User user = session.getReference( User.class, 1 ); user.getDate().setTime( 0 ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java index 8cd0e73f45..b16aafec7f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadTest.java @@ -83,7 +83,7 @@ public class OnDemandLoadTest { scope.inTransaction( s -> { // first load the store, making sure it is not initialized - store[0] = s.load( Store.class, 1L ); + store[0] = s.getReference( Store.class, 1L ); assertNotNull( store[0] ); assertFalse( isPropertyInitialized( store[0], "inventories" ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadWithCollectionInDefaultFetchGroupFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadWithCollectionInDefaultFetchGroupFalseTest.java index 6a5f0ada9f..0f8c04159a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadWithCollectionInDefaultFetchGroupFalseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/ondemandload/OnDemandLoadWithCollectionInDefaultFetchGroupFalseTest.java @@ -93,7 +93,7 @@ public class OnDemandLoadWithCollectionInDefaultFetchGroupFalseTest { scope.inTransaction( s -> { // first load the store, making sure it is not initialized - store[0] = s.load( Store.class, 1L ); + store[0] = s.getReference( Store.class, 1L ); assertNotNull( store[0] ); assertFalse( isPropertyInitialized( store[0], "inventories" ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java index 704f58af90..62b89061ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ByteCodeEnhancedImmutableReferenceCacheTest.java @@ -72,7 +72,7 @@ public class ByteCodeEnhancedImmutableReferenceCacheTest extends BaseCoreFunctio s = openSession(); s.beginTransaction(); // MyEnhancedReferenceData loaded = (MyEnhancedReferenceData) s.get( MyEnhancedReferenceData.class, 1 ); - MyEnhancedReferenceData loaded = (MyEnhancedReferenceData) s.load( MyEnhancedReferenceData.class, 1 ); + MyEnhancedReferenceData loaded = s.getReference( MyEnhancedReferenceData.class, 1 ); s.getTransaction().commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java index fbde65f0b4..97b096f319 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheAnnotationTests.java @@ -67,7 +67,7 @@ public class CacheAnnotationTests extends BaseCoreFunctionalTestCase { } ); doInHibernate( this::sessionFactory, session -> { - NoCacheConcurrencyStrategyEntity entity = session.load( NoCacheConcurrencyStrategyEntity.class, this.entityId ); + NoCacheConcurrencyStrategyEntity entity = session.getReference( NoCacheConcurrencyStrategyEntity.class, this.entityId ); assertEquals( "name", entity.getName() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java index bae4bfb702..7c06794fb3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ReferenceCacheTest.java @@ -60,7 +60,7 @@ public class ReferenceCacheTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); // MyReferenceData loaded = (MyReferenceData) s.get( MyReferenceData.class, 1 ); - MyReferenceData loaded = (MyReferenceData) s.load( MyReferenceData.class, 1 ); + MyReferenceData loaded = (MyReferenceData) s.getReference( MyReferenceData.class, 1 ); s.getTransaction().commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java index 1604cbe728..ffbfe21c49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java @@ -81,7 +81,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> { - A aLoaded = session.load( A.class, new Long( a.getId() ) ); + A aLoaded = session.getReference( A.class, new Long( a.getId() ) ); assertTrue( aLoaded instanceof HibernateProxy ); assertSame( aLoaded, session.merge( a ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java index 91ccc5bdd9..a21649f32a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/discriminatedcollections/TempTest.java @@ -52,7 +52,7 @@ public class TempTest { @AfterEach public void dropTestData(SessionFactoryScope scope) { scope.inTransaction( (session) -> { - session.remove( session.load( Client.class, 1 ) ); + session.remove( session.getReference( Client.class, 1 ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java index bfae73a148..8ab23a56ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedCompositeIdTest.java @@ -113,8 +113,8 @@ public class EmbeddedCompositeIdTest { session -> { Course ucid = new Course( "mat2000", "Monash", null ); Course cid = new Course( "eng5000", "BHS", null ); - Course luc = session.load( Course.class, ucid ); - Course lc = session.load( Course.class, cid ); + Course luc = session.getReference( Course.class, ucid ); + Course lc = session.getReference( Course.class, cid ); assertFalse( Hibernate.isInitialized( luc ) ); assertFalse( Hibernate.isInitialized( lc ) ); assertEquals( UniversityCourse.class, Hibernate.getClass( luc ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java index 01bbd59932..7544a4631c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/MappedByEmbeddableTest.java @@ -51,8 +51,8 @@ public class MappedByEmbeddableTest extends BaseCoreFunctionalTestCase { } ); inTransaction( session -> { - Containing containing1 = session.load( Containing.class, 1 ); - Containing containing2 = session.load( Containing.class, 2 ); + Containing containing1 = session.getReference( Containing.class, 1 ); + Containing containing2 = session.getReference( Containing.class, 2 ); Embed embed1 = containing1.getEmbed(); Embed embed2 = containing2.getEmbed(); @@ -117,7 +117,7 @@ public class MappedByEmbeddableTest extends BaseCoreFunctionalTestCase { } private void loadContaining(Session session, Integer containingId, Integer containedId) { - Contained contained = session.load( Contained.class, containedId ); + Contained contained = session.getReference( Contained.class, containedId ); Containing containing = contained.getContaining(); assertThat( containing.getId() ).isEqualTo( containingId ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java index 6a946696c0..16dacf1f9b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java @@ -114,7 +114,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { CollectionCacheEntry cachedData = fromSession( session -> { // Force a collection into the second level cache, with its non-filtered elements - Salesperson sp = session.load( Salesperson.class, testData.steveId ); + Salesperson sp = session.getReference( Salesperson.class, testData.steveId ); Hibernate.initialize( sp.getOrders() ); assertTrue( "No cache for collection", persister.hasCache() ); Object cacheKey = cache.generateCacheKey( @@ -156,7 +156,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { inSession( session -> { session.enableFilter( "fulfilledOrders" ).setParameter( "asOfDate", testData.lastMonth.getTime() ); - Salesperson sp = session.load( Salesperson.class, testData.steveId ); + Salesperson sp = session.getReference( Salesperson.class, testData.steveId ); assertEquals( "Filtered-collection not bypassing 2L-cache", 1, sp.getOrders().size() ); } ); @@ -164,7 +164,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { // Finally, make sure that the original cached version did not get over-written inSession( session -> { - Salesperson sp = session.load( Salesperson.class, testData.steveId ); + Salesperson sp = session.getReference( Salesperson.class, testData.steveId ); assertEquals( "Actual cached version got over-written", 2, sp.getOrders().size() ); } ); @@ -767,7 +767,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { .setParameter( "asOfDate", testData.lastMonth.getTime() ); log.info( "Performing load of Department..." ); - Department department = session.load( Department.class, testData.deptId ); + Department department = session.getReference( Department.class, testData.deptId ); Set salespersons = department.getSalespersons(); assertEquals( "Incorrect salesperson count", 1, salespersons.size() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java index 5e772d9676..7008892701 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestClearBatchFetchQueueAfterFlush.java @@ -58,9 +58,9 @@ public class TestClearBatchFetchQueueAfterFlush extends BaseCoreFunctionalTestCa s.getTransaction().commit(); s.clear(); - bookStore1 = s.load( BookStore.class, bookStore1.getId() ); - bookStore2 = s.load( BookStore.class, bookStore2.getId() ); - bookStore3 = s.load( BookStore.class, bookStore3.getId() ); + bookStore1 = s.getReference( BookStore.class, bookStore1.getId() ); + bookStore2 = s.getReference( BookStore.class, bookStore2.getId() ); + bookStore3 = s.getReference( BookStore.class, bookStore3.getId() ); s.beginTransaction(); s.remove( bookStore2 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java index 9d3a956310..c03b26fc68 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ASTParserLoadingTest.java @@ -1656,7 +1656,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s.createQuery( "from PropertySet p join p.generalProperties gp where gp.id is not null" ).list(); - s.remove( s.load( PropertySet.class, id ) ); + s.remove( s.getReference( PropertySet.class, id ) ); s.getTransaction().commit(); s.close(); @@ -2127,7 +2127,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s.persist( plat ); s.flush(); s.clear(); - plat = (Mammal) s.load(Mammal.class, plat.getId() ); + plat = (Mammal) s.getReference(Mammal.class, plat.getId() ); assertFalse( Hibernate.isInitialized(plat) ); Object plat2 = s.createQuery("from Animal a").uniqueResult(); assertSame( plat, plat2 ); @@ -2941,7 +2941,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Transaction txn = session.beginTransaction(); for ( Long createdAnimalId : createdAnimalIds ) { - Animal animal = session.load( Animal.class, createdAnimalId ); + Animal animal = session.getReference( Animal.class, createdAnimalId ); session.remove( animal ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java index 6575e99adc..3bd31fa9ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java @@ -859,7 +859,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { t.commit(); t = s.beginTransaction(); - entity = (IntegerVersioned) s.load( IntegerVersioned.class, entity.getId() ); + entity = (IntegerVersioned) s.getReference( IntegerVersioned.class, entity.getId() ); assertEquals( "version not incremented", initialVersion + 1, entity.getVersion() ); s.remove( entity ); @@ -894,7 +894,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { t.commit(); t = s.beginTransaction(); - entity = (TimestampVersioned) s.load( TimestampVersioned.class, entity.getId() ); + entity = (TimestampVersioned) s.getReference( TimestampVersioned.class, entity.getId() ); assertTrue( "version not incremented", entity.getVersion().after( initialVersion ) ); s.remove( entity ); @@ -1035,7 +1035,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { .executeUpdate(); assertEquals( "Incorrect entity-updated count", 1, count ); - Animal tadpole = (Animal) s.load( Animal.class, data.polliwog.getId() ); + Animal tadpole = (Animal) s.getReference( Animal.class, data.polliwog.getId() ); assertEquals( "Update did not take effect", "Tadpole", tadpole.getDescription() ); count = s.createQuery( "update Animal set bodyWeight = bodyWeight + :w1 + :w2" ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java index 823dd0277a..3b4dfc4143 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/WithClauseTest.java @@ -115,7 +115,7 @@ public class WithClauseTest { scope.inTransaction( (session) -> { List list = session.createQuery( "from Human h inner join h.offspring o with o.mother.father = :cousin" ) - .setParameter( "cousin", session.load( Human.class, Long.valueOf( "123" ) ) ) + .setParameter( "cousin", session.getReference( Human.class, Long.valueOf( "123" ) ) ) .list(); assertTrue( list.isEmpty(), "ad-hoc did take effect" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java index 69c9fe7881..87cc28e57e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idbag/IdBagTest.java @@ -56,16 +56,16 @@ public class IdBagTest { criteria.from( User.class ); User gavin = s.createQuery( criteria ).uniqueResult(); // User gavin = (User) s.createCriteria( User.class ).uniqueResult(); - Group admins = s.load( Group.class, "admins" ); - Group plebs = s.load( Group.class, "plebs" ); - Group banned = s.load( Group.class, "banned" ); + Group admins = s.getReference( Group.class, "admins" ); + Group plebs = s.getReference( Group.class, "plebs" ); + Group banned = s.getReference( Group.class, "banned" ); gavin.getGroups().add( admins ); gavin.getGroups().remove( plebs ); //gavin.getGroups().add(banned); s.remove( plebs ); s.remove( banned ); - s.remove( s.load( Group.class, "moderators" ) ); + s.remove( s.getReference( Group.class, "moderators" ) ); s.remove( admins ); s.remove( gavin ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java index d9c9a44166..500972cd96 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/ImmutableTest.java @@ -99,7 +99,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { s -> { s.beginTransaction(); try { - Contract c = s.load( Contract.class, contract.getId() ); + Contract c = s.getReference( Contract.class, contract.getId() ); // Contract c = (Contract) s.createCriteria(Contract.class).uniqueResult(); assertTrue( s.isReadOnly( c ) ); assertEquals( "gavin", c.getCustomerName() ); @@ -161,7 +161,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { inSession( s -> { - Contract c = s.load( Contract.class, contract.getId() ); + Contract c = s.getReference( Contract.class, contract.getId() ); assertTrue( s.isReadOnly( c ) ); assertEquals( "gavin", c.getCustomerName() ); assertEquals( 2, c.getVariations().size() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java index cfaae5975e..a0d034ec27 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithCascadeOnPersist.java @@ -63,7 +63,7 @@ public class InsertOrderingWithCascadeOnPersist { // This block resulted in a Foreign Key ConstraintViolation because the inserts were ordered incorrectly. scope.inTransaction( session -> { // Add marketResult to existing Bid - final MarketBid bid = session.load( MarketBid.class, bidId ); + final MarketBid bid = session.getReference( MarketBid.class, bidId ); final MarketResult result = new MarketResult(); result.setMarketBid( bid ); session.persist( result ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java index 17295f86e1..951279e663 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java @@ -279,7 +279,7 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase { merged.setInjectedString( null ); - User loaded = s.load( User.class, merged.getName() ); + User loaded = s.getReference( User.class, merged.getName() ); // the session-bound instance was not instantiated by the interceptor, load simply returns it assertSame( merged, loaded ); assertNull( merged.getInjectedString() ); @@ -288,7 +288,7 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase { s.flush(); s.evict( merged ); - User reloaded = s.load( User.class, merged.getName() ); + User reloaded = s.getReference( User.class, merged.getName() ); // Interceptor IS called for instantiating the persistent instance associated to the session when using load assertEquals( injectedString, reloaded.getInjectedString() ); assertEquals( u.getName(), reloaded.getName() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/InterfaceProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/InterfaceProxyTest.java index eb82731ada..bd8ecf8513 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/InterfaceProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/InterfaceProxyTest.java @@ -69,24 +69,24 @@ public class InterfaceProxyTest { try (Session session = openSession( scope )) { session.beginTransaction(); try { - Document d = (Document) session.load( ItemImpl.class, did ); + Document d = (Document) session.getReference( ItemImpl.class, did ); assertEquals( did, d.getId() ); assertEquals( "Hibernate in Action", d.getName() ); assertNotNull( d.getContent() ); - SecureDocument d2 = (SecureDocument) session.load( ItemImpl.class, d2id ); + SecureDocument d2 = (SecureDocument) session.getReference( ItemImpl.class, d2id ); assertEquals( d2id, d2.getId() ); assertEquals( "Secret", d2.getName() ); assertNotNull( d2.getContent() ); session.clear(); - d = session.load( DocumentImpl.class, did ); + d = session.getReference( DocumentImpl.class, did ); assertEquals( did, d.getId() ); assertEquals( "Hibernate in Action", d.getName() ); assertNotNull( d.getContent() ); - d2 = session.load( SecureDocumentImpl.class, d2id ); + d2 = session.getReference( SecureDocumentImpl.class, d2id ); assertEquals( d2id, d2.getId() ); assertEquals( "Secret", d2.getName() ); assertNotNull( d2.getContent() ); @@ -94,7 +94,7 @@ public class InterfaceProxyTest { //s.clear(); - d2 = session.load( SecureDocumentImpl.class, did ); + d2 = session.getReference( SecureDocumentImpl.class, did ); assertEquals( did, d2.getId() ); assertEquals( "Hibernate in Action", d2.getName() ); assertNotNull( d2.getContent() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java index 984b81feb8..84a2bed30d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceTest.java @@ -50,7 +50,7 @@ public class GetLoadJpaComplianceTest { assertNull( s.get( Workload.class, 999 ) ); - Workload proxy = s.load( Workload.class, 999 ); + Workload proxy = s.getReference( Workload.class, 999 ); assertFalse( Hibernate.isInitialized( proxy ) ); proxy.getId(); @@ -103,7 +103,7 @@ public class GetLoadJpaComplianceTest { assertNull( s.get( Employee.class, 999 ) ); - Employee proxy = s.load( Employee.class, 999 ); + Employee proxy = s.getReference( Employee.class, 999 ); assertFalse( Hibernate.isInitialized( proxy ) ); proxy.getId(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java index 85c1bb06c1..f14685c4cf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java @@ -126,10 +126,10 @@ public class GetLoadTest { scope.inTransaction( entityManager -> { Session s = ( Session ) entityManager.getDelegate(); - Employer emp = s.load( Employer.class, empId ); + Employer emp = s.getReference( Employer.class, empId ); emp.getId(); assertFalse( Hibernate.isInitialized( emp ) ); - Node node = s.load( Node.class, nodeName ); + Node node = s.getReference( Node.class, nodeName ); assertEquals( node.getName(), nodeName ); assertFalse( Hibernate.isInitialized( node ) ); } @@ -138,10 +138,10 @@ public class GetLoadTest { scope.inTransaction( entityManager -> { Session s = ( Session ) entityManager.getDelegate(); - Employer emp = ( Employer ) s.load( Employer.class.getName(), empId ); + Employer emp = ( Employer ) s.getReference( Employer.class.getName(), empId ); emp.getId(); assertFalse( Hibernate.isInitialized( emp ) ); - Node node = ( Node ) s.load( Node.class.getName(), nodeName ); + Node node = ( Node ) s.getReference( Node.class.getName(), nodeName ); assertEquals( node.getName(), nodeName ); assertFalse( Hibernate.isInitialized( node ) ); } @@ -195,7 +195,7 @@ public class GetLoadTest { entityManager -> { Session s = ( Session ) entityManager.getDelegate(); - Workload proxy = s.load(Workload.class, workload.id); + Workload proxy = s.getReference(Workload.class, workload.id); proxy.getId(); assertFalse( Hibernate.isInitialized( proxy ) ); @@ -218,7 +218,7 @@ public class GetLoadTest { assertNull( s.get( Workload.class, 999 ) ); - Workload proxy = s.load( Workload.class, 999 ); + Workload proxy = s.getReference( Workload.class, 999 ); assertFalse( Hibernate.isInitialized( proxy ) ); proxy.getId(); @@ -263,7 +263,7 @@ public class GetLoadTest { assertNull( s.get( Employee.class, 999 ) ); - Employee proxy = s.load( Employee.class, 999 ); + Employee proxy = s.getReference( Employee.class, 999 ); assertFalse( Hibernate.isInitialized( proxy ) ); proxy.getId(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/proxy/JPAProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/proxy/JPAProxyTest.java index 0cc5f16fb9..b55f1cef71 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/proxy/JPAProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/proxy/JPAProxyTest.java @@ -32,7 +32,7 @@ public class JPAProxyTest extends AbstractJPATest { public void testEjb3ProxyUsage() { inTransaction( s -> { - Item item = s.load( Item.class, new Long( -1 ) ); + Item item = s.getReference( Item.class, new Long( -1 ) ); assertFalse( Hibernate.isInitialized( item ) ); try { Hibernate.initialize( item ); @@ -47,7 +47,7 @@ public class JPAProxyTest extends AbstractJPATest { s.clear(); - Item item2 = s.load( Item.class, new Long( -1 ) ); + Item item2 = s.getReference( Item.class, new Long( -1 ) ); assertFalse( Hibernate.isInitialized( item2 ) ); assertFalse( item == item2 ); try { @@ -80,7 +80,7 @@ public class JPAProxyTest extends AbstractJPATest { inTransaction( s -> { // first load() it to generate a proxy... - Item item = s.load( Item.class, nonExistentId ); + Item item = s.getReference( Item.class, nonExistentId ); assertFalse( Hibernate.isInitialized( item ) ); // then try to get() it to make sure we get an exception try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java index 7bc63d140e..f829133f61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/version/JpaSpecVersionValueUpdatingTest.java @@ -66,7 +66,7 @@ public class JpaSpecVersionValueUpdatingTest extends BaseCoreFunctionalTestCase session = openSession(); session.beginTransaction(); - customer = session.load( Customer.class, 1L ); + customer = session.getReference( Customer.class, 1L ); assertEquals( initial, customer.version ); session.remove( customer ); session.getTransaction().commit(); @@ -113,7 +113,7 @@ public class JpaSpecVersionValueUpdatingTest extends BaseCoreFunctionalTestCase session = openSession(); session.beginTransaction(); - customer = session.load( Customer.class, 1L ); + customer = session.getReference( Customer.class, 1L ); assertEquals( initial, customer.version ); session.remove( customer ); session.getTransaction().commit(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java index 43b30c1e1a..f83f53adf9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazydetachedpersist/LazyPersistWithDetachedAssociationTest.java @@ -65,7 +65,7 @@ public class LazyPersistWithDetachedAssociationTest { Address loadedAddress = scope.fromTransaction( session -> { // first load the address - Address _loadedAddress = session.load( + Address _loadedAddress = session.getReference( Address.class, 1L ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java index f9616548f0..18fc5f6981 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/AtomikosJtaLazyLoadingTest.java @@ -79,7 +79,7 @@ public class AtomikosJtaLazyLoadingTest { public void testLazyCollectionLoadingAfterEndTransaction(SessionFactoryScope scope) { Parent loadedParent = scope.fromTransaction( session -> - session.load( Parent.class, parentID ) + session.getReference( Parent.class, parentID ) ); assertFalse( Hibernate.isInitialized( loadedParent.getChildren() ) ); @@ -94,7 +94,7 @@ public class AtomikosJtaLazyLoadingTest { Child loadedChild = scope.fromTransaction( session -> - session.load( Child.class, lastChildID ) + session.getReference( Child.class, lastChildID ) ); Parent p = loadedChild.getParent(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java index 57e2e527d5..61ba1e5f77 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/JtaLazyLoadingTest.java @@ -79,7 +79,7 @@ public class JtaLazyLoadingTest { public void testLazyCollectionLoadingAfterEndTransaction(SessionFactoryScope scope) { Parent loadedParent = scope.fromTransaction( session -> - session.load( Parent.class, parentID ) + session.getReference( Parent.class, parentID ) ); @@ -95,7 +95,7 @@ public class JtaLazyLoadingTest { Child loadedChild = scope.fromTransaction( session -> - session.load( Child.class, lastChildID ) + session.getReference( Child.class, lastChildID ) ); Parent p = loadedChild.getParent(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java index 8f918a2074..45a794853e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingLoggingTest.java @@ -71,7 +71,7 @@ public class LazyLoadingLoggingTest { public void testNoSession(SessionFactoryScope scope) { Address address = scope.fromTransaction( session -> - session.load( Address.class, 1L ) + session.getReference( Address.class, 1L ) ); try { @@ -93,7 +93,7 @@ public class LazyLoadingLoggingTest { public void testDisconnect(SessionFactoryScope scope) { scope.inTransaction( session -> { - Address address = session.load( Address.class, 1L ); + Address address = session.getReference( Address.class, 1L ); AbstractSharedSessionContract sessionContract = (AbstractSharedSessionContract) session; sessionContract.getJdbcCoordinator().close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java index 3ea0dd8ad4..54b37324a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingNotFoundTest.java @@ -38,7 +38,7 @@ public class LazyLoadingNotFoundTest { @TestForIssue(jiraKey = "HHH-11179") public void testNonExistentLazyInitOutsideTransaction(SessionFactoryScope scope) { Child loadedChild = scope.fromTransaction( - session -> session.load( Child.class, -1L ) + session -> session.getReference( Child.class, -1L ) ); try { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java index 3831d9095d..4589307a8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyload/LazyLoadingTest.java @@ -84,7 +84,7 @@ public class LazyLoadingTest { public void testLazyCollectionLoadingAfterEndTransaction(SessionFactoryScope scope) { Parent loadedParent = scope.fromTransaction( session -> - session.load( Parent.class, parentID ) + session.getReference( Parent.class, parentID ) ); assertFalse( Hibernate.isInitialized( loadedParent.getChildren() ) ); @@ -99,7 +99,7 @@ public class LazyLoadingTest { Child loadedChild = scope.fromTransaction( sesison -> - sesison.load( Child.class, lastChildID ) + sesison.getReference( Child.class, lastChildID ) ); Parent p = loadedChild.getParent(); @@ -167,7 +167,7 @@ public class LazyLoadingTest { scope.inTransaction( session -> { - Account account = session.load( Account.class, accountId ); + Account account = session.getReference( Account.class, accountId ); Client client = account.getClient(); client.getId(); assertThat( Hibernate.isInitialized( client ), is( false ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java index c36789eca5..3f56b8cc67 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/ABCTest.java @@ -140,7 +140,7 @@ public class ABCTest { scope.inTransaction( session -> { - C1 c1 = session.load( C1.class, c.getId() ); + C1 c1 = session.getReference( C1.class, c.getId() ); assertTrue( c1.getAddress().equals( "foo bar" ) && ( c1.getCount() == 23432 ) && diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.java index 5f4c2e62e7..b3fbc40841 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Qux.java @@ -145,7 +145,7 @@ public class Qux implements Lifecycle { public Qux getChild() throws HibernateException, SQLException { store =true; this.childKey = child==null ? null : child.getKey(); - if (childKey!=null && child==null) child = (Qux) session.load(Qux.class, childKey); + if (childKey!=null && child==null) child = (Qux) session.getReference(Qux.class, childKey); return child; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadContainedInDoubleContainingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadContainedInDoubleContainingTest.java index 7c9af56d21..327d97bb83 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadContainedInDoubleContainingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadContainedInDoubleContainingTest.java @@ -43,7 +43,7 @@ public class LoadContainedInDoubleContainingTest { @Test public void test(SessionFactoryScope scope) { scope.inTransaction( session -> { - OtherContained otherContained = session.load( OtherContained.class, 2 ); + OtherContained otherContained = session.getReference( OtherContained.class, 2 ); String text = otherContained.getText(); assertThat( text ).isEqualTo( "initial" ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadParentChildEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadParentChildEntityTest.java index 9ae0cc28d8..50cc1d81d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadParentChildEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/LoadParentChildEntityTest.java @@ -42,7 +42,7 @@ public class LoadParentChildEntityTest { scope.inTransaction( session -> { - ContainingEntity load = session.load( ContainingEntity.class, 1 ); + ContainingEntity load = session.getReference( ContainingEntity.class, 1 ); assertThat( load.getChild() ).isNotNull(); assertThat( load.getParent() ).isNull(); } @@ -50,7 +50,7 @@ public class LoadParentChildEntityTest { scope.inTransaction( session -> { - ContainingEntity load = session.load( ContainingEntity.class, 2 ); + ContainingEntity load = session.getReference( ContainingEntity.class, 2 ); assertThat( load.getParent() ).isNotNull(); assertThat( load.getChild() ).isNull(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java index e0826fa884..6688888fe4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadTest.java @@ -121,13 +121,13 @@ public class MultiLoadTest { scope.inTransaction( session -> { // delete one of them (but do not flush)... - SimpleEntity s4 = session.load(SimpleEntity.class, 5); + SimpleEntity s4 = session.getReference(SimpleEntity.class, 5); session.remove( s4 ); assertFalse( Hibernate.isInitialized( s4 ) ); // as a baseline, assert based on how load() handles it - SimpleEntity s5 = session.load( SimpleEntity.class, 5 ); + SimpleEntity s5 = session.getReference( SimpleEntity.class, 5 ); assertNotNull( s5 ); assertFalse( Hibernate.isInitialized( s5 ) ); } @@ -140,12 +140,12 @@ public class MultiLoadTest { scope.inTransaction( session -> { // delete one of them (but do not flush)... - SimpleEntity s4 = session.load( SimpleEntity.class, 5 ); + SimpleEntity s4 = session.getReference( SimpleEntity.class, 5 ); Hibernate.initialize( s4 ); session.remove( s4 ); // as a baseline, assert based on how load() handles it - SimpleEntity s5 = session.load( SimpleEntity.class, 5 ); + SimpleEntity s5 = session.getReference( SimpleEntity.class, 5 ); assertNotNull( s5 ); } ); @@ -157,7 +157,7 @@ public class MultiLoadTest { scope.inTransaction( session -> { // delete one of them (but do not flush)... - SimpleEntity s4 = session.load( SimpleEntity.class, 5 ); + SimpleEntity s4 = session.getReference( SimpleEntity.class, 5 ); Hibernate.initialize( s4 ); session.remove( s4 ); @@ -174,7 +174,7 @@ public class MultiLoadTest { scope.inTransaction( session -> { // delete one of them (but do not flush)... - SimpleEntity s4 = session.load( SimpleEntity.class, 5 ); + SimpleEntity s4 = session.getReference( SimpleEntity.class, 5 ); Hibernate.initialize( s4 ); session.remove( s4 ); @@ -191,7 +191,7 @@ public class MultiLoadTest { scope.inTransaction( session -> { // delete one of them (but do not flush)... - session.remove( session.load( SimpleEntity.class, 5 ) ); + session.remove( session.getReference( SimpleEntity.class, 5 ) ); // and then, assert how get() handles it SimpleEntity s5 = session.get( SimpleEntity.class, 5 ); @@ -249,7 +249,7 @@ public class MultiLoadTest { public void testBasicMultiLoadWithManagedAndNoChecking(SessionFactoryScope scope) { scope.inTransaction( session -> { - SimpleEntity first = session.byId( SimpleEntity.class ).load( 1 ); + SimpleEntity first = session.byId( SimpleEntity.class ).getReference( 1 ); List list = session.byMultipleIds( SimpleEntity.class ).multiLoad( ids( 56 ) ); assertEquals( 56, list.size() ); // this check is HIGHLY specific to implementation in the batch loader @@ -263,7 +263,7 @@ public class MultiLoadTest { public void testBasicMultiLoadWithManagedAndChecking(SessionFactoryScope scope) { scope.inTransaction( session -> { - SimpleEntity first = session.byId( SimpleEntity.class ).load( 1 ); + SimpleEntity first = session.byId( SimpleEntity.class ).getReference( 1 ); List list = session.byMultipleIds( SimpleEntity.class ) .enableSessionCheck( true ) .multiLoad( ids( 56 ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapOperationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapOperationTests.java index 328a84295a..96782d9d6b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapOperationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/MapOperationTests.java @@ -75,7 +75,7 @@ public class MapOperationTests { scope.inTransaction( session -> { - final EntityOfMaps entity = session.load( EntityOfMaps.class, 1 ); + final EntityOfMaps entity = session.getReference( EntityOfMaps.class, 1 ); session.remove( entity ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SetOperationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SetOperationTests.java index f75441a6a5..bd86c4f8e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SetOperationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/SetOperationTests.java @@ -88,7 +88,7 @@ public class SetOperationTests { public void testLoad(SessionFactoryScope scope) { scope.inTransaction( session -> { - final EntityOfSets entity = session.load( EntityOfSets.class, 1 ); + final EntityOfSets entity = session.getReference( EntityOfSets.class, 1 ); assertThat( entity, notNullValue() ); assertThat( entity, isNotInitialized() ); } @@ -140,7 +140,7 @@ public class SetOperationTests { public void testDeleteWithElementCollectionData(SessionFactoryScope scope) { scope.inTransaction( session -> { - final EntityOfSets entity = session.load( EntityOfSets.class, 1 ); + final EntityOfSets entity = session.getReference( EntityOfSets.class, 1 ); session.remove( entity ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java index 150d25c401..30893430f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java @@ -489,7 +489,7 @@ public class AttributeConverterTest extends BaseUnitTestCase { s = sf.openSession(); s.beginTransaction(); - entity = s.load( EntityWithConvertibleField.class, entityID ); + entity = s.getReference( EntityWithConvertibleField.class, entityID ); assertEquals( ConvertibleEnum.VALUE, entity.getConvertibleEnum() ); s.getTransaction().commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java index 53dcca657e..c9edd7bf0c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/elementCollection/ElementCollectionTests.java @@ -85,7 +85,7 @@ public class ElementCollectionTests { sfScope.inTransaction( (session) -> { - TheEntity retrieved = (TheEntity) session.load( TheEntity.class, 1 ); + TheEntity retrieved = (TheEntity) session.getReference( TheEntity.class, 1 ); assertEquals( 1, retrieved.getSet().size() ); assertEquals( new ValueType( "set_value" ), retrieved.getSet().iterator().next() ); assertEquals( 1, retrieved.getMap().size() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java index f6be7916a7..02b5857c27 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchBaselineTests.java @@ -48,8 +48,8 @@ public class SimpleBatchFetchBaselineTests { statementInspector.clear(); scope.inTransaction( (session) -> { - final EmployeeGroup group1 = session.load( EmployeeGroup.class, 1 ); - final EmployeeGroup group2 = session.load( EmployeeGroup.class, 2 ); + final EmployeeGroup group1 = session.getReference( EmployeeGroup.class, 1 ); + final EmployeeGroup group2 = session.getReference( EmployeeGroup.class, 2 ); assertThat( Hibernate.isInitialized( group1 ) ).isFalse(); assertThat( Hibernate.isInitialized( group2 ) ).isFalse(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java index 83feb4cc0c..e8de9c688d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/batch/SimpleBatchFetchTests.java @@ -48,8 +48,8 @@ public class SimpleBatchFetchTests { statementInspector.clear(); scope.inTransaction( (session) -> { - final EmployeeGroup group1 = session.load( EmployeeGroup.class, 1 ); - final EmployeeGroup group2 = session.load( EmployeeGroup.class, 2 ); + final EmployeeGroup group1 = session.getReference( EmployeeGroup.class, 1 ); + final EmployeeGroup group2 = session.getReference( EmployeeGroup.class, 2 ); assertThat( Hibernate.isInitialized( group1 ) ).isFalse(); assertThat( Hibernate.isInitialized( group2 ) ).isFalse(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleNestedSubSelectFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleNestedSubSelectFetchTests.java index 64a07bf284..2cc2f108a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleNestedSubSelectFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SimpleNestedSubSelectFetchTests.java @@ -154,9 +154,9 @@ public class SimpleNestedSubSelectFetchTests { @AfterEach public void dropTestData(SessionFactoryScope scope) { scope.inTransaction( (session) -> { - session.remove( session.load( Customer.class, 1 ) ); - session.remove( session.load( Customer.class, 2 ) ); - session.remove( session.load( Customer.class, 3 ) ); + session.remove( session.getReference( Customer.class, 1 ) ); + session.remove( session.getReference( Customer.class, 2 ) ); + session.remove( session.getReference( Customer.class, 3 ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java index e29c2a7f0b..b7c52037bb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java @@ -99,8 +99,8 @@ public class SubselectFetchCollectionFromBatchTest { scope.inTransaction( (s) -> { EmployeeGroup[] loadedGroups = new EmployeeGroup[] { - s.load(EmployeeGroup.class, createdGroups[0].getId()), - s.load(EmployeeGroup.class, createdGroups[1].getId()) + s.getReference(EmployeeGroup.class, createdGroups[0].getId()), + s.getReference(EmployeeGroup.class, createdGroups[1].getId()) }; // there should have been no SQL queries performed and loadedGroups should only contain proxies @@ -226,8 +226,8 @@ public class SubselectFetchCollectionFromBatchTest { scope.inTransaction( (s) -> { EmployeeGroup[] loadedGroups = new EmployeeGroup[] { - s.load(EmployeeGroup.class, createdIds[0]), - s.load(EmployeeGroup.class, createdIds[1]) + s.getReference(EmployeeGroup.class, createdIds[0]), + s.getReference(EmployeeGroup.class, createdIds[1]) }; // loadedGroups should only contain proxies diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchTest.java index c5b4d81ca2..8a46684f2d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchTest.java @@ -66,8 +66,8 @@ public class SubselectFetchTest { @AfterEach public void dropTestData(SessionFactoryScope scope) { scope.inTransaction( (session) -> { - session.remove( session.load( Parent.class, "foo" ) ); - session.remove( session.load( Parent.class, "bar" ) ); + session.remove( session.getReference( Parent.class, "foo" ) ); + session.remove( session.getReference( Parent.class, "bar" ) ); } ); } @@ -277,7 +277,7 @@ public class SubselectFetchTest { } finally { scope.inTransaction( (session) -> { - session.remove( session.load( Parent.class, "aaa" ) ); + session.remove( session.getReference( Parent.class, "aaa" ) ); } ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/BaseIdEntityByteCodeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/BaseIdEntityByteCodeTest.java index 406df35301..2b4846e3c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/BaseIdEntityByteCodeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/BaseIdEntityByteCodeTest.java @@ -48,7 +48,7 @@ public class BaseIdEntityByteCodeTest { } ); scope.inTransaction( session -> { - ContainingEntity entity = session.load( ContainingEntity.class, 1 ); + ContainingEntity entity = session.getReference( ContainingEntity.class, 1 ); ContainedEmbeddable containedEmbeddable = entity.getContainedEmbeddable(); assertThat( containedEmbeddable.getText() ).isEqualTo( "initialValue" ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java index 2211b147f6..6fac216591 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java @@ -214,7 +214,7 @@ public class DiscriminatorTest { scope.inTransaction( s -> { // load the superclass proxy. - Person pLoad = s.load( Person.class, e.getId() ); + Person pLoad = s.getReference( Person.class, e.getId() ); assertTrue( pLoad instanceof HibernateProxy ); Person pGet = s.get( Person.class, e.getId() ); Person pQuery = (Person) s.createQuery( "from Person where id = :id" ) @@ -241,7 +241,7 @@ public class DiscriminatorTest { scope.inTransaction( s -> { // load the superclass proxy. - Person pLoad = s.load( Person.class, e.getId() ); + Person pLoad = s.getReference( Person.class, e.getId() ); assertTrue( pLoad instanceof HibernateProxy ); Person pGet = s.get( Person.class, e.getId() ); Person pQuery = (Person) s.createQuery( "from Person where id = :id" ) @@ -285,7 +285,7 @@ public class DiscriminatorTest { scope.inTransaction( s -> { // load the superclass proxy. - Person pLoad = s.load( Person.class, e.getId() ); + Person pLoad = s.getReference( Person.class, e.getId() ); assertTrue( pLoad instanceof HibernateProxy ); // evict the proxy s.evict( pLoad ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java index 81591ab708..c9054f99b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java @@ -220,7 +220,7 @@ public class SimpleInheritanceTest { scope.inTransaction( s -> { // load the superclass proxy. - Person pLoad = s.load( Person.class, employee.getId() ); + Person pLoad = s.getReference( Person.class, employee.getId() ); assertTrue( pLoad instanceof HibernateProxy ); Person pGet = s.get( Person.class, employee.getId() ); Person pQuery = (Person) s.createQuery( @@ -269,7 +269,7 @@ public class SimpleInheritanceTest { scope.inTransaction( s -> { // load the superclass proxy. - Person pLoad = s.load( Person.class, employee.getId() ); + Person pLoad = s.getReference( Person.class, employee.getId() ); assertTrue( pLoad instanceof HibernateProxy ); // evict the proxy s.evict( pLoad ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/MixedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/MixedTest.java index 896c455443..2b2efaf24c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/MixedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mixed/MixedTest.java @@ -77,26 +77,26 @@ public class MixedTest { .openSession()) { session.beginTransaction(); try { - Item id = session.load( Item.class, did ); + Item id = session.getReference( Item.class, did ); assertEquals( did, id.getId() ); assertEquals( "Hibernate in Action", id.getName() ); assertEquals( "/", id.getParent().getName() ); - Item id2 = session.load( Item.class, d2id ); + Item id2 = session.getReference( Item.class, d2id ); assertEquals( d2id, id2.getId() ); assertEquals( "Secret", id2.getName() ); assertEquals( "/", id2.getParent().getName() ); id.setName( "HiA" ); - SecureDocument d2 = session.load( SecureDocument.class, d2id ); + SecureDocument d2 = session.getReference( SecureDocument.class, d2id ); d2.setOwner( "max" ); session.flush(); session.clear(); - Document d = session.load( Document.class, did ); + Document d = session.getReference( Document.class, did ); assertEquals( did, d.getId() ); assertEquals( "HiA", d.getName() ); assertNotNull( d.getContent() ); @@ -104,7 +104,7 @@ public class MixedTest { assertNotNull( d.getCreated() ); assertNotNull( d.getModified() ); - d2 = session.load( SecureDocument.class, d2id ); + d2 = session.getReference( SecureDocument.class, d2id ); assertEquals( d2id, d2.getId() ); assertEquals( "Secret", d2.getName() ); assertNotNull( d2.getContent() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java index 4ba9583d8a..1c4d68c20b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/discriminator/DiscriminatorMultiTenancyTest.java @@ -139,7 +139,7 @@ public class DiscriminatorMultiTenancyTest extends BaseUnitTestCase { // make sure we get the steve back, from cache if same tenant (jboss) doInHibernate( "jboss", session -> { - Customer customer = session.load( Customer.class, 1L ); + Customer customer = session.getReference( Customer.class, 1L ); Assert.assertEquals( "steve", customer.getName() ); // also, make sure this came from second level Assert.assertEquals( 1, sessionFactory.getStatistics().getSecondLevelCacheHitCount() ); @@ -149,7 +149,7 @@ public class DiscriminatorMultiTenancyTest extends BaseUnitTestCase { // then make sure we get the steve back, from db if other tenant (acme) doInHibernate( "acme", session -> { - Customer customer = session.load( Customer.class, 1L ); + Customer customer = session.getReference( Customer.class, 1L ); Assert.assertEquals( "steve", customer.getName() ); // also, make sure this doesn't came from second level Assert.assertEquals( 0, sessionFactory.getStatistics().getSecondLevelCacheHitCount() ); @@ -161,7 +161,7 @@ public class DiscriminatorMultiTenancyTest extends BaseUnitTestCase { // first jboss doInHibernate( "jboss", session -> { - Customer customer = session.load( Customer.class, 1L ); + Customer customer = session.getReference( Customer.class, 1L ); Assert.assertEquals( "steve", customer.getName() ); // also, make sure this doesn't came from second level Assert.assertEquals( 0, sessionFactory.getStatistics().getSecondLevelCacheHitCount() ); @@ -170,14 +170,14 @@ public class DiscriminatorMultiTenancyTest extends BaseUnitTestCase { sessionFactory.getStatistics().clear(); // then, acme doInHibernate( "acme", session -> { - Customer customer = session.load( Customer.class, 1L ); + Customer customer = session.getReference( Customer.class, 1L ); Assert.assertEquals( "steve", customer.getName() ); // also, make sure this doesn't came from second level Assert.assertEquals( 0, sessionFactory.getStatistics().getSecondLevelCacheHitCount() ); } ); doInHibernate( "jboss", session -> { - Customer customer = session.load( Customer.class, 1L ); + Customer customer = session.getReference( Customer.class, 1L ); session.remove( customer ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java index d85c7c8017..74aa595a62 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/multitenancy/schema/AbstractSchemaBasedMultiTenancyTest.java @@ -196,7 +196,7 @@ public abstract class AbstractSchemaBasedMultiTenancyTest { - Customer customer = session.load( Customer.class, 1L ); + Customer customer = session.getReference( Customer.class, 1L ); Assert.assertEquals( "steve", customer.getName() ); // also, make sure this came from second level Assert.assertEquals( 1, sessionFactory.getStatistics().getSecondLevelCacheHitCount() ); @@ -205,7 +205,7 @@ public abstract class AbstractSchemaBasedMultiTenancyTest { - Customer customer = session.load( Customer.class, 1L ); + Customer customer = session.getReference( Customer.class, 1L ); Assert.assertEquals( "john", customer.getName() ); // also, make sure this came from second level Assert.assertEquals( 1, sessionFactory.getStatistics().getSecondLevelCacheHitCount() ); @@ -216,7 +216,7 @@ public abstract class AbstractSchemaBasedMultiTenancyTest { - Customer customer = session.load( Customer.class, 1L ); + Customer customer = session.getReference( Customer.class, 1L ); Assert.assertEquals( "steve", customer.getName() ); // also, make sure this came from second level Assert.assertEquals( 0, sessionFactory.getStatistics().getSecondLevelCacheHitCount() ); @@ -225,7 +225,7 @@ public abstract class AbstractSchemaBasedMultiTenancyTest { - Customer customer = session.load( Customer.class, 1L ); + Customer customer = session.getReference( Customer.class, 1L ); Assert.assertEquals( "john", customer.getName() ); // also, make sure this came from second level Assert.assertEquals( 0, sessionFactory.getStatistics().getSecondLevelCacheHitCount() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java index 30ebb63070..36305ffe15 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/EagerProxyNotFoundTest.java @@ -54,7 +54,7 @@ public class EagerProxyNotFoundTest { session -> { final Task task = new Task(); task.id = 1; - task.employeeEagerNotFoundIgnore = session.load( Employee.class, 2 ); + task.employeeEagerNotFoundIgnore = session.getReference( Employee.class, 2 ); session.persist( task ); } ); @@ -72,13 +72,13 @@ public class EagerProxyNotFoundTest { session -> { final Task task = new Task(); task.id = 1; - task.employeeEagerNotFoundIgnore = session.load( Employee.class, 2 ); + task.employeeEagerNotFoundIgnore = session.getReference( Employee.class, 2 ); session.persist( task ); } ); scope.inTransaction( session -> { - session.load( Employee.class, 2 ); + session.getReference( Employee.class, 2 ); final Task task = session.createQuery( "from Task", Task.class ).getSingleResult(); assertNotNull( task ); assertNull( task.employeeEagerNotFoundIgnore ); @@ -91,7 +91,7 @@ public class EagerProxyNotFoundTest { session -> { final Task task = new Task(); task.id = 1; - task.employeeLazy = session.load( Employee.class, 2 ); + task.employeeLazy = session.getReference( Employee.class, 2 ); task.employeeEagerNotFoundIgnore = task.employeeLazy; session.persist( task ); } ); @@ -113,14 +113,14 @@ public class EagerProxyNotFoundTest { session -> { final Task task = new Task(); task.id = 1; - task.employeeLazy = session.load( Employee.class, 2 ); + task.employeeLazy = session.getReference( Employee.class, 2 ); task.employeeEagerNotFoundIgnore = task.employeeLazy; session.persist( task ); } ); scope.inTransaction( session -> { - final Employee employeeProxy = session.load( Employee.class, 2 ); + final Employee employeeProxy = session.getReference( Employee.class, 2 ); final Task task = session.createQuery( "from Task", Task.class ).getSingleResult(); assertNotNull( task ); assertNull( task.employeeEagerNotFoundIgnore ); @@ -186,7 +186,7 @@ public class EagerProxyNotFoundTest { try { scope.inTransaction( session -> { - session.load( Employee.class, 1 ); + session.getReference( Employee.class, 1 ); session.createQuery( "from Task", Task.class ).getSingleResult(); } ); fail( "EntityNotFoundException should have been thrown because Task.employee.location is not found " + @@ -249,7 +249,7 @@ public class EagerProxyNotFoundTest { try { scope.inTransaction( session -> { - session.load( Employee.class, 1 ); + session.getReference( Employee.class, 1 ); Task task = session.createQuery( "from Task", Task.class ).getSingleResult(); assertNotNull( task ); Employee employeeEagerNotFoundIgnore = task.getEmployeeEagerNotFoundIgnore(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java index 20f7a3e251..8d7534d561 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondemandload/LazyLoadingTest.java @@ -156,7 +156,7 @@ public class LazyLoadingTest { Store s = scope.fromTransaction( session -> { // first load the store, making sure it is not initialized - Store store = session.load( Store.class, 1 ); + Store store = session.getReference( Store.class, 1 ); assertNotNull( store ); assertFalse( Hibernate.isInitialized( store ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java index a58cb298d4..c706bd4993 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java @@ -85,7 +85,7 @@ public abstract class AbstractRecursiveBidirectionalOneToManyTest extends BaseSe inTransaction( session -> { session.setCacheMode( getSessionCacheMode() ); - Node node3 = session.load( Node.class, new Integer( 3 ) ); + Node node3 = session.getReference( Node.class, new Integer( 3 ) ); Node node2 = node3.getParentNode(); Node node1 = node2.getParentNode(); @@ -99,7 +99,7 @@ public abstract class AbstractRecursiveBidirectionalOneToManyTest extends BaseSe inTransaction( session -> { session.setCacheMode( getSessionCacheMode() ); - Node node3 = session.load( Node.class, new Integer( 3 ) ); + Node node3 = session.getReference( Node.class, new Integer( 3 ) ); Node node2 = node3.getParentNode(); Node node1 = node2.getParentNode(); @@ -114,7 +114,7 @@ public abstract class AbstractRecursiveBidirectionalOneToManyTest extends BaseSe inTransaction( session -> { session.setCacheMode( getSessionCacheMode() ); - Node node3 = session.load( Node.class, new Integer( 3 ) ); + Node node3 = session.getReference( Node.class, new Integer( 3 ) ); Node node2 = node3.getParentNode(); Node node1 = node2.getParentNode(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java index e8b8803c3e..c50e293004 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/formula/OneToOneFormulaTest.java @@ -203,7 +203,7 @@ public class OneToOneFormulaTest extends BaseSessionFactoryFunctionalTest { Address a = new Address(); a.setType( "HOME" ); a.setPerson( person ); - a = session.load( Address.class, a ); + a = session.getReference( Address.class, a ); assertFalse( Hibernate.isInitialized( a ) ); a.getPerson(); a.getType(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/OptionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/OptionalOneToOneTest.java index ad247153f4..0c344d896a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/OptionalOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/optional/OptionalOneToOneTest.java @@ -44,7 +44,7 @@ public class OptionalOneToOneTest { scope.inTransaction( session -> { - Person me = session.load( Person.class, name ); + Person me = session.getReference( Person.class, name ); assertNull( me.address ); session.remove( me ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java index 47943a21da..dc163b265d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/CreateTest.java @@ -232,7 +232,7 @@ public class CreateTest extends AbstractOperationTestCase { scope.inTransaction( session -> { - Employer er1 = session.load( Employer.class, er.getId() ); + Employer er1 = session.getReference( Employer.class, er.getId() ); assertNotNull( er1 ); assertNotNull( er1.getEmployees() ); assertThat( er1.getEmployees().size(), is( 1 ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/GetLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/GetLoadTest.java index 80fe18d0a2..180a9fd29f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/GetLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/GetLoadTest.java @@ -75,10 +75,10 @@ public class GetLoadTest { scope.inTransaction( session -> { - Employer e = session.load( Employer.class, emp.getId() ); + Employer e = session.getReference( Employer.class, emp.getId() ); e.getId(); assertFalse( Hibernate.isInitialized( e ) ); - Node n = session.load( Node.class, node.getName() ); + Node n = session.getReference( Node.class, node.getName() ); assertThat( n.getName(), is( "foo" ) ); assertFalse( Hibernate.isInitialized( n ) ); } @@ -95,10 +95,10 @@ public class GetLoadTest { scope.inTransaction( session -> { - Employer e = (Employer) session.load( "org.hibernate.orm.test.ops.Employer", emp.getId() ); + Employer e = (Employer) session.getReference( "org.hibernate.orm.test.ops.Employer", emp.getId() ); e.getId(); assertFalse( Hibernate.isInitialized( e ) ); - Node n = (Node) session.load( "org.hibernate.orm.test.ops.Node", node.getName() ); + Node n = (Node) session.getReference( "org.hibernate.orm.test.ops.Node", node.getName() ); assertThat( n.getName(), is( "foo" ) ); assertFalse( Hibernate.isInitialized( n ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleOpsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleOpsTest.java index cb6fdd4c5b..039e5e33cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleOpsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SimpleOpsTest.java @@ -66,7 +66,7 @@ public class SimpleOpsTest extends AbstractOperationTestCase { SimpleEntity simpleEntity = scope.fromTransaction( session -> { - SimpleEntity entity = session.load( SimpleEntity.class, id ); + SimpleEntity entity = session.getReference( SimpleEntity.class, id ); assertFalse( Hibernate.isInitialized( entity ) ); assertThat( entity.getId(), is( 1L ) ); assertThat( entity.getName(), is( "new name" ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java index ae0d03fc28..4acefb2149 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/BasicGetLoadAccessTest.java @@ -87,17 +87,17 @@ public class BasicGetLoadAccessTest { // test `load` access scope.inTransaction( session -> - session.load( User.class, 1 ) + session.getReference( User.class, 1 ) ); scope.inTransaction( session -> - session.load( User.class, 1, LockMode.PESSIMISTIC_WRITE ) + session.get( User.class, 1, LockMode.PESSIMISTIC_WRITE ) ); scope.inTransaction( session -> - session.load( User.class, 1, LockOptions.UPGRADE ) + session.get( User.class, 1, LockOptions.UPGRADE ) ); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java index b6ba2b7a46..185b2e1518 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/optlock/OptimisticLockTest.java @@ -115,7 +115,7 @@ public class OptimisticLockTest { scope.inTransaction( session -> { - Document document = (Document) session.load( entityName, doc.getId() ); + Document document = (Document) session.getReference( entityName, doc.getId() ); session.remove( document ); } ); @@ -170,7 +170,7 @@ public class OptimisticLockTest { scope.inTransaction( session -> { - Document document = (Document) session.load( entityName, doc.getId() ); + Document document = (Document) session.getReference( entityName, doc.getId() ); session.remove( document ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java index f62aa24d01..92f5b2ebb5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/PropertyRefTest.java @@ -50,7 +50,7 @@ public class PropertyRefTest { scope.inTransaction( session -> { - User u = session.load( User.class, user.getId() ); + User u = session.getReference( User.class, user.getId() ); session.remove( u ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest.java index f5a31f5c00..6a7ee11adc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest.java @@ -59,7 +59,7 @@ public class PolymorphicAssociationTest { @Test public void testLoad(SessionFactoryScope scope) { scope.inTransaction( session -> { - Level3 level3 = session.load( Level3.class, 3 ); + Level3 level3 = session.getReference( Level3.class, 3 ); Level2 level2 = level3.getLevel2Parent(); assertThat( level2 ).isNotNull(); final Level3 level3Child = level2.getLevel3Child(); @@ -67,7 +67,7 @@ public class PolymorphicAssociationTest { } ); scope.inTransaction( session -> { - Level1 level1 = session.load( Level1.class, 1 ); + Level1 level1 = session.getReference( Level1.class, 1 ); DerivedLevel2 level2 = level1.getLevel2Child(); assertThat( level2 ).isNotNull(); assertThat( level2.getLevel1Parent() ).extracting( "id" ).isEqualTo( 1 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest2.java index 0d3e6f7bdd..66d5cf254a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/polymorphic/PolymorphicAssociationTest2.java @@ -59,7 +59,7 @@ public class PolymorphicAssociationTest2 { @Test public void testLoad(SessionFactoryScope scope) { scope.inTransaction( session -> { - Level3 level3 = session.load( Level3.class, 3 ); + Level3 level3 = session.getReference( Level3.class, 3 ); Level2 level2 = level3.getLevel2Parent(); assertThat( level2 ).isNotNull(); final Level3 level3Child = level2.getLevel3Child(); @@ -67,7 +67,7 @@ public class PolymorphicAssociationTest2 { } ); scope.inTransaction( session -> { - Level1 level1 = session.load( Level1.class, 1 ); + Level1 level1 = session.getReference( Level1.class, 1 ); Level2 level2 = level1.getLevel2Child(); assertThat( level2 ).isNotNull(); assertThat( level2.getLevel1Parent() ).extracting( "id" ).isEqualTo( 1 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java index fc0a112bf9..d1188cdb5a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/DirectPropertyAccessorTest.java @@ -40,7 +40,7 @@ public class DirectPropertyAccessorTest { s.flush(); s.clear(); - o = ( Order ) s.load( Order.class, 1 ); + o = ( Order ) s.getReference( Order.class, 1 ); assertFalse( Hibernate.isInitialized( o ) ); o.getOrderNumber(); // If you mapped with field access, any method, except id, call initializes the proxy diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/FinalGetterSetterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/FinalGetterSetterTest.java index 2751239c5b..2af6b889a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/FinalGetterSetterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/FinalGetterSetterTest.java @@ -51,7 +51,7 @@ public class FinalGetterSetterTest { try { scope.inTransaction( session -> - session.load( EntityWithFinalClass.class, 999 ) + session.getReference( EntityWithFinalClass.class, 999 ) ); fail( "Should have thrown ObjectNotFoundException" ); } @@ -66,7 +66,7 @@ public class FinalGetterSetterTest { } ); scope.inTransaction( session -> { - final EntityWithFinalClass entity = session.load( EntityWithFinalClass.class, 1 ); + final EntityWithFinalClass entity = session.getReference( EntityWithFinalClass.class, 1 ); assertNotNull( entity ); assertTrue( Hibernate.isInitialized( entity ) ); } ); @@ -82,7 +82,7 @@ public class FinalGetterSetterTest { try { scope.inTransaction( session -> - session.load( EntityWithFinalIdGetter.class, 999 ) + session.getReference( EntityWithFinalIdGetter.class, 999 ) ); fail( "Should have thrown ObjectNotFoundException" ); } @@ -99,7 +99,7 @@ public class FinalGetterSetterTest { scope.inTransaction( session -> { - final EntityWithFinalIdGetter entity = session.load( EntityWithFinalIdGetter.class, 1 ); + final EntityWithFinalIdGetter entity = session.getReference( EntityWithFinalIdGetter.class, 1 ); assertNotNull( entity ); assertTrue( Hibernate.isInitialized( entity ) ); } ); @@ -115,7 +115,7 @@ public class FinalGetterSetterTest { try { scope.inTransaction( session -> - session.load( EntityWithFinalIdSetter.class, 999 ) + session.getReference( EntityWithFinalIdSetter.class, 999 ) ); fail( "Should have thrown ObjectNotFoundException" ); } @@ -132,7 +132,7 @@ public class FinalGetterSetterTest { scope.inTransaction( session -> { - final EntityWithFinalIdSetter entity = session.load( EntityWithFinalIdSetter.class, 1 ); + final EntityWithFinalIdSetter entity = session.getReference( EntityWithFinalIdSetter.class, 1 ); assertNotNull( entity ); assertTrue( Hibernate.isInitialized( entity ) ); } ); @@ -148,7 +148,7 @@ public class FinalGetterSetterTest { try { scope.inTransaction( session -> - session.load( EntityWithFinalVersionGetter.class, 999 ) + session.getReference( EntityWithFinalVersionGetter.class, 999 ) ); fail( "Should have thrown ObjectNotFoundException" ); } @@ -165,7 +165,7 @@ public class FinalGetterSetterTest { scope.inTransaction( session -> { - final EntityWithFinalVersionGetter entity = session.load( EntityWithFinalVersionGetter.class, 1 ); + final EntityWithFinalVersionGetter entity = session.getReference( EntityWithFinalVersionGetter.class, 1 ); assertNotNull( entity ); assertTrue( Hibernate.isInitialized( entity ) ); } ); @@ -181,7 +181,7 @@ public class FinalGetterSetterTest { try { scope.inTransaction( session -> - session.load( EntityWithFinalVersionSetter.class, 999 ) + session.getReference( EntityWithFinalVersionSetter.class, 999 ) ); fail( "Should have thrown ObjectNotFoundException" ); } @@ -198,7 +198,7 @@ public class FinalGetterSetterTest { scope.inTransaction( session -> { - final EntityWithFinalVersionSetter entity = session.load( EntityWithFinalVersionSetter.class, 1 ); + final EntityWithFinalVersionSetter entity = session.getReference( EntityWithFinalVersionSetter.class, 1 ); assertNotNull( entity ); assertTrue( Hibernate.isInitialized( entity ) ); } ); @@ -214,7 +214,7 @@ public class FinalGetterSetterTest { try { scope.inTransaction( session -> - session.load( EntityWithFinalPropertyGetter.class, 999 ) + session.getReference( EntityWithFinalPropertyGetter.class, 999 ) ); fail( "Should have thrown ObjectNotFoundException" ); } @@ -231,7 +231,7 @@ public class FinalGetterSetterTest { scope.inTransaction( session -> { - final EntityWithFinalPropertyGetter entity = session.load( EntityWithFinalPropertyGetter.class, 1 ); + final EntityWithFinalPropertyGetter entity = session.getReference( EntityWithFinalPropertyGetter.class, 1 ); assertNotNull( entity ); assertTrue( Hibernate.isInitialized( entity ) ); } ); @@ -247,7 +247,7 @@ public class FinalGetterSetterTest { try { scope.inTransaction( session -> - session.load( EntityWithFinalPropertySetter.class, 999 ) + session.getReference( EntityWithFinalPropertySetter.class, 999 ) ); fail( "Should have thrown ObjectNotFoundException" ); } @@ -264,7 +264,7 @@ public class FinalGetterSetterTest { scope.inTransaction( session -> { - final EntityWithFinalPropertySetter entity = session.load( EntityWithFinalPropertySetter.class, 1 ); + final EntityWithFinalPropertySetter entity = session.getReference( EntityWithFinalPropertySetter.class, 1 ); assertNotNull( entity ); assertTrue( Hibernate.isInitialized( entity ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java index 05bff5115f..de31410512 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/MultipleSessionFactoriesProxyTest.java @@ -65,7 +65,7 @@ public class MultipleSessionFactoriesProxyTest extends BaseCoreFunctionalTestCas s.flush(); s.clear(); - container = s.load( Container.class, container.getId() ); + container = s.getReference( Container.class, container.getId() ); assertFalse( Hibernate.isInitialized( container ) ); container.getId(); assertFalse( Hibernate.isInitialized( container ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyTest.java index 0dd3f6592f..ce637290bf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/ProxyTest.java @@ -66,7 +66,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s.flush(); s.clear(); - dp = s.load(DataPoint.class, dp.getId()); + dp = s.getReference(DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized(dp) ); try { @@ -94,7 +94,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s.flush(); s.clear(); - dp = s.load( DataPoint.class, dp.getId() ); + dp = s.getReference( DataPoint.class, dp.getId() ); assertFalse( Hibernate.isInitialized(dp) ); try { @@ -175,7 +175,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s.flush(); s.clear(); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized(dp) ); s.close(); SerializationHelper.clone( dp ); @@ -199,7 +199,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s.flush(); s.clear(); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized(dp) ); Hibernate.initialize( dp ); assertTrue( Hibernate.isInitialized(dp) ); @@ -225,13 +225,13 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s.flush(); s.clear(); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized(dp) ); dp.getId(); assertFalse( Hibernate.isInitialized(dp) ); dp.getDescription(); assertTrue( Hibernate.isInitialized(dp) ); - Object none = s.load( DataPoint.class, 666L); + Object none = s.getReference( DataPoint.class, 666L); assertFalse( Hibernate.isInitialized(none) ); t.commit(); @@ -249,10 +249,10 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { t = sclone.beginTransaction(); - DataPoint sdp = sclone.load( DataPoint.class, dp.getId()); + DataPoint sdp = sclone.getReference( DataPoint.class, dp.getId()); assertSame(dp, sdp); assertFalse(sdp instanceof HibernateProxy); - Object snone = sclone.load( DataPoint.class, 666L); + Object snone = sclone.getReference( DataPoint.class, 666L); assertSame(none, snone); assertTrue(snone instanceof HibernateProxy); @@ -275,35 +275,35 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s.flush(); s.clear(); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized(dp) ); DataPoint dp2 = s.get( DataPoint.class, dp.getId()); assertSame(dp, dp2); assertTrue( Hibernate.isInitialized(dp) ); s.clear(); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized(dp) ); - dp2 = s.load( DataPoint.class, dp.getId(), LockMode.NONE ); + dp2 = s.getReference( DataPoint.class, dp.getId() ); assertSame(dp, dp2); assertFalse( Hibernate.isInitialized(dp) ); s.clear(); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized(dp) ); - dp2 = s.load( DataPoint.class, dp.getId(), LockMode.READ ); + dp2 = s.get( DataPoint.class, dp.getId(), LockMode.READ ); assertSame(dp, dp2); assertTrue( Hibernate.isInitialized(dp) ); s.clear(); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized(dp) ); - dp2 = s.byId( DataPoint.class ).with( LockOptions.READ ).load( dp.getId() ); + dp2 = s.byId( DataPoint.class ).with( LockOptions.READ ).getReference( dp.getId() ); assertSame(dp, dp2); assertTrue( Hibernate.isInitialized(dp) ); s.clear(); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized(dp) ); dp2 = (DataPoint) s.createQuery("from DataPoint").uniqueResult(); assertSame(dp, dp2); @@ -348,7 +348,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { dp = s.getReference( DataPoint.class, dp.getId() ); assertFalse( Hibernate.isInitialized(dp) ); - dp2 = s.byId( DataPoint.class ).with( LockOptions.READ ).load( dp.getId() ); + dp2 = s.byId( DataPoint.class ).with( LockOptions.READ ).getReference( dp.getId() ); assertSame(dp, dp2); assertTrue( Hibernate.isInitialized(dp) ); s.clear(); @@ -368,7 +368,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { Session s = openSession(); Transaction t = s.beginTransaction(); - DataPoint proxy = s.load( DataPoint.class, (long) -1); + DataPoint proxy = s.getReference( DataPoint.class, (long) -1); assertFalse( Hibernate.isInitialized( proxy ) ); try { proxy.getDescription(); @@ -412,7 +412,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - Container c = s.load( Container.class, container.getId() ); + Container c = s.getReference( Container.class, container.getId() ); assertFalse( Hibernate.isInitialized( c ) ); s.evict( c ); try { @@ -423,7 +423,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { // expected result } - c = s.load( Container.class, container.getId() ); + c = s.getReference( Container.class, container.getId() ); assertFalse( Hibernate.isInitialized( c ) ); Info i = c.getInfo(); assertTrue( Hibernate.isInitialized( c ) ); @@ -473,7 +473,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s.setHibernateFlushMode( FlushMode.MANUAL ); t = s.beginTransaction(); // load the last container as a proxy - Container proxy = s.load( Container.class, lastContainerId ); + Container proxy = s.getReference( Container.class, lastContainerId ); assertFalse( Hibernate.isInitialized( proxy ) ); // load the rest back into the PC List all = s.createQuery( "from Container as c inner join fetch c.owner inner join fetch c.dataPoints where c.id <> :l" ) @@ -526,7 +526,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); DataPoint dp = newPersistentDataPoint( s ); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); dp.getX(); assertTrue( Hibernate.isInitialized( dp ) ); @@ -545,7 +545,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); DataPoint dp = newPersistentDataPoint( s ); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized( dp ) ); s.refresh( dp, LockOptions.UPGRADE ); @@ -574,7 +574,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); DataPoint dp = newPersistentDataPoint( s ); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized( dp ) ); s.refresh( dp, LockOptions.UPGRADE ); dp.getX(); @@ -591,7 +591,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); DataPoint dp = newPersistentDataPoint( s ); - dp = s.load( DataPoint.class, dp.getId()); + dp = s.getReference( DataPoint.class, dp.getId()); assertFalse( Hibernate.isInitialized( dp ) ); s.lock( dp, LockOptions.UPGRADE ); assertSame( LockOptions.UPGRADE.getLockMode(), s.getCurrentLockMode( dp ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ProxyNarrowingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ProxyNarrowingTest.java index c5378fd96e..51cc64e849 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ProxyNarrowingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/proxy/narrow/ProxyNarrowingTest.java @@ -63,7 +63,7 @@ public class ProxyNarrowingTest { assertTrue( Hibernate.isInitialized( abstractEntityProxy ) ); // load the concrete class via session.load to trigger the StatefulPersistenceContext.narrowProxy code - ConcreteEntity concreteEntityProxy = session.load( + ConcreteEntity concreteEntityProxy = session.getReference( ConcreteEntity.class, abstractEntityProxy.getId() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java index c5a3eb23b0..fd4aade010 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyProxyTest.java @@ -53,7 +53,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( session, dp, false ); assertFalse( Hibernate.isInitialized( dp ) ); @@ -99,7 +99,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); LazyInitializer dpLI = ( (HibernateProxy) dp ).getHibernateLazyInitializer(); checkReadOnly( session, dp, false ); @@ -146,7 +146,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( session, dp, false ); assertFalse( Hibernate.isInitialized( dp ) ); @@ -168,7 +168,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); session.setReadOnly( dp, true ); checkReadOnly( session, dp, true ); @@ -191,7 +191,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); session.setReadOnly( dp, true ); checkReadOnly( session, dp, true ); @@ -233,7 +233,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); LazyInitializer dpLI = ( (HibernateProxy) dp ).getHibernateLazyInitializer(); checkReadOnly( session, dp, false ); @@ -256,7 +256,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); LazyInitializer dpLI = ( (HibernateProxy) dp ).getHibernateLazyInitializer(); dpLI.setReadOnly( true ); @@ -280,7 +280,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); LazyInitializer dpLI = ( (HibernateProxy) dp ).getHibernateLazyInitializer(); dpLI.setReadOnly( true ); @@ -323,7 +323,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); session.setReadOnly( dp, true ); dp.setDescription( "changed" ); @@ -362,7 +362,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( session, dp, false ); dp.setDescription( "changed" ); @@ -401,7 +401,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( session, dp, false ); @@ -450,7 +450,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( session, dp, false ); @@ -497,7 +497,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( session, dp, false ); @@ -542,7 +542,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( session, dp, false ); assertFalse( Hibernate.isInitialized( dp ) ); @@ -587,7 +587,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); LazyInitializer dpLI = ( (HibernateProxy) dp ).getHibernateLazyInitializer(); assertTrue( dpLI.isUninitialized() ); @@ -630,7 +630,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); LazyInitializer dpLI = ( (HibernateProxy) dp ).getHibernateLazyInitializer(); assertTrue( dp instanceof HibernateProxy ); @@ -672,7 +672,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); LazyInitializer dpLI = ( (HibernateProxy) dp ).getHibernateLazyInitializer(); assertTrue( dpLI.isUninitialized() ); @@ -715,7 +715,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); LazyInitializer dpLI = ( (HibernateProxy) dp ).getHibernateLazyInitializer(); assertTrue( dpLI.isUninitialized() ); @@ -758,7 +758,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( session, dp, false ); @@ -818,7 +818,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( session, dp, false ); @@ -877,7 +877,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( session, dp, false ); @@ -924,7 +924,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( session, dp, false ); session.setReadOnly( dp, true ); @@ -967,7 +967,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( session, dp, false ); session.setReadOnly( dp, true ); @@ -1013,7 +1013,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( session, dp, false ); session.setReadOnly( dp, true ); @@ -1056,7 +1056,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setCacheMode( CacheMode.IGNORE ); session.beginTransaction(); try { - DataPoint dp = session.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = session.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( session, dp, false ); session.setReadOnly( dp, true ); @@ -1098,7 +1098,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); - dp = s.load( DataPoint.class, dp.getId() ); + dp = s.getReference( DataPoint.class, dp.getId() ); s.setReadOnly( dp, true ); assertFalse( Hibernate.isInitialized( dp ) ); s.refresh( dp ); @@ -1142,7 +1142,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); - HibernateProxy dpProxy = (HibernateProxy) s.load( DataPoint.class, dp.getId() ); + HibernateProxy dpProxy = (HibernateProxy) s.getReference( DataPoint.class, dp.getId() ); assertFalse( Hibernate.isInitialized( dpProxy ) ); t.commit(); s.close(); @@ -1168,7 +1168,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s = openSession( scope ); t = s.beginTransaction(); s.setCacheMode( CacheMode.IGNORE ); - DataPoint dpProxyInit = s.load( DataPoint.class, dp.getId() ); + DataPoint dpProxyInit = s.getReference( DataPoint.class, dp.getId() ); assertEquals( "original", dp.getDescription() ); assertEquals( "original", dpProxyInit.getDescription() ); s.remove( dpProxyInit ); @@ -1225,7 +1225,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); - dp = s.load( DataPoint.class, dp.getId() ); + dp = s.getReference( DataPoint.class, dp.getId() ); assertFalse( Hibernate.isInitialized( dp ) ); assertFalse( s.isReadOnly( dp ) ); s.setReadOnly( dp, true ); @@ -1260,7 +1260,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { Session s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( s, dp, false ); assertFalse( Hibernate.isInitialized( dp ) ); @@ -1275,7 +1275,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dpLoaded = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dpLoaded = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dpLoaded instanceof HibernateProxy ); checkReadOnly( s, dpLoaded, false ); s.setReadOnly( dpLoaded, true ); @@ -1309,7 +1309,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { Session s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( s, dp, false ); assertFalse( Hibernate.isInitialized( dp ) ); @@ -1324,7 +1324,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dpLoaded = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dpLoaded = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dpLoaded instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dpLoaded ) ); Hibernate.initialize( dpLoaded ); @@ -1359,7 +1359,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { Session s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( s, dp, false ); assertFalse( Hibernate.isInitialized( dp ) ); @@ -1375,7 +1375,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dpLoaded = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dpLoaded = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dpLoaded instanceof HibernateProxy ); checkReadOnly( s, dpLoaded, false ); s.setReadOnly( dpLoaded, true ); @@ -1409,7 +1409,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { Session s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( s, dp, false ); assertFalse( Hibernate.isInitialized( dp ) ); @@ -1425,7 +1425,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dpLoaded = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dpLoaded = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dpLoaded instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dpLoaded ) ); Hibernate.initialize( dpLoaded ); @@ -1460,7 +1460,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { Session s = openSession( scope ); s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); checkReadOnly( s, dp, false ); assertFalse( Hibernate.isInitialized( dp ) ); @@ -1508,7 +1508,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); @@ -1552,7 +1552,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); @@ -1596,7 +1596,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); @@ -1646,7 +1646,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); @@ -1678,7 +1678,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); @@ -1712,7 +1712,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); @@ -1744,7 +1744,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); @@ -1774,7 +1774,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); @@ -1806,7 +1806,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); @@ -1840,7 +1840,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); @@ -1875,7 +1875,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); @@ -1907,7 +1907,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); s.beginTransaction(); - DataPoint dp = s.load( DataPoint.class, dpOrig.getId() ); + DataPoint dp = s.getReference( DataPoint.class, dpOrig.getId() ); assertTrue( dp instanceof HibernateProxy ); assertFalse( Hibernate.isInitialized( dp ) ); checkReadOnly( s, dp, false ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionLazyNonLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionLazyNonLazyTest.java index 012bfd2387..1f169696b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionLazyNonLazyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionLazyNonLazyTest.java @@ -88,7 +88,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { t = s.beginTransaction(); assertTrue( s.isDefaultReadOnly() ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); - Container c = ( Container ) s.load( Container.class, cOrig.getId() ); + Container c = ( Container ) s.getReference( Container.class, cOrig.getId() ); assertSame( cOrig, c ); checkContainer( c, expectedInitializedObjects, expectedReadOnlyObjects, s ); c = ( Container ) s.get( Container.class, cOrig.getId() ); @@ -499,7 +499,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Hibernate.initialize( c.getProxyInfo() ); expectedInitializedObjects.add( c.getProxyInfo() ); checkContainer( c, expectedInitializedObjects, expectedReadOnlyObjects, s ); - DataPoint lazyDataPoint = ( DataPoint ) s.load( DataPoint.class, lazyDataPointOrig.getId() ); + DataPoint lazyDataPoint = ( DataPoint ) s.getReference( DataPoint.class, lazyDataPointOrig.getId() ); assertFalse( Hibernate.isInitialized( c.getLazyDataPoints() ) ); Hibernate.initialize( c.getLazyDataPoints() ); assertSame( lazyDataPoint, c.getLazyDataPoints().iterator().next() ); @@ -591,7 +591,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { expectedInitializedObjects.add( c.getProxyInfo() ); checkContainer( c, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); - DataPoint lazyDataPoint = ( DataPoint ) s.load( DataPoint.class, lazyDataPointOrig.getId() ); + DataPoint lazyDataPoint = ( DataPoint ) s.getReference( DataPoint.class, lazyDataPointOrig.getId() ); s.setDefaultReadOnly( false ); assertFalse( Hibernate.isInitialized( c.getLazyDataPoints() ) ); Hibernate.initialize( c.getLazyDataPoints() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java index f7c7472e21..71771aa558 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlySessionTest.java @@ -69,7 +69,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.beginTransaction(); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); - dp = (DataPoint) s.load( DataPoint.class, new Long( dpId ) ); + dp = (DataPoint) s.getReference( DataPoint.class, new Long( dpId ) ); s.setDefaultReadOnly( false ); assertFalse( "was initialized", Hibernate.isInitialized( dp ) ); assertTrue( s.isReadOnly( dp ) ); @@ -512,7 +512,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); s.setDefaultReadOnly( true ); - dp = (DataPoint) s.load( DataPoint.class, dp.getId() ); + dp = (DataPoint) s.getReference( DataPoint.class, dp.getId() ); assertTrue( s.isReadOnly( dp ) ); assertFalse( Hibernate.isInitialized( dp ) ); s.refresh( dp ); @@ -569,7 +569,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); s.setDefaultReadOnly( true ); - dp = (DataPoint) s.load( DataPoint.class, dp.getId() ); + dp = (DataPoint) s.getReference( DataPoint.class, dp.getId() ); assertFalse( Hibernate.isInitialized( dp ) ); assertTrue( s.isReadOnly( dp ) ); s.evict( dp ); @@ -864,7 +864,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); s.setDefaultReadOnly( true ); - DataPoint dpProxy = s.load( DataPoint.class, new Long( dp.getId() ) ); + DataPoint dpProxy = s.getReference( DataPoint.class, new Long( dp.getId() ) ); assertTrue( s.isReadOnly( dpProxy ) ); assertFalse( Hibernate.isInitialized( dpProxy ) ); s.evict( dpProxy ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java index 4efe8c5fdc..734c48ff31 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyTest.java @@ -61,7 +61,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { scope.inTransaction( session -> { - DataPoint dp = session.load( DataPoint.class, new Long( dpId ) ); + DataPoint dp = session.getReference( DataPoint.class, new Long( dpId ) ); assertFalse( Hibernate.isInitialized( dp ), "was initialized" ); session.setReadOnly( dp, true ); assertFalse( Hibernate.isInitialized( dp ), "was initialized during setReadOnly" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java index 4c3d8e5744..48ce7278c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/readonly/ReadOnlyVersionedNodesTest.java @@ -448,7 +448,7 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { scope.inTransaction( session -> { - VersionedNode parentLoad = (VersionedNode) session.load( parent.getClass(), parent.getId() ); + VersionedNode parentLoad = session.getReference( parent.getClass(), parent.getId() ); session.merge( parent ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java index d6f6ec07a9..6f06bf3e96 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/ProxyReattachmentTest.java @@ -45,7 +45,7 @@ public class ProxyReattachmentTest { Parent parent = scope.fromTransaction( session -> { - Parent p = session.load( Parent.class, "p" ); + Parent p = session.getReference( Parent.class, "p" ); // evict... session.evict( p ); // now try to reattach... @@ -70,7 +70,7 @@ public class ProxyReattachmentTest { Parent parent = scope.fromTransaction( session -> { - Parent p = session.load( Parent.class, "p" ); + Parent p = session.getReference( Parent.class, "p" ); // clear... session.clear(); // now try to reattach... @@ -97,7 +97,7 @@ public class ProxyReattachmentTest { scope.inTransaction( session -> { - Parent parent = session.load( Parent.class, p.getName() ); + Parent parent = session.getReference( Parent.class, p.getName() ); session.remove( parent ); // re-attach session.persist( parent ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java index 40a11fc28c..200731efdc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/MapProxySerializationTest.java @@ -73,7 +73,7 @@ public class MapProxySerializationTest { @TestForIssue(jiraKey = "HHH-7686") public void testInitializedProxySerializationIfTargetInPersistenceContext(SessionFactoryScope scope) { scope.inTransaction( s -> { - final Map child = (Map) s.load( "ChildEntity", 1L ); + final Map child = (Map) s.getReference( "ChildEntity", 1L ); final Map parent = (Map) child.get( "parent" ); @@ -105,7 +105,7 @@ public class MapProxySerializationTest { @TestForIssue(jiraKey = "HHH-7686") public void testUninitializedProxySerializationIfTargetInPersistenceContext(SessionFactoryScope scope) { scope.inTransaction( s -> { - final Map child = (Map) s.load( "ChildEntity", 1L ); + final Map child = (Map) s.getReference( "ChildEntity", 1L ); final Map parent = (Map) child.get( "parent" ); @@ -140,7 +140,7 @@ public class MapProxySerializationTest { @Test public void testProxyInitializationWithoutTX(SessionFactoryScope scope) { final Map parent = scope.fromTransaction( s -> { - final Map child = (Map) s.load( "ChildEntity", 1L ); + final Map child = (Map) s.getReference( "ChildEntity", 1L ); return (Map) child.get( "parent" ); }); // assert we have an uninitialized proxy @@ -163,7 +163,7 @@ public class MapProxySerializationTest { @TestForIssue(jiraKey = "HHH-7686") public void testProxyInitializationWithoutTXAfterDeserialization(SessionFactoryScope scope) { final Map deserializedParent = scope.fromTransaction( s -> { - final Map child = (Map) s.load( "ChildEntity", 1L ); + final Map child = (Map) s.getReference( "ChildEntity", 1L ); final Map parent = (Map) child.get( "parent" ); // destroy AbstractLazyInitializer internal state diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefTest.java index f1b6be794c..6c7b9b8b68 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unidir/BackrefTest.java @@ -122,7 +122,7 @@ public class BackrefTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); // load 'me' to associate it with the new session as a proxy (this may have occurred as 'prior work' // to the reattachment below)... - Object meProxy = s.load( Parent.class, me.getName() ); + Object meProxy = s.getReference( Parent.class, me.getName() ); assertFalse( Hibernate.isInitialized( meProxy ) ); // now, do the reattchment... s.merge( me ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/DbVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/DbVersionTest.java index 59b54f46e2..8960a42392 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/DbVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/db/DbVersionTest.java @@ -76,8 +76,8 @@ public class DbVersionTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.remove( s.load( User.class, steve.getId() ) ); - s.remove( s.load( Group.class, admin.getId() ) ); + s.remove( s.getReference( User.class, steve.getId() ) ); + s.remove( s.getReference( Group.class, admin.getId() ) ); t.commit(); s.close(); } @@ -120,8 +120,8 @@ public class DbVersionTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.remove( s.load( User.class, steve.getId() ) ); - s.remove( s.load( Permission.class, perm.getId() ) ); + s.remove( s.getReference( User.class, steve.getId() ) ); + s.remove( s.getReference( Permission.class, perm.getId() ) ); t.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java index 8925ae4f18..6550cec4a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampVersioningTest.java @@ -122,7 +122,7 @@ public class SybaseTimestampVersioningTest extends BaseCoreFunctionalTestCase { // lastly, clean up... s = openSession(); t = s.beginTransaction(); - s.remove( s.load( User.class, steve.getId() ) ); + s.remove( s.getReference( User.class, steve.getId() ) ); t.commit(); s.close(); } @@ -191,8 +191,8 @@ public class SybaseTimestampVersioningTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.remove( s.load( User.class, steve.getId() ) ); - s.remove( s.load( Group.class, admin.getId() ) ); + s.remove( s.getReference( User.class, steve.getId() ) ); + s.remove( s.getReference( Group.class, admin.getId() ) ); t.commit(); s.close(); } @@ -245,8 +245,8 @@ public class SybaseTimestampVersioningTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.remove( s.load( User.class, steve.getId() ) ); - s.remove( s.load( Permission.class, perm.getId() ) ); + s.remove( s.getReference( User.class, steve.getId() ) ); + s.remove( s.getReference( Permission.class, perm.getId() ) ); t.commit(); s.close(); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/VirtualEntitySingleIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/VirtualEntitySingleIdMapper.java index 3a39e44592..f1e4e6466d 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/VirtualEntitySingleIdMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/VirtualEntitySingleIdMapper.java @@ -53,7 +53,7 @@ public class VirtualEntitySingleIdMapper extends SingleIdMapper { // Either loads the entity from the session's 1LC if it already exists or potentially creates a // proxy object to represent the entity by identifier so that we can reference it in the map. - final Object entity = session.load( this.entityName, value ); + final Object entity = session.getReference( this.entityName, value ); data.put( propertyData.getName(), entity ); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java index 9707fd7648..66afb0d469 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java @@ -64,7 +64,7 @@ public class OneToOnePrimaryKeyJoinColumnMapper extends AbstractOneToOneMapper { .getEntityDescriptor( entityName ); if ( entityPersister.hasProxy() ) { // If possible create a proxy. Returning complete object may affect performance. - return versionsReader.getSession().load( entityClass, primaryKey ); + return versionsReader.getSession().getReference( entityClass, primaryKey ); } else { // If proxy is not allowed (e.g. @Proxy(lazy=false)) construct the original object. diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java index 15c5295ea8..ce7456da9d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/dynamic/AuditedDynamicComponentsAdvancedCasesTest.java @@ -201,7 +201,7 @@ public class AuditedDynamicComponentsAdvancedCasesTest extends BaseEnversFunctio session.getTransaction().commit(); //sanity check. Loaded entity should be equal to one that we created. - AdvancedEntity advancedEntityActual = (AdvancedEntity) session.load( AdvancedEntity.class, 1L ); + AdvancedEntity advancedEntityActual = (AdvancedEntity) session.getReference( AdvancedEntity.class, 1L ); Assert.assertEquals( advancedEntity, advancedEntityActual ); } diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SanityCheckTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SanityCheckTest.java index 6267f945c7..72e562fe80 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SanityCheckTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/SanityCheckTest.java @@ -47,7 +47,7 @@ public class SanityCheckTest extends BaseEnversFunctionalTestCase { session.getTransaction().commit(); session.getTransaction().begin(); - PlainEntity load = (PlainEntity) session.load( PlainEntity.class, 1L ); + PlainEntity load = (PlainEntity) session.getReference( PlainEntity.class, 1L ); Assert.assertEquals( plainEntity, load ); session.getTransaction().commit(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java index a5447ef999..af3af1a513 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/proxy/QueryingWithProxyObjectTest.java @@ -46,7 +46,7 @@ public class QueryingWithProxyObjectTest extends BaseEnversFunctionalTestCase { public void testQueryingWithProxyObject() { StrTestEntity originalSte = new StrTestEntity( "data", id ); // Load the proxy instance - StrTestEntity proxySte = (StrTestEntity) getSession().load( StrTestEntity.class, id ); + StrTestEntity proxySte = (StrTestEntity) getSession().getReference( StrTestEntity.class, id ); Assert.assertTrue( getAuditReader().isEntityClassAudited( proxySte.getClass() ) ); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java index 83b951ecad..9146956f84 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/performance/EvictAuditDataAfterCommitTest.java @@ -69,14 +69,14 @@ public class EvictAuditDataAfterCommitTest extends BaseEnversFunctionalTestCase checkEmptyAuditSessionCache( session, auditEntityNames ); session.getTransaction().begin(); - ed1 = (SetRefEdEntity) session.load( SetRefEdEntity.class, ed1.getId() ); + ed1 = (SetRefEdEntity) session.getReference( SetRefEdEntity.class, ed1.getId() ); ing1.setReference( ed1 ); ing2.setReference( ed1 ); session.getTransaction().commit(); checkEmptyAuditSessionCache( session, auditEntityNames ); session.getTransaction().begin(); - ed2 = (SetRefEdEntity) session.load( SetRefEdEntity.class, ed2.getId() ); + ed2 = (SetRefEdEntity) session.getReference( SetRefEdEntity.class, ed2.getId() ); Set reffering = new HashSet(); reffering.add( ing1 ); reffering.add( ing2 ); @@ -85,13 +85,13 @@ public class EvictAuditDataAfterCommitTest extends BaseEnversFunctionalTestCase checkEmptyAuditSessionCache( session, auditEntityNames ); session.getTransaction().begin(); - ed2 = (SetRefEdEntity) session.load( SetRefEdEntity.class, ed2.getId() ); + ed2 = (SetRefEdEntity) session.getReference( SetRefEdEntity.class, ed2.getId() ); ed2.getReffering().remove( ing1 ); session.getTransaction().commit(); checkEmptyAuditSessionCache( session, auditEntityNames ); session.getTransaction().begin(); - ed2 = (SetRefEdEntity) session.load( SetRefEdEntity.class, ed2.getId() ); + ed2 = (SetRefEdEntity) session.getReference( SetRefEdEntity.class, ed2.getId() ); ed2.getReffering().iterator().next().setData( "mod_data_ing_2" ); session.getTransaction().commit(); checkEmptyAuditSessionCache( session, auditEntityNames ); diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java index caf3c4926d..ffcffd7e62 100644 --- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java +++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/domain/EventManager.java @@ -32,7 +32,7 @@ public class EventManager { session.beginTransaction(); List emailList = new ArrayList(); - Event event = (Event)session.load(Event.class, eventId); + Event event = (Event)session.getReference(Event.class, eventId); for (Iterator it = event.getParticipants().iterator(); it.hasNext(); ) { Person person = (Person)it.next(); emailList.addAll(person.getEmailAddresses()); @@ -163,8 +163,8 @@ public class EventManager { Session session = sessionFactory.getCurrentSession(); session.beginTransaction(); - Person aPerson = (Person)session.load(Person.class, personId); - Event anEvent = (Event)session.load(Event.class, eventId); + Person aPerson = (Person)session.getReference(Person.class, personId); + Event anEvent = (Event)session.getReference(Event.class, eventId); aPerson.getEvents().add(anEvent); @@ -175,7 +175,7 @@ public class EventManager { Session session = sessionFactory.getCurrentSession(); session.beginTransaction(); - Person aPerson = (Person)session.load(Person.class, personId); + Person aPerson = (Person)session.getReference(Person.class, personId); account.setPerson(aPerson); session.persist(account); @@ -188,7 +188,7 @@ public class EventManager { Session session = sessionFactory.getCurrentSession(); session.beginTransaction(); - Account account = (Account)session.load(Account.class, accountId); + Account account = (Account)session.getReference(Account.class, accountId); session.getTransaction().commit(); return account; @@ -199,7 +199,7 @@ public class EventManager { Session session = sessionFactory.getCurrentSession(); session.beginTransaction(); - Person aPerson = (Person)session.load(Person.class, personId); + Person aPerson = (Person)session.getReference(Person.class, personId); // The getEmailAddresses() might trigger a lazy load of the collection aPerson.getEmailAddresses().add(emailAddress); @@ -212,7 +212,7 @@ public class EventManager { Session session = sessionFactory.getCurrentSession(); session.beginTransaction(); - Person aPerson = (Person)session.load(Person.class, personId); + Person aPerson = (Person)session.getReference(Person.class, personId); pN.setPersonId(personId.longValue()); aPerson.getPhoneNumbers().add(pN); @@ -224,7 +224,7 @@ public class EventManager { Session session = sessionFactory.getCurrentSession(); session.beginTransaction(); - Person aPerson = (Person)session.load(Person.class, personId); + Person aPerson = (Person)session.getReference(Person.class, personId); aPerson.addTalisman(talisman); session.getTransaction().commit(); diff --git a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/DirtyCalculationEventTests.java b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/DirtyCalculationEventTests.java index 9e75c2f0c5..fb6d8a28cc 100644 --- a/hibernate-jfr/src/test/java/org/hibernate/event/jfr/DirtyCalculationEventTests.java +++ b/hibernate-jfr/src/test/java/org/hibernate/event/jfr/DirtyCalculationEventTests.java @@ -44,7 +44,7 @@ public class DirtyCalculationEventTests { jfrEvents.reset(); String sessionId = scope.fromTransaction( session -> { - TestEntity testEntity = session.load( TestEntity.class, 1 ); + TestEntity testEntity = session.getReference( TestEntity.class, 1 ); testEntity.setName( "new name" ); return session.getSessionIdentifier().toString(); }