diff --git a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java index f079f9beb0..eb1da70092 100644 --- a/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java +++ b/hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java @@ -33,10 +33,10 @@ public class StatementCacheTest extends BaseCoreFunctionalTestCase { //save 2 new entities, one valid, one invalid (neither should be persisted) IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "valid 1" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); //name is required irrelevantEntity = new IrrelevantEntity(); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); try { session.flush(); Assert.fail( "Validation exception did not occur" ); @@ -53,7 +53,7 @@ public class StatementCacheTest extends BaseCoreFunctionalTestCase { //save a new entity and commit it IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "valid 2" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); } ); diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseFunctionsTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseFunctionsTest.java index 2c585c5db6..4fe93fb067 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseFunctionsTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseFunctionsTest.java @@ -57,7 +57,7 @@ public class AltibaseFunctionsTest { } person.setBinaryData( session.getLobHelper().createBlob(arry) ); person.setComments( session.getLobHelper().createClob("blahblah") ); - session.save( person ); + session.persist( person ); } ); } diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java index 4388d7cb4b..b7351e8468 100644 --- a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java +++ b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/functional/cache/SQLFunctionsInterSystemsTest.java @@ -57,7 +57,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { } @Test - public void testDialectSQLFunctions() throws Exception { + public void testDialectSQLFunctions() { Session s = openSession(); Transaction t = s.beginTransaction(); @@ -66,7 +66,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { simple.setAddress("Simple Address"); simple.setPay(new Float(45.8)); simple.setCount(2); - s.save( simple ); + s.persist( simple ); // Test to make sure allocating a specified object operates correctly. assertTrue( @@ -88,7 +88,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { assertEquals("round(45.8) result was incorrect ", new Float(46), ( (Object[]) rset.get(0) )[3] ); simple.setPay(new Float(-45.8)); - s.update(simple); + simple = s.merge(simple); // Test type conversions while using nested functions (Float to Int). rset = s.createQuery( "select abs(round(s.pay,0)) from Simple s" ).list(); @@ -101,7 +101,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { // Test the oracle standard NVL funtion as a test of multi-param functions... simple.setPay(null); - s.update(simple); + simple = s.merge(simple); Double value = (Double) s.createQuery("select mod( nvl(s.pay, 5000), 2 ) from Simple as s where s.id = 10").list().get(0); assertTrue( 0 == value.intValue() ); @@ -111,17 +111,17 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { .get(0); assertTrue( 0 == value.intValue() ); - s.delete(simple); + s.remove(simple); t.commit(); s.close(); } - public void testSetProperties() throws Exception { + public void testSetProperties() { Session s = openSession(); Transaction t = s.beginTransaction(); Simple simple = new Simple( Long.valueOf( 10 ) ); simple.setName("Simple 1"); - s.save( simple ); + s.persist( simple ); Query q = s.createQuery("from Simple s where s.name=:name and s.count=:count"); q.setProperties(simple); assertTrue( q.list().get(0)==simple ); @@ -145,18 +145,18 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { q = s.createQuery("from Simple s where s.name in (:stuff)"); q.setProperties(single); assertTrue( q.list().get(0)==simple ); - s.delete(simple); + s.remove(simple); t.commit(); s.close(); } - public void testBroken() throws Exception { + public void testBroken() { Session s = openSession(); Transaction t = s.beginTransaction(); Broken b = new Fixed(); b.setId( Long.valueOf( 123 )); b.setOtherId("foobar"); - s.save(b); + s.persist(b); s.flush(); b.setTimestamp( new Date() ); t.commit(); @@ -164,52 +164,52 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.update(b); + b = s.merge(b); t.commit(); s.close(); s = openSession(); t = s.beginTransaction(); - b = (Broken) s.load( Broken.class, b ); + b = s.getReference( Broken.class, b ); t.commit(); s.close(); s = openSession(); t = s.beginTransaction(); - s.delete(b); + s.remove(b); t.commit(); s.close(); } - public void testNothinToUpdate() throws Exception { + public void testNothinToUpdate() { Session s = openSession(); Transaction t = s.beginTransaction(); Simple simple = new Simple( Long.valueOf(10) ); simple.setName("Simple 1"); - s.save( simple ); + s.persist( simple ); t.commit(); s.close(); s = openSession(); t = s.beginTransaction(); - s.update( simple ); + simple = s.merge( simple ); t.commit(); s.close(); s = openSession(); t = s.beginTransaction(); - s.update( simple ); - s.delete(simple); + simple = s.merge( simple ); + s.remove(simple); t.commit(); s.close(); } - public void testCachedQuery() throws Exception { + public void testCachedQuery() { Session s = openSession(); Transaction t = s.beginTransaction(); Simple simple = new Simple( Long.valueOf(10) ); simple.setName("Simple 1"); - s.save( simple ); + s.persist( simple ); t.commit(); s.close(); @@ -248,8 +248,8 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.update( simple ); - s.delete(simple); + simple = s.merge( simple ); + s.remove(simple); t.commit(); s.close(); @@ -264,12 +264,12 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { s.close(); } - public void testCachedQueryRegion() throws Exception { + public void testCachedQueryRegion() { Session s = openSession(); Transaction t = s.beginTransaction(); Simple simple = new Simple( Long.valueOf(10) ); simple.setName("Simple 1"); - s.save( simple ); + s.persist( simple ); t.commit(); s.close(); @@ -300,8 +300,8 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.update( simple ); - s.delete(simple); + simple = s.merge( simple ); + s.remove(simple); t.commit(); s.close(); @@ -322,7 +322,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); Simple simple = new Simple( Long.valueOf( 10 ) ); simple.setName( "Simple 1" ); - s.save( simple ); + s.persist( simple ); s.createQuery( "from Simple s where repeat('foo', 3) = 'foofoofoo'" ).list(); s.createQuery( "from Simple s where repeat(s.name, 3) = 'foofoofoo'" ).list(); @@ -351,7 +351,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { other.setName( "Simple 2" ); other.setCount( 12 ); simple.setOther( other ); - s.save( other ); + s.persist( other ); //s.find("from Simple s where s.name ## 'cat|rat|bag'"); assertTrue( s.createQuery( "from Simple s where upper( s.other.name ) ='SIMPLE 2'" ).list().size() == 1 @@ -373,7 +373,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { ); Simple min = new Simple( Long.valueOf( 30 ) ); min.setCount( -1 ); - s.save( min ); + s.persist( min ); assertTrue( s.createQuery( "from Simple s where s.count > ( select min(sim.count) from Simple sim )" ) @@ -447,7 +447,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { assertTrue( q.list().size() == 1 ); - q = s.createQuery( "from Simple s where s.name in (:name_list) and s.count > :count" ); + q = s.createQuery( "from Simple s where s.name in (:name_list) and s.count > :count", Simple.class ); HashSet set = new HashSet(); set.add( "Simple 1" ); set.add( "foo" ); @@ -460,9 +460,9 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { sr.get(); } - s.delete( other ); - s.delete( simple ); - s.delete( min ); + s.remove( other ); + s.remove( simple ); + s.remove( min ); t.commit(); } @@ -474,7 +474,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { Blobber b = new Blobber(); b.setBlob( s.getLobHelper().createBlob( "foo/bar/baz".getBytes() ) ); b.setClob( s.getLobHelper().createClob("foo/bar/baz") ); - s.save(b); + s.persist(b); //s.refresh(b); //assertTrue( b.getClob() instanceof ClobImpl ); s.flush(); @@ -489,9 +489,9 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - b = (Blobber) s.load( Blobber.class, new Integer( b.getId() ) ); + b = s.getReference( Blobber.class, b.getId() ); Blobber b2 = new Blobber(); - s.save(b2); + s.persist(b2); b2.setBlob( b.getBlob() ); b.setBlob(null); //assertTrue( b.getClob().getSubString(1, 3).equals("fab") ); @@ -503,7 +503,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - b = (Blobber) s.load( Blobber.class, new Integer( b.getId() ) ); + b = s.getReference( Blobber.class, b.getId() ); b.setClob( s.getLobHelper().createClob("xcvfxvc xcvbx cvbx cvbx cvbxcvbxcvbxcvb") ); s.flush(); s.getTransaction().commit(); @@ -511,7 +511,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - b = (Blobber) s.load( Blobber.class, new Integer( b.getId() ) ); + b = s.getReference( Blobber.class, b.getId() ); assertTrue( b.getClob().getSubString(1, 7).equals("xcvfxvc") ); //b.getClob().setString(5, "1234567890"); s.flush(); @@ -519,7 +519,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { s.close(); } - public void testSqlFunctionAsAlias() throws Exception { + public void testSqlFunctionAsAlias() { String functionName = locateAppropriateDialectFunctionNameForAliasTest(); if (functionName == null) { log.info("Dialect does not list any no-arg functions"); @@ -533,7 +533,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); Simple simple = new Simple( Long.valueOf(10) ); simple.setName("Simple 1"); - s.save( simple ); + s.persist( simple ); t.commit(); s.close(); @@ -542,7 +542,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { List result = s.createQuery( query ).list(); assertTrue( result.size() == 1 ); assertTrue(result.get(0) instanceof Simple); - s.delete( result.get(0) ); + s.remove( result.get(0) ); t.commit(); s.close(); } @@ -564,7 +564,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); Simple simple = new Simple( Long.valueOf(10) ); simple.setName("Simple 1"); - s.save( simple ); + s.persist( simple ); t.commit(); s.close(); @@ -588,7 +588,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { t = s.beginTransaction(); Simple simple2 = new Simple( Long.valueOf(12) ); simple2.setCount(133); - s.save( simple2 ); + s.persist( simple2 ); t.commit(); s.close(); @@ -606,7 +606,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { list = q.setCacheable(true).list(); assertTrue( list.size()==2 ); for ( Object o : list ) { - s.delete( o ); + s.remove( o ); } t.commit(); s.close(); @@ -676,7 +676,7 @@ public class SQLFunctionsInterSystemsTest extends BaseCoreFunctionalTestCase { object.setDateText( "1977-07-03" ); object.setDate1( testvalue ); object.setDate3( testvalue3 ); - s.save( object ); + s.persist( object ); s.getTransaction().commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java b/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java index 3a6534a4e4..9e3768b7a0 100644 --- a/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java +++ b/hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java @@ -42,7 +42,7 @@ public class PreUpdateEventListenerVetoTest extends BaseSessionFactoryFunctional ExampleEntity entity = new ExampleEntity(); entity.id = EXAMPLE_ID_VALUE; entity.name = "old_name"; - session.save( entity ); + session.persist( entity ); } ); } @@ -53,7 +53,7 @@ public class PreUpdateEventListenerVetoTest extends BaseSessionFactoryFunctional ExampleEntity entity = session.byId( ExampleEntity.class ).load( EXAMPLE_ID_VALUE ); entity.name = "new_name"; - session.update( entity ); + entity = session.merge( entity ); final Long versionBeforeFlush = entity.version; diff --git a/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java index 5c01d13ee8..7a7971b2c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java @@ -85,13 +85,13 @@ public class NewlyInstantiatdCollectionSkipDeleteOrphanTest { public void cleanup(SessionFactoryScope scope) { scope.inTransaction( s -> { if ( up.getId() != null ) { - s.delete( up ); + s.remove( up ); } if ( vp.getId() != null ) { - s.delete( vp ); + s.remove( vp ); } if ( c.getId() != null ) { - s.delete( c ); + s.remove( c ); } } ); } @@ -107,15 +107,15 @@ public class NewlyInstantiatdCollectionSkipDeleteOrphanTest { vp.addChild( vmvp ); // Persist Child associated with versioned parent - s.saveOrUpdate( c ); + s.merge( c ); assertNotEquals( Integer.valueOf( 0 ), c.getId() ); // Persist VersionParent - s.saveOrUpdate( vp ); + s.merge( vp ); assertNotEquals( Integer.valueOf( 0 ), vp.getId() ); // Persist versioned mapping now that parent id is generated - s.saveOrUpdate( vmvp ); + s.merge( vmvp ); assertNotNull( vmvp.getId() ); assertNotEquals( Integer.valueOf( 0 ), vmvp.getId().getParentId() ); assertNotEquals( Integer.valueOf( 0 ), vmvp.getId().getChildId() ); @@ -148,15 +148,15 @@ public class NewlyInstantiatdCollectionSkipDeleteOrphanTest { up.addVersionedMappings( vmup ); // Persist child associated with versioned mapping of unversioned parent - s.saveOrUpdate( c ); + s.merge( c ); assertNotEquals( Integer.valueOf( 0 ), c.getId() ); // Persist unversioned parent - s.saveOrUpdate( up ); + s.merge( up ); assertNotEquals( Integer.valueOf( 0 ), up.getId() ); // Persist versioned mapping - s.saveOrUpdate( vmup ); + s.merge( vmup ); assertNotNull( vmup.getId() ); assertNotEquals( Integer.valueOf( 0 ), vmup.getId().getParentId() ); assertNotEquals( Integer.valueOf( 0 ), vmup.getId().getChildId() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java index 10cabc7dbf..af5d11cbac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/cid/AbstractCompositeIdTest.java @@ -29,12 +29,12 @@ public class AbstractCompositeIdTest { scope.inTransaction( session -> { - session.save( myInterface ); + session.persist( myInterface ); session.flush(); session.createQuery( "from MyInterface" ).list(); - session.delete( myInterface ); + session.remove( myInterface ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java index 0d9fbda944..c3ce4c5b89 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/abstractembeddedcomponents/propertyref/AbstractComponentPropertyRefTest.java @@ -32,7 +32,7 @@ public class AbstractComponentPropertyRefTest { AddressImpl address = new AddressImpl(); scope.inTransaction( session -> { - session.save( server ); + session.persist( server ); server.setAddress( address ); address.setServer( server ); session.flush(); @@ -45,8 +45,8 @@ public class AbstractComponentPropertyRefTest { scope.inTransaction( session -> { - session.delete( address ); - session.delete( server ); + session.remove( address ); + session.remove( server ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java index c901d4ca26..6f69d1ea38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/ConfigurationTest.java @@ -109,7 +109,7 @@ public class ConfigurationTest { Transaction tx = s.beginTransaction(); boat = (Boat) s.get( Boat.class, boat.getId() ); assertTrue( 34 != boat.getWeight(), "Annotation has precedence" ); - s.delete( boat ); + s.remove( boat ); //s.getTransaction().commit(); tx.commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java index aa943a64a0..45ee59fe43 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/EntityTest.java @@ -15,6 +15,8 @@ import java.util.EnumSet; import java.util.GregorianCalendar; import java.util.List; import java.util.TimeZone; + +import jakarta.persistence.OptimisticLockException; import jakarta.persistence.PersistenceException; import org.hibernate.HibernateException; @@ -77,7 +79,7 @@ public class EntityTest { firstOne.setName( "AF3202" ); firstOne.setDuration( new Long( 1000000 ) ); firstOne.setDurationInSec( 2000 ); - session.save( firstOne ); + session.persist( firstOne ); session.flush(); } ); @@ -105,7 +107,7 @@ public class EntityTest { firstOne.setName( "AF3202" ); firstOne.setDuration( Long.valueOf( 1000000 ) ); firstOne.setDurationInSec( 2000 ); - session.save( firstOne ); + session.persist( firstOne ); session.flush(); } ); @@ -118,7 +120,7 @@ public class EntityTest { firstOne.setName( null ); try { - session.save( firstOne ); + session.persist( firstOne ); tx.commit(); fail( "Name column should be not null" ); } @@ -179,9 +181,9 @@ public class EntityTest { sky.month = "January"; try { - session.save( sky ); + session.persist( sky ); session.flush(); - session.save( sameSky ); + session.persist( sameSky ); tx.commit(); fail( "unique constraints not respected" ); } @@ -221,10 +223,10 @@ public class EntityTest { scope.inTransaction( session -> { - session.save( sky ); + session.persist( sky ); session.flush(); - session.save( otherSky ); + session.persist( otherSky ); } ); @@ -232,7 +234,7 @@ public class EntityTest { session -> { Transaction tx = session.beginTransaction(); try { - session.save( sameSky ); + session.persist( sameSky ); tx.commit(); fail( "unique constraints not respected" ); } @@ -255,7 +257,7 @@ public class EntityTest { firstOne.setId( Long.valueOf( 2 ) ); firstOne.setName( "AF3202" ); firstOne.setDuration( Long.valueOf( 500 ) ); - session.save( firstOne ); + session.persist( firstOne ); session.flush(); } ); @@ -270,8 +272,7 @@ public class EntityTest { session -> { Flight _concurrentOne = session.get( Flight.class, Long.valueOf( 2 ) ); _concurrentOne.setDuration( Long.valueOf( 1000 ) ); - session.update( _concurrentOne ); - return _concurrentOne; + return session.merge( _concurrentOne ); } ); @@ -283,12 +284,12 @@ public class EntityTest { session -> { Transaction tx = session.beginTransaction(); firstOne.setName( "Second access" ); - session.update( firstOne ); try { + session.merge( firstOne ); tx.commit(); fail( "Optimistic locking should work" ); } - catch (PersistenceException expected) { + catch (OptimisticLockException expected) { if ( expected.getCause() instanceof StaleStateException ) { //expected } @@ -315,7 +316,7 @@ public class EntityTest { sky.month = "1"; scope.inTransaction( - session -> session.save( sky ) + session -> session.persist( sky ) ); sky.area = "London"; @@ -370,7 +371,7 @@ public class EntityTest { assertNotNull( _airFrance ); assertEquals( Long.valueOf( 10 ), _airFrance.getDuration() ); assertFalse( 25 == _airFrance.getFactor( false ) ); - session.delete( _airFrance ); + session.remove( _airFrance ); } ); } @@ -407,7 +408,7 @@ public class EntityTest { ); assertEquals( df.format( airFrance.getBuyDate() ), df.format( copyAirFrance.getBuyDate() ) ); - session.delete( copyAirFrance ); + session.remove( copyAirFrance ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java index d4663cb7d0..d8cd686a6a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/JoinedSubclassTest.java @@ -42,7 +42,7 @@ public class JoinedSubclassTest extends BaseCoreFunctionalTestCase { assertNotNull( f ); assertEquals( "Channel", f.getSea() ); assertEquals( 2, f.getSize() ); - s.delete( f ); + s.remove( f ); } ); } @@ -67,8 +67,8 @@ public class JoinedSubclassTest extends BaseCoreFunctionalTestCase { assertNotNull( f ); assertEquals( country, f.getCountry() ); assertEquals( 2, f.getSize() ); - s.delete( f ); - s.delete( f.getCountry() ); + s.remove( f ); + s.remove( f.getCountry() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java index c0ad199bb0..e526d72438 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimeStampInheritanceTest.java @@ -8,8 +8,21 @@ package org.hibernate.orm.test.annotations; import java.util.Date; import java.util.HashSet; -import java.util.Map; import java.util.Set; + +import org.hibernate.Session; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; +import org.hibernate.generator.internal.CurrentTimestampGeneration; + +import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; +import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.Jpa; +import org.hibernate.testing.orm.junit.SettingProvider; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.ElementCollection; @@ -23,46 +36,36 @@ import jakarta.persistence.Table; import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; -import org.hibernate.Session; -import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.annotations.UpdateTimestamp; -import org.hibernate.generator.internal.CurrentTimestampGeneration; -import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; - -import org.hibernate.testing.orm.junit.JiraKey; -import org.junit.Before; -import org.junit.Test; - -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNot.not; -import static org.hamcrest.core.IsNull.nullValue; -import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; /** * @author Andrea Boriero */ @JiraKey("HHH-11867") -public class UpdateTimeStampInheritanceTest extends BaseEntityManagerFunctionalTestCase { +@Jpa( + annotatedClasses = { + UpdateTimeStampInheritanceTest.Customer.class, + UpdateTimeStampInheritanceTest.AbstractPerson.class, + UpdateTimeStampInheritanceTest.Address.class + }, + settingProviders = @SettingProvider(settingName = CurrentTimestampGeneration.CLOCK_SETTING_NAME, provider = UpdateTimeStampInheritanceTest.ClockProvider.class) +) +public class UpdateTimeStampInheritanceTest { private static final String customerId = "1"; private static final MutableClock clock = new MutableClock(); - @Override - protected Class[] getAnnotatedClasses() { - return new Class[] { Customer.class, AbstractPerson.class, Address.class }; + public static class ClockProvider implements SettingProvider.Provider { + + @Override + public MutableClock getSetting() { + return clock; + } } - @Override - protected void addConfigOptions(Map options) { - super.addConfigOptions( options ); - options.put( CurrentTimestampGeneration.CLOCK_SETTING_NAME, clock ); - } - - @Before - public void setUp() { + @BeforeEach + public void setUp(EntityManagerFactoryScope scope) { clock.reset(); - doInJPA( this::entityManagerFactory, entityManager -> { + scope.inTransaction( entityManager -> { Customer customer = new Customer(); customer.setId( customerId ); customer.addAddress( "address" ); @@ -71,50 +74,58 @@ public class UpdateTimeStampInheritanceTest extends BaseEntityManagerFunctionalT clock.tick(); } + @AfterEach + public void tearDown(EntityManagerFactoryScope scope) { + scope.inTransaction( entityManager -> { + entityManager.createQuery( "delete Customer" ).executeUpdate(); + entityManager.createQuery( "delete Address" ).executeUpdate(); + } ); + } + @Test - public void updateParentClassProperty() { - doInJPA( this::entityManagerFactory, entityManager -> { + public void updateParentClassProperty(EntityManagerFactoryScope scope) { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ).isNotNull(); + assertThat( customer.getModifiedAt() ).isNotNull(); assertModifiedAtWasNotUpdated( customer ); customer.setName( "xyz" ); } ); clock.tick(); - doInJPA( this::entityManagerFactory, entityManager -> { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ).isNotNull(); + assertThat( customer.getModifiedAt() ).isNotNull(); assertModifiedAtWasUpdated( customer ); } ); } @Test - public void updateSubClassProperty() { - doInJPA( this::entityManagerFactory, entityManager -> { + public void updateSubClassProperty(EntityManagerFactoryScope scope) { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ).isNotNull(); + assertThat( customer.getModifiedAt() ).isNotNull(); assertModifiedAtWasNotUpdated( customer ); customer.setEmail( "xyz@" ); } ); clock.tick(); - doInJPA( this::entityManagerFactory, entityManager -> { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ).isNotNull(); + assertThat( customer.getModifiedAt() ).isNotNull(); assertModifiedAtWasUpdated( customer ); } ); } @Test - public void updateParentClassOneToOneAssociation() throws Exception { - doInJPA( this::entityManagerFactory, entityManager -> { + public void updateParentClassOneToOneAssociation(EntityManagerFactoryScope scope) { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ).isNotNull(); + assertThat( customer.getModifiedAt() ).isNotNull(); assertModifiedAtWasNotUpdated( customer ); Address a = new Address(); a.setStreet( "Lollard street" ); @@ -122,20 +133,20 @@ public class UpdateTimeStampInheritanceTest extends BaseEntityManagerFunctionalT } ); clock.tick(); - doInJPA( this::entityManagerFactory, entityManager -> { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ).isNotNull(); + assertThat( customer.getModifiedAt() ).isNotNull(); assertModifiedAtWasUpdated( customer ); } ); } @Test - public void updateSubClassOnrToOneAssociation() { - doInJPA( this::entityManagerFactory, entityManager -> { + public void updateSubClassOnrToOneAssociation(EntityManagerFactoryScope scope) { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ).isNotNull(); + assertThat( customer.getModifiedAt() ).isNotNull(); assertModifiedAtWasNotUpdated( customer ); Address a = new Address(); a.setStreet( "Lollard Street" ); @@ -143,20 +154,20 @@ public class UpdateTimeStampInheritanceTest extends BaseEntityManagerFunctionalT } ); clock.tick(); - doInJPA( this::entityManagerFactory, entityManager -> { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ).isNotNull(); + assertThat( customer.getModifiedAt() ).isNotNull(); assertModifiedAtWasUpdated( customer ); } ); } @Test - public void replaceParentClassElementCollection() { - doInJPA( this::entityManagerFactory, entityManager -> { + public void replaceParentClassElementCollection(EntityManagerFactoryScope scope) { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ).isNotNull(); + assertThat( customer.getModifiedAt() ).isNotNull(); assertModifiedAtWasNotUpdated( customer ); Set adresses = new HashSet<>(); adresses.add( "another address" ); @@ -164,58 +175,59 @@ public class UpdateTimeStampInheritanceTest extends BaseEntityManagerFunctionalT } ); clock.tick(); - doInJPA( this::entityManagerFactory, entityManager -> { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ).isNotNull(); + assertThat( customer.getModifiedAt() ).isNotNull(); assertModifiedAtWasUpdated( customer ); } ); } @Test - public void replaceSubClassElementCollection() { - doInJPA( this::entityManagerFactory, entityManager -> { + public void replaceSubClassElementCollection(EntityManagerFactoryScope scope) { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ).isNotNull(); + assertThat( customer.getModifiedAt() ).isNotNull(); assertModifiedAtWasNotUpdated( customer ); Set books = new HashSet<>(); customer.setBooks( books ); } ); clock.tick(); - doInJPA( this::entityManagerFactory, entityManager -> { + scope.inTransaction( entityManager -> { Customer customer = entityManager.find( Customer.class, customerId ); - assertThat( customer.getCreatedAt(), is( not( nullValue() ) ) ); - assertThat( customer.getModifiedAt(), is( not( nullValue() ) ) ); + assertThat( customer.getCreatedAt() ); + assertThat( customer.getModifiedAt() ); assertModifiedAtWasUpdated( customer ); } ); } @Test - public void updateDetachedEntity() { + public void mergeDetachedEntity(EntityManagerFactoryScope scope) { - Customer customer = doInJPA( this::entityManagerFactory, entityManager -> { - return entityManager.find( Customer.class, customerId ); - } ); + Customer customer = scope.fromTransaction( + entityManager -> + entityManager.find( Customer.class, customerId ) + ); assertModifiedAtWasNotUpdated( customer ); - doInJPA( this::entityManagerFactory, entityManager -> { - entityManager.unwrap( Session.class ).update( customer ); + scope.inTransaction( entityManager -> { + entityManager.unwrap( Session.class ).merge( customer ); } ); - doInJPA( this::entityManagerFactory, entityManager -> { - assertModifiedAtWasUpdated( entityManager.find( Customer.class, customerId ) ); + scope.inTransaction( entityManager -> { + assertModifiedAtWasNotUpdated( entityManager.find( Customer.class, customerId ) ); } ); } private void assertModifiedAtWasNotUpdated(Customer customer) { - assertTrue( (customer.getModifiedAt().getTime() - customer.getCreatedAt().getTime()) < 10 ); + assertThat( ( customer.getModifiedAt().getTime() - customer.getCreatedAt().getTime() ) ).isLessThan( 10 ); } private void assertModifiedAtWasUpdated(Customer customer) { - assertTrue( (customer.getModifiedAt().getTime() - customer.getCreatedAt().getTime()) > 10 ); + assertThat( ( customer.getModifiedAt().getTime() - customer.getCreatedAt().getTime() ) ).isGreaterThan( 10 ); } @Entity(name = "person") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java index 7a1d50389d..14f6345b3a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java @@ -47,7 +47,7 @@ public class BeanValidationGroupsTest extends BaseCoreFunctionalTestCase { fail( "invalid object should not be validated" ); } try { - s.delete( ch ); + s.remove( ch ); s.flush(); fail( "invalid object should not be persisted" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java index 04a1c834b1..d0ab3a1a2e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java @@ -66,7 +66,7 @@ public class MergeNotNullCollectionTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.delete( parent ); + s.remove( parent ); t.commit(); s.close(); } @@ -84,7 +84,7 @@ public class MergeNotNullCollectionTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.delete( parent ); + s.remove( parent ); t.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java index 3cf5070c12..c40f235f85 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java @@ -74,7 +74,7 @@ public class MergeNotNullCollectionUsingIdentityTest extends BaseCoreFunctionalT s = openSession(); t = s.beginTransaction(); - s.delete( parent ); + s.remove( parent ); t.commit(); s.close(); } @@ -93,7 +93,7 @@ public class MergeNotNullCollectionUsingIdentityTest extends BaseCoreFunctionalT s = openSession(); t = s.beginTransaction(); - s.delete( parent ); + s.remove( parent ); t.commit(); s.close(); } 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 ad10a57bda..9bde65afb9 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 @@ -26,7 +26,7 @@ public class ProxyBreakingTest extends BaseCoreFunctionalTestCase { Session s = openSession(); Transaction tx = s.beginTransaction(); Hammer h = new Hammer(); - s.save(h); + s.persist(h); s.flush(); s.clear(); assertNotNull( "The proxy creation failure is breaking things", h.getId() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeTest.java index 0c6035ea39..1e1954e8b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeTest.java @@ -110,7 +110,7 @@ public class CascadeTest { session -> { Tooth t = session.get( Tooth.class, tooth.id ); assertNotNull( t ); - session.delete( t.mouth ); + session.remove( t.mouth ); } ); scope.inTransaction( @@ -148,7 +148,7 @@ public class CascadeTest { scope.inTransaction( session -> - session.delete( session.get( Mouth.class, mouth.id ) ) + session.remove( session.get( Mouth.class, mouth.id ) ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java index f3e58dc7f2..77f74e5659 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java @@ -36,9 +36,9 @@ public class CascadeToEmbeddedManyToOneTest { pairHolders.forEach( pairHolder -> { PersonPair pair = pairHolder.getPair(); - session.delete( pairHolder ); - session.delete(pair.getLeft()); - session.delete(pair.getRight()); + session.remove( pairHolder ); + session.remove(pair.getLeft()); + session.remove(pair.getRight()); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java index 13e4c74223..f6bb358816 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/MultiCircleJpaCascadeIdentityTest.java @@ -143,18 +143,18 @@ public class MultiCircleJpaCascadeIdentityTest { scope.inTransaction( session -> { - b = (EntityB) session.merge( b ); - c = (EntityC) session.merge( c ); - d = (EntityD) session.merge( d ); - e = (EntityE) session.merge( e ); - f = (EntityF) session.merge( f ); - g = (EntityG) session.merge( g ); - session.delete( f ); - session.delete( g ); - session.delete( b ); - session.delete( d ); - session.delete( e ); - session.delete( c ); + b = session.merge( b ); + c = session.merge( c ); + d = session.merge( d ); + e = session.merge( e ); + f = session.merge( f ); + g = session.merge( g ); + session.remove( f ); + session.remove( g ); + session.remove( b ); + session.remove( d ); + session.remove( e ); + session.remove( c ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java index b33d34f344..15161001ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/MultiCircleJpaCascadeSequenceTest.java @@ -147,12 +147,12 @@ public class MultiCircleJpaCascadeSequenceTest { e = (E) session.merge( e ); f = (F) session.merge( f ); g = (G) session.merge( g ); - session.delete( f ); - session.delete( g ); - session.delete( b ); - session.delete( d ); - session.delete( e ); - session.delete( c ); + session.remove( f ); + session.remove( g ); + session.remove( b ); + session.remove( d ); + session.remove( e ); + session.remove( c ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java index a7b6dbde4a..ea580e06b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/MultiCircleNonJpaCascadeIdentityTest.java @@ -145,18 +145,18 @@ public class MultiCircleNonJpaCascadeIdentityTest { scope.inTransaction( session -> { - b = (EntityB) session.merge( b ); - c = (EntityC) session.merge( c ); - d = (EntityD) session.merge( d ); - e = (EntityE) session.merge( e ); - f = (EntityF) session.merge( f ); - g = (EntityG) session.merge( g ); - session.delete( f ); - session.delete( g ); - session.delete( b ); - session.delete( d ); - session.delete( e ); - session.delete( c ); + b = session.merge( b ); + c = session.merge( c ); + d = session.merge( d ); + e = session.merge( e ); + f = session.merge( f ); + g = session.merge( g ); + session.remove( f ); + session.remove( g ); + session.remove( b ); + session.remove( d ); + session.remove( e ); + session.remove( c ); } ); } @@ -170,29 +170,11 @@ public class MultiCircleNonJpaCascadeIdentityTest { check( scope ); } - @Test - public void testSave(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.save( b ) - ); - - check( scope ); - } - - @Test - public void testSaveOrUpdate(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.saveOrUpdate( b ) - ); - - check( scope ); - } - @Test public void testMerge(SessionFactoryScope scope) { scope.inTransaction( session -> { - b = (EntityB) session.merge( b ); + b = session.merge( b ); c = b.getC(); d = b.getD(); e = d.getE(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java index 1ce139680d..8dc766129d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/MultiCircleNonJpaCascadeSequenceTest.java @@ -141,18 +141,18 @@ public class MultiCircleNonJpaCascadeSequenceTest { scope.inTransaction( session -> { - b = (B) session.merge( b ); - c = (C) session.merge( c ); - d = (D) session.merge( d ); - e = (E) session.merge( e ); - f = (F) session.merge( f ); - g = (G) session.merge( g ); - session.delete( f ); - session.delete( g ); - session.delete( b ); - session.delete( d ); - session.delete( e ); - session.delete( c ); + b = session.merge( b ); + c = session.merge( c ); + d = session.merge( d ); + e = session.merge( e ); + f = session.merge( f ); + g = session.merge( g ); + session.remove( f ); + session.remove( g ); + session.remove( b ); + session.remove( d ); + session.remove( e ); + session.remove( c ); } ); } @@ -166,29 +166,11 @@ public class MultiCircleNonJpaCascadeSequenceTest { check( scope ); } - @Test - public void testSave(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.save( b ) - ); - - check( scope ); - } - - @Test - public void testSaveOrUpdate(SessionFactoryScope scope) { - scope.inTransaction( - session -> session.saveOrUpdate( b ) - ); - - check( scope ); - } - @Test public void testMerge(SessionFactoryScope scope) { scope.inTransaction( session -> { - b = (B) session.merge( b ); + b = session.merge( b ); c = b.getC(); d = b.getD(); e = d.getE(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java index 3105ba377f..cec091affe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java @@ -148,8 +148,8 @@ public class CompositeIdTest { //FIXME mke it work in unambigious cases // assertNotNull(c.id.parent.id); // assertEquals(p.id.getFirstName(), c.id.parent.id.getFirstName()); - session.delete( c ); - session.delete( c.id.parent ); + session.remove( c ); + session.remove( c.id.parent ); } ); } @@ -231,8 +231,8 @@ public class CompositeIdTest { //FIXME mke it work in unambigious cases // assertNotNull(c.id.parent.id); // assertEquals(p.id.getFirstName(), c.id.parent.id.getFirstName()); - session.delete( c ); - session.delete( c.id.parent ); + session.remove( c ); + session.remove( c.id.parent ); } ); } @@ -262,9 +262,9 @@ public class CompositeIdTest { assertEquals( channel.id, mag.id.channel.id ); assertNotNull( mag.id.presenter ); assertEquals( pres.name, mag.id.presenter.name ); - session.delete( mag ); - session.delete( mag.id.channel ); - session.delete( mag.id.presenter ); + session.remove( mag ); + session.remove( mag.id.channel ); + session.remove( mag.id.presenter ); } ); } @@ -423,9 +423,9 @@ public class CompositeIdTest { assertNotNull( program.id.presenter ); assertNotNull( program.text ); assertEquals( pres.name, program.id.presenter.name ); - session.delete( program ); - session.delete( program.id.channel ); - session.delete( program.id.presenter ); + session.remove( program ); + session.remove( program.id.channel ); + session.remove( program.id.presenter ); } ); } @@ -454,9 +454,9 @@ public class CompositeIdTest { assertNotNull( program.presenter ); assertNotNull( program.text ); assertEquals( pres.name, program.presenter.name ); - session.delete( program ); - session.delete( program.channel ); - session.delete( program.presenter ); + session.remove( program ); + session.remove( program.channel ); + session.remove( program.presenter ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/EagerKeyManyToOneTest.java index 4e96edeb3f..37c0424b42 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/EagerKeyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/association/EagerKeyManyToOneTest.java @@ -51,8 +51,8 @@ public class EagerKeyManyToOneTest { scope.inTransaction( session -> { Card card = session.get( Card.class, CARD_ID ); - session.delete( card.getField()); - session.delete( card ); + session.remove( card.getField()); + session.remove( card ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java index 1f7568f27f..6337a8b9d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java @@ -111,7 +111,7 @@ public class DefaultNamingCollectionElementTest { "select boy from Boy boy join boy.nickNames names where names = :name" ) .setParameter( "name", "Thing" ).list(); assertEquals( 1, result.size() ); - session.delete( boy ); + session.remove( boy ); } ); } @@ -141,7 +141,7 @@ public class DefaultNamingCollectionElementTest { assertTrue( boy.getFavoriteToys().contains( toy ) ); Toy next = boy.getFavoriteToys().iterator().next(); assertEquals( boy, next.getOwner(), "@Parent is failing" ); - session.delete( boy ); + session.remove( boy ); } ); } @@ -171,8 +171,8 @@ public class DefaultNamingCollectionElementTest { session.beginTransaction(); boy = session.get( Boy.class, boy.getId() ); assertTrue( boy.getCountryAttitudes().contains( attitude ) ); - session.delete( boy ); - session.delete( session.get( Country.class, country.getId() ) ); + session.remove( boy ); + session.remove( session.get( Country.class, country.getId() ) ); } ); } @@ -220,7 +220,7 @@ public class DefaultNamingCollectionElementTest { "select boy from Boy boy join boy.nickNames names where names = :name" ) .setParameter( "name", "Thing" ).list(); assertEquals( 1, result.size() ); - session.delete( boy ); + session.remove( boy ); } ); } @@ -234,7 +234,7 @@ public class DefaultNamingCollectionElementTest { LocalizedString title = new LocalizedString( "title in english" ); title.getVariations().put( Locale.FRENCH.getLanguage(), "title en francais" ); test.setTitle( title ); - session.save( test ); + session.persist( test ); session.flush(); session.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java index e71ebfdbd6..12354d9359 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java @@ -64,7 +64,7 @@ public class EmbeddableCollectionElementWithLazyManyToOneTest { scope.inTransaction( session -> - session.delete( p ) + session.remove( p ) ); } @@ -91,7 +91,7 @@ public class EmbeddableCollectionElementWithLazyManyToOneTest { scope.inTransaction( session -> - session.delete( p ) + session.remove( p ) ); } @@ -121,7 +121,7 @@ public class EmbeddableCollectionElementWithLazyManyToOneTest { scope.inTransaction( session -> - session.delete( p ) + session.remove( p ) ); } @@ -147,7 +147,7 @@ public class EmbeddableCollectionElementWithLazyManyToOneTest { scope.inTransaction( session -> - session.delete( p ) + session.remove( p ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java index adbf2a50d9..d33d4ab07b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java @@ -36,14 +36,14 @@ public class QueryTest { entityWithAnElementCollection.addSomeString( "abc" ); entityWithAnElementCollection.addSomeString( "efg" ); - session.save( entityWithAnElementCollection ); + session.persist( entityWithAnElementCollection ); EntityWithAnElementCollection entityWithAnElementCollection2 = new EntityWithAnElementCollection(); entityWithAnElementCollection2.setId( 2L ); entityWithAnElementCollection2.addSomeString( "hil" ); entityWithAnElementCollection2.addSomeString( "mnp" ); - session.save( entityWithAnElementCollection2 ); + session.persist( entityWithAnElementCollection2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java index b914af1aa6..358417771f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java @@ -34,7 +34,7 @@ public class TestBasicOps { Query q = new Query( new Location( "first", Location.Type.COUNTY ) ); scope.inTransaction( session -> - session.save( q ) + session.persist( q ) ); scope.inTransaction( @@ -43,7 +43,7 @@ public class TestBasicOps { assertEquals( 1, q1.getIncludedLocations().size() ); Location l = q1.getIncludedLocations().iterator().next(); assertEquals( Location.Type.COUNTY, l.getType() ); - session.delete( q1 ); + session.remove( q1 ); } ); } @@ -54,13 +54,13 @@ public class TestBasicOps { scope.inTransaction( session -> { Query q = new Query( new Location( null, Location.Type.COMMUNE ) ); - session.save( q ); + session.persist( q ); session.getTransaction().commit(); session.clear(); Transaction transaction = session.beginTransaction(); q.getIncludedLocations().add( new Location( null, Location.Type.COUNTY ) ); - session.update( q ); + session.merge( q ); transaction.commit(); session.clear(); @@ -74,14 +74,14 @@ public class TestBasicOps { Iterator itr = q.getIncludedLocations().iterator(); itr.next(); itr.remove(); - session.update( q ); + session.merge( q ); transaction.commit(); session.clear(); session.beginTransaction(); q = session.get( Query.class, q.getId() ); assertEquals( 1, q.getIncludedLocations().size() ); - session.delete( q ); + session.remove( q ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java index 2f17116bc4..63d5d5787f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/indexedCollection/IndexedCollectionOfElementsTest.java @@ -35,7 +35,7 @@ public class IndexedCollectionOfElementsTest { scope.inTransaction( session -> { - session.save( sale ); + session.persist( sale ); session.flush(); session.get( Sale.class, sale.getId() ); assertEquals( 1, sale.getContacts().size() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java index 45759a750a..f4de3b3fab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java @@ -83,8 +83,8 @@ public class ElementCollectionSortingTest { lukasz.getNickNamesDescendingNaturalSort().add( "lantoniak" ); lukasz.getNickNamesDescendingNaturalSort().add( "antoniak" ); - session.save( steve ); - session.save( lukasz ); + session.persist( steve ); + session.persist( lukasz ); session.flush(); session.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java index 753840e170..2e96f08973 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java @@ -48,12 +48,12 @@ public class RecreateCollectionTest { Poi poi1 = new Poi( "Poi 1" ); Poi poi2 = new Poi( "Poi 2" ); - session.save( poi1 ); - session.save( poi2 ); + session.persist( poi1 ); + session.persist( poi2 ); RaceExecution race = new RaceExecution(); - session.save( race ); + session.persist( race ); Date currentTime = new Date(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java index f7aa6dbeb2..05e5ef6c80 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/dataTypes/BasicOperationsTest.java @@ -73,8 +73,8 @@ public class BasicOperationsTest { session.doWork( new ValidateRowCount( session, SOME_ENTITY_TABLE_NAME, 0 ) ); session.doWork( new ValidateRowCount( session, SOME_OTHER_ENTITY_TABLE_NAME, 0 ) ); - session.save( someEntity ); - session.save( someOtherEntity ); + session.persist( someEntity ); + session.persist( someOtherEntity ); } ); @@ -86,8 +86,8 @@ public class BasicOperationsTest { try { session.beginTransaction(); - session.delete( someEntity ); - session.delete( someOtherEntity ); + session.remove( someEntity ); + session.remove( someOtherEntity ); session.getTransaction().commit(); } finally { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java index 408a70b377..8ebb5eb12c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java @@ -46,7 +46,7 @@ public class CompositeDerivedIdentityTest { scope.inTransaction( session -> { - session.save( product ); + session.persist( product ); } ); @@ -56,7 +56,7 @@ public class CompositeDerivedIdentityTest { scope.inTransaction( session -> { - session.save( order ); + session.persist( order ); } ); @@ -66,7 +66,7 @@ public class CompositeDerivedIdentityTest { session -> { Order o = session.get( Order.class, orderId ); assertEquals( 1, o.getLineItems().size() ); - session.delete( o ); + session.remove( o ); } ); } @@ -79,7 +79,7 @@ public class CompositeDerivedIdentityTest { scope.inTransaction( session -> - session.save( product ) + session.persist( product ) ); Order order = new Order(); @@ -88,7 +88,7 @@ public class CompositeDerivedIdentityTest { scope.inTransaction( session -> - session.save( order ) + session.persist( order ) ); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java index a33a190968..bcf85d7642 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java @@ -138,7 +138,7 @@ public class ManyToOneEagerDerivedIdFetchModeJoinTest { @AfterEach public void cleanupData(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.delete( session.find( Foo.class, foo.id ) ); + session.remove( session.find( Foo.class, foo.id ) ); } ); this.foo = null; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java index 208f20706b..46b9fa35cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/a/DerivedIdentitySimpleParentIdClassDepTest.java @@ -55,8 +55,8 @@ public class DerivedIdentitySimpleParentIdClassDepTest { assertEquals( e.empId, d.getEmp().empId ); assertEquals( e.empName, d.getEmp().empName ); assertEquals( e.nickname, d.getEmp().nickname ); - session.delete( d ); - session.delete( d.getEmp() ); + session.remove( d ); + session.remove( d.getEmp() ); } ); } @@ -78,8 +78,8 @@ public class DerivedIdentitySimpleParentIdClassDepTest { assertEquals( 1, depList.size() ); Object newDependent = depList.get( 0 ); assertSame( d, newDependent ); - session.delete( d ); - session.delete( d.getEmp() ); + session.remove( d ); + session.remove( d.getEmp() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java index 96849a1939..37d5b6f891 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e1/b/specjmapid/lazy/CompositeKeyDeleteTest.java @@ -89,7 +89,7 @@ public class CompositeKeyDeleteTest extends BaseCoreFunctionalTestCase { Assert.assertEquals(2, list.size()); CustomerInventoryTwo ci = list.get(1); list.remove(ci); - s.delete(ci); + s.remove(ci); s.flush(); tx.commit();//fail diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java index bff5b4d9dd..c0697e1d03 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e2/a/DerivedIdentityIdClassParentIdClassDepTest.java @@ -63,8 +63,8 @@ public class DerivedIdentityIdClassParentIdClassDepTest { assertNotNull( d.emp ); assertEquals( e.firstName, d.emp.firstName ); - session.delete( d ); - session.delete( d.emp ); + session.remove( d ); + session.remove( d.emp ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java index c0892ad454..8aa77e83ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e3/a/DerivedIdentityEmbeddedIdParentIdClassTest.java @@ -63,8 +63,8 @@ public class DerivedIdentityEmbeddedIdParentIdClassTest { d = session.get( Dependent.class, dId ); assertNotNull( d.emp ); assertEquals( e.empId.firstName, d.emp.empId.firstName ); - session.delete( d ); - session.delete( d.emp ); + session.remove( d ); + session.remove( d.emp ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java index 946c6d6178..a40e477df7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/a/DerivedIdentitySimpleParentSimpleDepTest.java @@ -109,8 +109,8 @@ public class DerivedIdentitySimpleParentSimpleDepTest { session -> { FinancialHistory history = session.get( FinancialHistory.class, "aaa" ); if ( history != null ) { - session.delete( history ); - session.delete( history.patient ); + session.remove( history ); + session.remove( history.patient ); } } ); @@ -119,8 +119,8 @@ public class DerivedIdentitySimpleParentSimpleDepTest { session -> { MedicalHistory history = session.get( MedicalHistory.class, "aaa" ); if ( history != null ) { - session.delete( history ); - session.delete( history.patient ); + session.remove( history ); + session.remove( history.patient ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java index 650c96d178..89c3833d02 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/b/DerivedIdentitySimpleParentSimpleDepMapsIdTest.java @@ -109,8 +109,8 @@ public class DerivedIdentitySimpleParentSimpleDepMapsIdTest extends BaseNonConfi s = openSession(); s.beginTransaction(); - s.delete( medicalHistory ); - s.delete( person ); + s.remove( medicalHistory ); + s.remove( person ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java index 1cf2b30976..15349259ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/a/DerivedIdentityIdClassParentSameIdTypeIdClassDepTest.java @@ -56,8 +56,8 @@ public class DerivedIdentityIdClassParentSameIdTypeIdClassDepTest { Person p2 = session.get( Person.class, pId ); assertEquals( pId.firstName, d2.patient.firstName ); assertEquals( pId.firstName, p2.firstName ); - session.delete( d2 ); - session.delete( p2 ); + session.remove( d2 ); + session.remove( p2 ); } ); } @@ -88,8 +88,8 @@ public class DerivedIdentityIdClassParentSameIdTypeIdClassDepTest { Person p2 = session.get( Person.class, pId ); assertEquals( pId.firstName, d2.patient.firstName ); assertEquals( pId.firstName, p2.firstName ); - session.delete( d2 ); - session.delete( p2 ); + session.remove( d2 ); + session.remove( p2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java index 9a7cf43eac..d284b39223 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/b/DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest.java @@ -62,8 +62,8 @@ public class DerivedIdentityIdClassParentSameIdTypeEmbeddedIdDepTest { Person p2 = session.get( Person.class, pId ); assertEquals( pId.firstName, d2.patient.firstName ); assertEquals( pId.firstName, p2.firstName ); - session.delete( d2 ); - session.delete( p2 ); + session.remove( d2 ); + session.remove( p2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java index 6243ce6cfe..2d6386bfd4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e5/c/ForeignGeneratorViaMapsIdTest.java @@ -32,10 +32,10 @@ public class ForeignGeneratorViaMapsIdTest extends BaseNonConfigCoreFunctionalTe s.persist( d ); s.flush(); s.clear(); - d = (MedicalHistory) s.get( MedicalHistory.class, e.id); + d = s.get( MedicalHistory.class, e.id); assertEquals( e.id, d.id ); - s.delete( d ); - s.delete( d.patient ); + s.remove( d ); + s.remove( d.patient ); s.getTransaction().rollback(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java index 0e805b05ca..ab60c6298a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e6/a/DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest.java @@ -59,8 +59,8 @@ public class DerivedIdentityEmbeddedIdParentSameIdTypeIdClassDepTest { d = session.get( MedicalHistory.class, pId ); assertEquals( pId.firstName, d.patient.id.firstName ); - session.delete( d ); - session.delete( d.patient ); + session.remove( d ); + session.remove( d.patient ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableIntegratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableIntegratorTest.java index e1719eb2bf..90b3bb2170 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableIntegratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableIntegratorTest.java @@ -51,7 +51,7 @@ public class EmbeddableIntegratorTest { Investor myInv = getInvestor(); myInv.setId( 1L ); - sess.save( myInv ); + sess.persist( myInv ); sess.flush(); fail( "A JDBCException expected" ); @@ -85,7 +85,7 @@ public class EmbeddableIntegratorTest { Investor myInv = getInvestor(); myInv.setId( 2L ); - sess.save( myInv ); + sess.persist( myInv ); sess.flush(); sess.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/AbstractEmbeddableWithManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/AbstractEmbeddableWithManyToManyTest.java index 1ddff3d91e..e26f1c0345 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/AbstractEmbeddableWithManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/AbstractEmbeddableWithManyToManyTest.java @@ -5,7 +5,6 @@ import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.BootstrapServiceRegistry; import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.testing.util.ServiceRegistryUtil; import org.junit.jupiter.api.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java index 23c511b5c5..ebcf91812a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableBiDirectionalSelfReferenceTest.java @@ -51,7 +51,7 @@ public class EmbeddableBiDirectionalSelfReferenceTest { embeddable.setStringField( "Fab" ); entity.setEmbeddedAttribute( embeddable ); - session.save( entity ); + session.persist( entity ); } ); } @@ -62,7 +62,7 @@ public class EmbeddableBiDirectionalSelfReferenceTest { session -> { List results = session.createQuery( "from EntityTest" ).list(); results.forEach( - result -> session.delete( result ) + result -> session.remove( result ) ); } ); @@ -105,9 +105,9 @@ public class EmbeddableBiDirectionalSelfReferenceTest { embeddable2.setStringField( "Acme2" ); entity2.setEmbeddedAttribute( embeddable2 ); - session.save( entity ); - session.save( entity2 ); - session.save( entity3 ); + session.persist( entity ); + session.persist( entity2 ); + session.persist( entity3 ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java index 05f0f9c96e..4260f2c7d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneCircularityTest.java @@ -49,8 +49,8 @@ public class EmbeddableWithManyToOneCircularityTest { entityTest2.setEmbeddedAttribute( embeddable ); entity.setEntity2( entityTest2 ); - session.save( entity ); - session.save( entityTest2 ); + session.persist( entity ); + session.persist( entityTest2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java index 6a611c7102..956c3b7904 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/EmbeddableWithManyToOneTest.java @@ -51,8 +51,8 @@ public class EmbeddableWithManyToOneTest { entityTest2.setEmbeddedAttribute( embeddable ); entity.setEntity2( entityTest2 ); - session.save( entity ); - session.save( entityTest2 ); + session.persist( entity ); + session.persist( entityTest2 ); } ); } @@ -104,9 +104,9 @@ public class EmbeddableWithManyToOneTest { entityTest2.setEmbeddedAttribute( embeddable ); entity.setEntity2( entityTest2 ); - session.save( entity ); - session.save( entity3 ); - session.save( entityTest2 ); + session.persist( entity ); + session.persist( entity3 ); + session.persist( entityTest2 ); } ); SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); @@ -143,10 +143,10 @@ public class EmbeddableWithManyToOneTest { entityTest.setEmbeddedAttribute( embeddable ); entity.setEntity2( entityTest ); - session.save( entity ); - session.save( entity3 ); - session.save( entityTest ); - session.save( entityTest2 ); + session.persist( entity ); + session.persist( entity3 ); + session.persist( entityTest ); + session.persist( entityTest2 ); } ); SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); 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 1eaac87c85..8276fd4ff2 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 @@ -62,10 +62,10 @@ public class EmbeddableWithMany2OneTest { session.createQuery( "from Person p where p.address.country.id = 'US'" ) .list(); Person p = session.load( Person.class, person.getId() ); - session.delete( p ); + session.remove( p ); List countries = session.createQuery( "from Country" ).list(); assertEquals( 1, countries.size() ); - session.delete( countries.get( 0 ) ); + session.remove( countries.get( 0 ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java index 46c46177b0..4fae3e8e02 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/one2many/EmbeddableWithOne2ManyTest.java @@ -33,7 +33,7 @@ public class EmbeddableWithOne2ManyTest { // but i cannot do this checking until HHH-4599 is done. scope.inTransaction( session -> { - session.createQuery( "from Person p join p.name.aliases a where a.source = 'FBI'" ) + session.createQuery( "from Person p join p.name.aliases a where a.source = 'FBI'", Person.class ) .list(); } ); @@ -53,9 +53,9 @@ public class EmbeddableWithOne2ManyTest { ); scope.inTransaction( session -> { - Person p = (Person) session.load( Person.class, person.getId() ); - session.delete( p ); - List aliases = session.createQuery( "from Alias" ).list(); + Person p = session.getReference( Person.class, person.getId() ); + session.remove( p ); + List aliases = session.createQuery( "from Alias", Alias.class ).list(); assertEquals( 0, aliases.size() ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java index cb21212387..45e0a4efb2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/engine/collection/UnidirCollectionWithMultipleOwnerTest.java @@ -34,27 +34,27 @@ public class UnidirCollectionWithMultipleOwnerTest { try { Father father = new Father(); Mother mother = new Mother(); - session.save( father ); - //s.save( mother ); + session.persist( father ); + //s.persist( mother ); Son son = new Son(); father.getOrderedSons().add( son ); son.setFather( father ); mother.getSons().add( son ); son.setMother( mother ); - session.save( mother ); - session.save( father ); + session.persist( mother ); + session.persist( father ); tx.commit(); session.clear(); tx = session.beginTransaction(); son = session.get( Son.class, son.getId() ); - session.delete( son ); + session.remove( son ); session.flush(); father = session.get( Father.class, father.getId() ); mother = session.get( Mother.class, mother.getId() ); - session.delete( father ); - session.delete( mother ); + session.remove( father ); + session.remove( mother ); tx.commit(); } catch (Exception e) { 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 f52ae0493a..0194eb7472 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 @@ -84,7 +84,7 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - s.delete( s.get( Forest.class, forest.getId() ) ); + s.remove( s.get( Forest.class, forest.getId() ) ); tx.commit(); s.close(); } @@ -131,7 +131,7 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - s.delete( s.get( Forest.class, forest.getId() ) ); + s.remove( s.get( Forest.class, forest.getId() ) ); tx.commit(); s.close(); } @@ -218,10 +218,10 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - f = (Forest) s.get( Forest.class, f.getId() ); + f = s.get( Forest.class, f.getId() ); assertNotNull( f ); assertEquals( description, f.getLongDescription() ); - s.delete( f ); + s.remove( f ); tx.commit(); s.close(); @@ -622,10 +622,10 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - airFrance = (Flight) s.get( Flight.class, airFrance.getId() ); + airFrance = s.get( Flight.class, airFrance.getId() ); assertNotNull( airFrance ); assertEquals( 10000000, airFrance.getMaxAltitudeInMilimeter() ); - s.delete( airFrance ); + s.remove( airFrance ); tx.commit(); s.close(); } @@ -646,11 +646,11 @@ public class BasicHibernateAnnotationsTest extends BaseCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); contactDetails = - (ContactDetails) s.get( ContactDetails.class, contactDetails.getId() ); + s.get( ContactDetails.class, contactDetails.getId() ); assertNotNull( contactDetails ); assertEquals( "999999", contactDetails.getLocalPhoneNumber().getNumber() ); assertEquals( "041111111", contactDetails.getOverseasPhoneNumber().getNumber() ); - s.delete(contactDetails); + s.remove(contactDetails); tx.commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java index 2f2058b0c3..3f341aec28 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/Java5FeaturesTest.java @@ -88,13 +88,13 @@ public class Java5FeaturesTest extends BaseCoreFunctionalTestCase { communityBid = (CommunityBid) s.get( CommunityBid.class, communityBid.getId() ); assertNull( bid.getNote() ); assertEquals( Starred.OK, communityBid.getCommunityNote() ); - s.delete( bid ); + s.remove( bid ); s.clear(); communityBid = (CommunityBid) s.createNativeQuery( "select {b.*} from Bid b where b.id = ?" ) .addEntity( "b", CommunityBid.class ) .setParameter( 1, communityBid.getId() ).uniqueResult(); assertEquals( Starred.OK, communityBid.getCommunityNote() ); - s.delete( communityBid ); + s.remove( communityBid ); tx.commit(); s.close(); } @@ -118,7 +118,7 @@ public class Java5FeaturesTest extends BaseCoreFunctionalTestCase { tx = s.beginTransaction(); bid = (Bid) s.get( Bid.class, bid.getId() ); assertEquals( null, bid.getApproved() ); - s.delete( bid ); + s.remove( bid ); tx.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PropertyDefaultMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PropertyDefaultMappingsTest.java index 8a506e4e84..7aa8b4d208 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PropertyDefaultMappingsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/PropertyDefaultMappingsTest.java @@ -55,9 +55,9 @@ public class PropertyDefaultMappingsTest extends BaseCoreFunctionalTestCase { tx.commit(); s.clear(); tx = s.beginTransaction(); - wm = (WashingMachine) s.get( WashingMachine.class, wm.getId() ); + wm = s.get( WashingMachine.class, wm.getId() ); assertFalse( "transient should not be persistent", wm.isActive() ); - s.delete( wm ); + s.remove( wm ); tx.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java index 1e188eeaf5..9418ea6c65 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java @@ -43,7 +43,7 @@ public class EntityNonEntityTest extends BaseCoreFunctionalTestCase { assertTrue( "mapped superclass under entity", gsm.isNumeric ); assertNull( "non entity under entity", gsm.brand ); assertEquals( "leaf entity", 900, gsm.frequency ); - s.delete( gsm ); + s.remove( gsm ); tx.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java index cc17747cd2..24a664129f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java @@ -26,20 +26,20 @@ public class MapKeyEnumeratedTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); User user = new User("User1", SocialNetwork.STUB_NETWORK_NAME, "facebookId"); - s.save( user ); + s.persist( user ); s.getTransaction().commit(); s.close(); s = openSession(); s.beginTransaction(); - user = (User) s.get( User.class, user.getId() ); + user = s.get( User.class, user.getId() ); s.getTransaction().commit(); s.close(); s = openSession(); s.beginTransaction(); - user = (User) s.get( User.class, user.getId() ); - s.delete( user ); + user = s.get( User.class, user.getId() ); + s.remove( user ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java index 0688195bbd..6171b6024f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetch/FetchingTest.java @@ -42,7 +42,7 @@ public class FetchingTest extends BaseCoreFunctionalTestCase { p = (Person) s.createQuery( "from Person p where p.firstName = :name" ) .setParameter( "name", "Gavin" ).uniqueResult(); assertFalse( Hibernate.isInitialized( p.getStays() ) ); - s.delete( p ); + s.remove( p ); tx.commit(); s.close(); } @@ -67,7 +67,7 @@ public class FetchingTest extends BaseCoreFunctionalTestCase { assertFalse( Hibernate.isInitialized( p.getOrderedStay() ) ); assertEquals( "A380", p.getOrderedStay().get(0).getVessel() ); assertFalse( Hibernate.isInitialized( p.getOrderedStay() ) ); - s.delete( p ); + s.remove( p ); tx.commit(); s.close(); } @@ -105,7 +105,7 @@ public class FetchingTest extends BaseCoreFunctionalTestCase { "FetchMode.JOIN should overrides lazy options", Hibernate.isInitialized( stay3.getVeryOldPerson() ) ); - s.delete( stay3.getVeryOldPerson() ); + s.remove( stay3.getVeryOldPerson() ); tx.commit(); }finally { if ( tx.isActive() ) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java index 5369f96f33..ef27cf43f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java @@ -34,8 +34,8 @@ public class MappedByFetchProfileFunctionTest extends BaseCoreFunctionalTestCase address = session.get(Address.class, address.getId()); assertTrue(Hibernate.isInitialized(address.getCustomer())); - session.delete(address.getCustomer()); - session.delete(address); + session.remove(address.getCustomer()); + session.remove(address); transaction.commit(); session.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MoreFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MoreFetchProfileTest.java index 55d39cb30e..bb63cfb898 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MoreFetchProfileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MoreFetchProfileTest.java @@ -60,12 +60,12 @@ public class MoreFetchProfileTest extends BaseCoreFunctionalTestCase { } final Order order = c.getOrders().iterator().next(); c.getOrders().remove( order ); - s.delete( c ); + s.remove( c ); final Order lastOrder = c.getLastOrder(); c.setLastOrder( null ); - s.delete( order.getCountry() ); - s.delete( lastOrder ); - s.delete( order ); + s.remove( order.getCountry() ); + s.remove( lastOrder ); + s.remove( order ); transaction.commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedGenericsTest.java index 9570557ffc..73a73edd5c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedGenericsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedGenericsTest.java @@ -71,7 +71,7 @@ public class EmbeddedGenericsTest { session -> { Classes.PopularBook retrieved = session.get( Classes.PopularBook.class, b.id ); assertEquals( "Second", retrieved.editions.iterator().next().name ); - session.delete( retrieved ); + session.remove( retrieved ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericsTest.java index baf80f25c5..5a16f392d2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericsTest.java @@ -69,10 +69,10 @@ public class GenericsTest { s = scope.getSessionFactory().openSession(); tx = s.beginTransaction(); white = s.get( Paper.class, white.getId() ); - s.delete( white.getType() ); - s.delete( white.getOwner() ); - s.delete( white.getValue() ); - s.delete( white ); + s.remove( white.getType() ); + s.remove( white.getOwner() ); + s.remove( white.getValue() ); + s.remove( white ); tx.commit(); //s.close(); assertFalse( s.isOpen() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java index 1546baf937..e980e24734 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java @@ -47,7 +47,7 @@ public class EnumIdTest { session -> { PlanetCheatSheet mercuryFromDb = session.get( PlanetCheatSheet.class, mercury.getPlanet() ); assertNotNull( mercuryFromDb ); - session.delete( mercuryFromDb ); + session.remove( mercuryFromDb ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java index 6cde6906fe..46a33cbde2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdTest.java @@ -62,7 +62,7 @@ public class IdTest { Hotel hotel = new Hotel(); hotel.setId( 12L ); hotel.setName( "California" ); - session.saveOrUpdate( hotel ); + session.merge( hotel ); } ); @@ -81,7 +81,7 @@ public class IdTest { scope.inTransaction( session -> { savedHotel.setName( "Hotel du nord" ); - session.saveOrUpdate( savedHotel ); + session.merge( savedHotel ); } ); @@ -90,7 +90,7 @@ public class IdTest { Hotel hotel = session.get( Hotel.class, 12L ); assertNotNull( hotel ); assertEquals( "Hotel du nord", hotel.getName() ); - session.delete( hotel ); + session.remove( hotel ); } ); } @@ -114,8 +114,8 @@ public class IdTest { Furniture furFromDb = session.get( Furniture.class, fur.getId() ); assertNotNull( systemFromDb ); assertNotNull( furFromDb ); - session.delete( systemFromDb ); - session.delete( furFromDb ); + session.remove( systemFromDb ); + session.remove( furFromDb ); } ); } @@ -132,7 +132,7 @@ public class IdTest { session.persist( monkey ); session.flush(); assertNotNull( monkey.getId() ); - session.delete( monkey ); + session.remove( monkey ); } ); } @@ -157,9 +157,9 @@ public class IdTest { scope.inTransaction( session -> { - session.delete( session.get( Ball.class, 1 ) ); - session.delete( session.get( Dog.class, 1 ) ); - session.delete( session.get( Computer.class, 1L ) ); + session.remove( session.get( Ball.class, 1 ) ); + session.remove( session.get( Dog.class, 1 ) ); + session.remove( session.get( Computer.class, 1L ) ); } ); } @@ -176,7 +176,7 @@ public class IdTest { scope.inTransaction( session -> - session.delete( session.get( Shoe.class, b.getId() ) ) + session.remove( session.get( Shoe.class, b.getId() ) ) ); } @@ -192,7 +192,7 @@ public class IdTest { scope.inTransaction( session -> - session.delete( session.get( Store.class, b.getId() ) ) + session.remove( session.get( Store.class, b.getId() ) ) ); } @@ -209,7 +209,7 @@ public class IdTest { scope.inTransaction( session -> - session.delete( session.get( Department.class, b.getId() ) ) + session.remove( session.get( Department.class, b.getId() ) ) ); } @@ -227,7 +227,7 @@ public class IdTest { session -> { Home reloadedHome = session.get( Home.class, h.getId() ); assertEquals( h.getId(), reloadedHome.getId() ); - session.delete( reloadedHome ); + session.remove( reloadedHome ); } ); } @@ -246,7 +246,7 @@ public class IdTest { session -> { Home reloadedHome = session.get( Home.class, h.getId() ); assertEquals( h.getId(), reloadedHome.getId() ); - session.delete( reloadedHome ); + session.remove( reloadedHome ); } ); } @@ -262,7 +262,7 @@ public class IdTest { session.beginTransaction(); christmasTree = session.get( FirTree.class, christmasTree.getId() ); assertNotNull( christmasTree ); - session.delete( christmasTree ); + session.remove( christmasTree ); } ); } @@ -301,7 +301,7 @@ public class IdTest { // reattach by saveOrUpdate session.beginTransaction(); fb.setClub( "Bimbo FC SA" ); - session.saveOrUpdate( fb ); + session.merge( fb ); session.getTransaction().commit(); // clean up @@ -310,8 +310,8 @@ public class IdTest { fpk = new FootballerPk( "David", "Beckam" ); fb = session.get( Footballer.class, fpk ); assertEquals( "Bimbo FC SA", fb.getClub() ); - session.delete( fb ); - session.delete( keeper ); + session.remove( fb ); + session.remove( keeper ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java index b5d65ae466..94dac3d2b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java @@ -49,7 +49,7 @@ public class EnumIdTest { mercury.getPlanet() ); assertNotNull( mercuryFromDb ); - session.delete( mercuryFromDb ); + session.remove( mercuryFromDb ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java index 7522acae5b..1fe436e206 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java @@ -58,7 +58,7 @@ public class HibernateSequenceTest { scope.inTransaction( session -> { entity.setText( "sample text" ); - session.save( entity ); + session.persist( entity ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java index 7cc42c3978..b857f440a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java @@ -82,8 +82,8 @@ public class IdTest { Furniture furFromDb = session.get( Furniture.class, fur.getId() ); assertNotNull( systemfromDb ); assertNotNull( furFromDb ); - session.delete( systemfromDb ); - session.delete( furFromDb ); + session.remove( systemfromDb ); + session.remove( furFromDb ); } ); } @@ -125,9 +125,9 @@ public class IdTest { scope.inTransaction( session -> { - session.delete( session.get( Ball.class, 1 ) ); - session.delete( session.get( Dog.class, 1 ) ); - session.delete( session.get( Computer.class, 1L ) ); + session.remove( session.get( Ball.class, 1 ) ); + session.remove( session.get( Dog.class, 1 ) ); + session.remove( session.get( Computer.class, 1L ) ); } ); } @@ -144,7 +144,7 @@ public class IdTest { scope.inTransaction( session -> - session.delete( session.get( Shoe.class, b.getId() ) ) + session.remove( session.get( Shoe.class, b.getId() ) ) ); } @@ -160,7 +160,7 @@ public class IdTest { scope.inTransaction( session -> - session.delete( session.get( Store.class, b.getId() ) ) + session.remove( session.get( Store.class, b.getId() ) ) ); } @@ -176,7 +176,7 @@ public class IdTest { scope.inTransaction( session -> - session.delete( session.get( Department.class, b.getId() ) ) + session.remove( session.get( Department.class, b.getId() ) ) ); } @@ -194,7 +194,7 @@ public class IdTest { session -> { Home reloadedHome = session.get( Home.class, h.getId() ); assertEquals( h.getId(), reloadedHome.getId() ); - session.delete( reloadedHome ); + session.remove( reloadedHome ); } ); } @@ -213,7 +213,7 @@ public class IdTest { session -> { Home reloadedHome = session.get( Home.class, h.getId() ); assertEquals( h.getId(), reloadedHome.getId() ); - session.delete( reloadedHome ); + session.remove( reloadedHome ); } ); } @@ -231,7 +231,7 @@ public class IdTest { christmasTree = session.get( FirTree.class, christmasTree.getId() ); assertNotNull( christmasTree ); - session.delete( christmasTree ); + session.remove( christmasTree ); } ); } @@ -273,7 +273,7 @@ public class IdTest { // reattach by saveOrUpdate session.beginTransaction(); fb.setClub( "Bimbo FC SA" ); - session.saveOrUpdate( fb ); + session.merge( fb ); session.getTransaction().commit(); // clean up @@ -282,8 +282,8 @@ public class IdTest { fpk = new FootballerPk( "David", "Beckam" ); fb = session.get( Footballer.class, fpk ); assertEquals( "Bimbo FC SA", fb.getClub() ); - session.delete( fb ); - session.delete( keeper ); + session.remove( fb ); + session.remove( keeper ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java index d407174f8c..891bb4d289 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/IdClassMappedSuperclassTest.java @@ -38,7 +38,7 @@ public class IdClassMappedSuperclassTest { Simple simple = new Simple(); simple.setSimpleId( "1" ); simple.setCategoryId( "2" ); - session.save( simple ); + session.persist( simple ); session.getTransaction().commit(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java index c96b6c5338..f8aba7da22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/immutable/ImmutableTest.java @@ -52,7 +52,7 @@ public class ImmutableTest extends BaseCoreFunctionalTestCase { assertNotNull(germany); germany.setName("France"); assertEquals("Local name can be changed", "France", germany.getName()); - s.save(germany); + s.persist(germany); tx.commit(); s.close(); @@ -97,7 +97,7 @@ public class ImmutableTest extends BaseCoreFunctionalTestCase { // try adding a state State foobar = new State(); foobar.setName("foobar"); - s.save(foobar); + s.persist(foobar); germany.getStates().add(foobar); try { tx.commit(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java index d3bb283756..c13291f09e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/indexcoll/IndexedCollectionTest.java @@ -135,9 +135,9 @@ public class IndexedCollectionTest { result = w.getDrawers(); assertEquals( 2, result.size() ); assertEquals( d1.getId(), result.get( 1 ).getId() ); - s.delete( result.get( 0 ) ); - s.delete( result.get( 1 ) ); - s.delete( w ); + s.remove( result.get( 0 ) ); + s.remove( result.get( 1 ) ); + s.remove( w ); s.flush(); tx.rollback(); } @@ -193,9 +193,9 @@ public class IndexedCollectionTest { result = d.getDresses(); assertEquals( 2, result.size() ); assertEquals( d1.getId(), result.get( 1 ).getId() ); - s.delete( result.get( 0 ) ); - s.delete( result.get( 1 ) ); - s.delete( d ); + s.remove( result.get( 0 ) ); + s.remove( result.get( 1 ) ); + s.remove( d ); s.flush(); tx.rollback(); } @@ -254,9 +254,9 @@ public class IndexedCollectionTest { hibernate = s.get( Software.class, "Hibernate" ); assertEquals( 3, hibernate.getVersions().size(), "So effect on collection changes" ); for ( Version v : hibernate.getVersions().values() ) { - s.delete( v ); + s.remove( v ); } - s.delete( hibernate ); + s.remove( hibernate ); s.flush(); @@ -311,7 +311,7 @@ public class IndexedCollectionTest { book = s.get( AddressBook.class, book.getId() ); assertEquals( 2, book.getEntries().size() ); assertNull( book.getEntries().get( fake ) ); - s.delete( book ); + s.remove( book ); s.flush(); tx.rollback(); @@ -367,7 +367,7 @@ public class IndexedCollectionTest { assertEquals( heleneEntry.getCity(), book.getEntries().get( helene ).getCity() ); assertEquals( "M", book.getEntries().get( helene ).getDirectory().getName() ); - s.delete( book ); + s.remove( book ); tx.rollback(); } catch (Exception e) { @@ -421,7 +421,7 @@ public class IndexedCollectionTest { book = s.get( AddressBook.class, book.getId() ); assertEquals( 2, book.getEntries().size() ); assertNull( book.getEntries().get( fake ) ); - s.delete( book ); + s.remove( book ); tx.rollback(); } catch (Exception e) { @@ -456,8 +456,8 @@ public class IndexedCollectionTest { News news = lemonde.getNews().get( airplane.getTitle() ); assertNotNull( news ); assertEquals( airplane.getTitle(), news.getTitle() ); - s.delete( lemonde ); - s.delete( news ); + s.remove( lemonde ); + s.remove( news ); s.getTransaction().rollback(); } @@ -493,8 +493,8 @@ public class IndexedCollectionTest { News news = schwartz.getProvidedNews().get( hibernate1.getId() ); assertNotNull( news ); assertEquals( hibernate1.getTitle(), news.getTitle() ); - s.delete( schwartz ); - s.delete( news ); + s.remove( schwartz ); + s.remove( news ); s.getTransaction().rollback(); } @@ -527,7 +527,7 @@ public class IndexedCollectionTest { Painting painting = picasso.getPaintings().get( famille.getName() ); assertNotNull( painting ); assertEquals( painting.getName(), famille.getName() ); - s.delete( picasso ); + s.remove( picasso ); tx.rollback(); } catch (Exception e) { @@ -856,9 +856,9 @@ public class IndexedCollectionTest { hibernate = s.get( Software.class, "Hibernate" ); for ( Version v : hibernate.getVersions().values() ) { - s.delete( v ); + s.remove( v ); } - s.delete( hibernate ); + s.remove( hibernate ); tx.rollback(); } catch (Exception e) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java index 85909b928d..b061561f44 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/SubclassTest.java @@ -126,7 +126,7 @@ public class SubclassTest { assertEquals( 10000, p.getAltitude() ); assertEquals( "0123456789", p.getSerial() ); assertNotEquals( 3000, p.getMetricAltitude() ); - s.delete( p ); + s.remove( p ); } ); @@ -155,10 +155,10 @@ public class SubclassTest { assertEquals( 1, result.size() ); Noise w = (Noise) result.get( 0 ); assertNull( w.getType() ); - s.delete( w ); + s.remove( w ); result = createQueryForClass( s, Rock.class ).list(); assertEquals( 1, result.size() ); - s.delete( result.get( 0 ) ); + s.remove( result.get( 0 ) ); result = createQueryForClass( s, Funk.class ).list(); assertEquals( 0, result.size() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java index 5dd058ac4e..da43ae35d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassAndSecondaryTable.java @@ -43,7 +43,7 @@ public class JoinedSubclassAndSecondaryTable { scope.inTransaction( sesison -> sesison.createQuery( "from Pool" ).list().forEach( - pool -> sesison.delete( pool ) + pool -> sesison.remove( pool ) ) ); } 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 31c8d21ef0..945a05f4e6 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 @@ -114,7 +114,7 @@ public class JoinedSubclassTest { scope.inTransaction( session -> { Sweater toDelete = session.get( Sweater.class, sw.getId() ); - session.delete( toDelete ); + session.remove( toDelete ); } ); } @@ -225,32 +225,32 @@ public class JoinedSubclassTest { scope.inTransaction( session -> { session.createQuery( "from Customer" ).list().forEach( - customer -> session.delete( customer ) + customer -> session.remove( customer ) ); session.createQuery( "from Client" ).list().forEach( - client -> session.delete( client ) + client -> session.remove( client ) ); session.createQuery( "from Account" ).list().forEach( - account -> session.delete( account ) + account -> session.remove( account ) ); session.createQuery( "from ProgramExecution" ).list().forEach( - programExecution -> session.delete( programExecution ) + programExecution -> session.remove( programExecution ) ); session.createQuery( "from Alarm" ).list().forEach( - alarm -> session.delete( alarm ) + alarm -> session.remove( alarm ) ); session.createQuery( "from EventInformation" ).list().forEach( - eventInformation -> session.delete( eventInformation ) + eventInformation -> session.remove( eventInformation ) ); session.createQuery( "from File" ).list().forEach( - file -> session.delete( file ) + file -> session.remove( file ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java index 7c3ef6322d..7db5baf3b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/mixed/SubclassTest.java @@ -62,8 +62,8 @@ public class SubclassTest { checkClassType( f2, doc, folder ); f2 = result.get( 1 ); checkClassType( f2, doc, folder ); - session.delete( result.get( 0 ) ); - session.delete( result.get( 1 ) ); + session.remove( result.get( 0 ) ); + session.remove( result.get( 1 ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java index 0e94198b6b..188cd0739f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/join/JoinTest.java @@ -106,7 +106,7 @@ public class JoinTest extends BaseNonConfigCoreFunctionalTestCase { Query q = s.createQuery( "from " + Death.class.getName() ); death = (Death) q.uniqueResult(); assertEquals( "Well, haven't seen it", death.howDoesItHappen ); - s.delete( death ); + s.remove( death ); tx.commit(); s.close(); } @@ -140,8 +140,8 @@ public class JoinTest extends BaseNonConfigCoreFunctionalTestCase { // crit.createCriteria( "owner" ).add( Restrictions.eq( "name", "kitty" ) ); // life = (Life) crit.uniqueResult(); assertEquals( "Long long description", life.fullDescription ); - s.delete( life.owner ); - s.delete( life ); + s.remove( life.owner ); + s.remove( life ); tx.commit(); s.close(); } @@ -154,8 +154,8 @@ public class JoinTest extends BaseNonConfigCoreFunctionalTestCase { SysUserOrm u=new SysUserOrm(); u.setGroups( new ArrayList<>() ); u.getGroups().add( g ); - s.save( g ); - s.save( u ); + s.persist( g ); + s.persist( u ); s.getTransaction().commit(); s.close(); } 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 d1b711ab10..d97587228d 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 @@ -62,8 +62,8 @@ public class LoaderTest extends BaseCoreFunctionalTestCase { tx = s.beginTransaction(); t = s.get( Team.class, t2.getId() ); p = s.get( Player.class, p.getId() ); - s.delete( p ); - s.delete( t ); + s.remove( p ); + s.remove( t ); tx.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageTest.java index d64c3590c7..8d9de213ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/ImageTest.java @@ -46,7 +46,7 @@ public class ImageTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); ImageHolder entity = new ImageHolder(); - s.save(entity); + s.persist(entity); s.getTransaction().commit(); s.close(); @@ -97,11 +97,11 @@ public class ImageTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - entity = (ImageHolder) s.get(ImageHolder.class, entity.getId()); + entity = s.get( ImageHolder.class, entity.getId()); Assert.assertNull( entity.getLongByteArray() ); Assert.assertNull( entity.getDog() ); Assert.assertNull( entity.getPicByteArray() ); - s.delete(entity); + s.remove(entity); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobTest.java index 0d5da72b8d..e3f2e67ccc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/MaterializedBlobTest.java @@ -56,7 +56,7 @@ public class MaterializedBlobTest extends BaseCoreFunctionalTestCase { Session session = openSession(); session.beginTransaction(); MaterializedBlobEntity entity = new MaterializedBlobEntity( "test", testData ); - session.save( entity ); + session.persist( entity ); session.getTransaction().commit(); session.close(); @@ -64,7 +64,7 @@ public class MaterializedBlobTest extends BaseCoreFunctionalTestCase { session.beginTransaction(); entity = session.get( MaterializedBlobEntity.class, entity.getId() ); assertTrue( Arrays.equals( testData, entity.getTheBytes() ) ); - session.delete( entity ); + session.remove( entity ); session.getTransaction().commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/TextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/TextTest.java index d712b574d3..262d27be91 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/TextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/TextTest.java @@ -44,7 +44,7 @@ public class TextTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); LongStringHolder entity = new LongStringHolder(); - s.save(entity); + s.persist(entity); s.getTransaction().commit(); s.close(); @@ -104,7 +104,7 @@ public class TextTest extends BaseCoreFunctionalTestCase { assertNull(entity.getLongString()); assertNull(entity.getName()); assertNull(entity.getWhatEver()); - s.delete(entity); + s.remove(entity); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java index f7b20b51bc..3d76e56225 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/lob/VersionedLobTest.java @@ -70,7 +70,7 @@ public class VersionedLobTest extends AbstractLobTest { Parent parent = new Parent( new Child() ); - session.save( parent ); + session.persist( parent ); } ); } @@ -53,7 +53,7 @@ public class NotNullManyToOneTest extends BaseCoreFunctionalTestCase { inTransaction( session -> { Child child = new Child(); - session.save( child ); + session.persist( child ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java index ba67db48eb..ad8737072d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotOptionalManyToOneTest.java @@ -41,8 +41,8 @@ public class NotOptionalManyToOneTest { Child child = new Child( 1, "Luigi" ); Parent parent = new Parent( 2, "Roberto", child ); - session.save( child ); - session.save( parent ); + session.persist( child ); + session.persist( parent ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java index f5175158a3..5cde90c549 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/referencedcolumnname/ManyToOneReferencedColumnNameTest.java @@ -38,10 +38,10 @@ public class ManyToOneReferencedColumnNameTest extends BaseCoreFunctionalTestCas wi.setQtyInStock( new BigDecimal( 2 ) ); Session s = openSession(); s.getTransaction().begin(); - s.save( i ); - s.save( v ); - s.save( ic ); - s.save( wi ); + s.persist( i ); + s.persist( v ); + s.persist( ic ); + s.persist( wi ); s.flush(); s.getTransaction().rollback(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java index 08ef4449fa..447f90fe39 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/mappedsuperclass/intermediate/IntermediateMappedSuperclassTest.java @@ -33,7 +33,7 @@ public class IntermediateMappedSuperclassTest { scope.inTransaction( session -> { session.createQuery( "from Account" ).list().forEach( - account -> session.delete( account ) + account -> session.remove( account ) ); } ); @@ -45,7 +45,7 @@ public class IntermediateMappedSuperclassTest { SavingsAccount savingsAccount = new SavingsAccount( "123", withdrawalLimit ); scope.inTransaction( session -> { - session.save( savingsAccount ); + session.persist( savingsAccount ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java index a43d51a0da..f160c0b1c7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/naturalid/cid/EmbeddedAndNaturalIdTest.java @@ -27,7 +27,7 @@ public class EmbeddedAndNaturalIdTest extends BaseCoreFunctionalTestCase { A account = new A( new AId( 1 ), "testCode" ); inTransaction( session -> - session.save( account ) + session.persist( account ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java index 2ebd18619f..4dfe54301d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/DefaultNullOrderingTest.java @@ -67,8 +67,8 @@ public class DefaultNullOrderingTest extends BaseCoreFunctionalTestCase { // Cleanup data. session.getTransaction().begin(); - session.delete( monkey1 ); - session.delete( monkey2 ); + session.remove( monkey1 ); + session.remove( monkey2 ); session.getTransaction().commit(); } catch (Exception e) { @@ -111,7 +111,7 @@ public class DefaultNullOrderingTest extends BaseCoreFunctionalTestCase { // Cleanup data. session.getTransaction().begin(); - session.delete( troop ); + session.remove( troop ); session.getTransaction().commit(); } catch (Exception e) { @@ -156,8 +156,8 @@ public class DefaultNullOrderingTest extends BaseCoreFunctionalTestCase { // Cleanup data. session.getTransaction().begin(); - session.delete( monkey1 ); - session.delete( monkey2 ); + session.remove( monkey1 ); + session.remove( monkey2 ); session.getTransaction().commit(); } catch (Exception e) { 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 f7dc9fe04d..9889f38fc9 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 @@ -87,7 +87,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { s.clear(); Transaction tx = s.beginTransaction(); - s.delete( s.get( PoliticalParty.class, dream.getName() ) ); + s.remove( s.get( PoliticalParty.class, dream.getName() ) ); tx.commit(); s.close(); } @@ -166,7 +166,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - trainer = ( Trainer ) s.get( Trainer.class, trainer.getId() ); + trainer = s.get( Trainer.class, trainer.getId() ); assertNotNull( trainer ); assertNotNull( trainer.getTrainedTigers() ); assertEquals( 2, trainer.getTrainedTigers().size() ); @@ -177,7 +177,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { tx = s.beginTransaction(); trainer = new Trainer(); trainer.setName( "new trainer" ); - trainer.setTrainedTigers( new HashSet() ); + trainer.setTrainedTigers( new HashSet<>() ); trainer.getTrainedTigers().add( whiteTiger ); try { s.persist( trainer ); @@ -220,14 +220,14 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - trainer = ( Trainer ) s.get( Trainer.class, trainer.getId() ); + trainer = s.get( Trainer.class, trainer.getId() ); assertNotNull( trainer ); assertNotNull( trainer.getTrainedMonkeys() ); assertEquals( 2, trainer.getTrainedMonkeys().size() ); //test suppression of trainer wo monkey final Set monkeySet = new HashSet( trainer.getTrainedMonkeys() ); - s.delete( trainer ); + s.remove( trainer ); s.flush(); tx.commit(); @@ -242,7 +242,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { //clean up for ( Monkey m : monkeySet ) { final Object managedMonkey = s.get( Monkey.class, m.getId() ); - s.delete(managedMonkey); + s.remove(managedMonkey); } s.flush(); tx.commit(); @@ -269,7 +269,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - t = ( Troop ) s.get( Troop.class, t.getId() ); + t = s.get( Troop.class, t.getId() ); assertNotNull( t.getSoldiers() ); assertFalse( Hibernate.isInitialized( t.getSoldiers() ) ); assertEquals( 2, t.getSoldiers().size() ); @@ -287,7 +287,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { s = openSession(); tx = s.beginTransaction(); - rambo = ( Soldier ) s.get( Soldier.class, rambo.getId() ); + rambo = s.get( Soldier.class, rambo.getId() ); assertTrue( Hibernate.isInitialized( rambo.getTroop() ) ); tx.commit(); s.close(); @@ -317,7 +317,7 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { s.close(); s = openSession(); tx = s.beginTransaction(); - Troop troop = ( Troop ) s.get( Troop.class, disney.getId() ); + Troop troop = s.get( Troop.class, disney.getId() ); Soldier soldier = troop.getSoldiers().iterator().next(); tx.commit(); s.close(); @@ -329,10 +329,10 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { s.close(); s = openSession(); tx = s.beginTransaction(); - soldier = ( Soldier ) s.get( Soldier.class, mickey.getId() ); + soldier = s.get( Soldier.class, mickey.getId() ); assertNull( "delete-orphan should work", soldier ); - troop = ( Troop ) s.get( Troop.class, disney.getId() ); - s.delete( troop ); + troop = s.get( Troop.class, disney.getId() ); + s.remove( troop ); tx.commit(); s.close(); } @@ -353,8 +353,8 @@ public class OneToManyTest extends BaseNonConfigCoreFunctionalTestCase { s.close(); s = openSession(); tx = s.beginTransaction(); - Troop troop = ( Troop ) s.get( Troop.class, disney.getId() ); - s.delete( troop ); + Troop troop = s.get( Troop.class, disney.getId() ); + s.remove( troop ); tx.commit(); s.close(); s = openSession(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java index d731044fff..42473e4b01 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OrderByTest.java @@ -138,11 +138,11 @@ public class OrderByTest extends BaseCoreFunctionalTestCase { // Cleanup data. session.getTransaction().begin(); - session.delete( tiger1 ); - session.delete( tiger2 ); - session.delete( monkey1 ); - session.delete( monkey2 ); - session.delete( zoo ); + session.remove( tiger1 ); + session.remove( tiger2 ); + session.remove( monkey1 ); + session.remove( monkey2 ); + session.remove( zoo ); session.getTransaction().commit(); session.close(); @@ -173,10 +173,10 @@ public class OrderByTest extends BaseCoreFunctionalTestCase { zoo.getVisitors().add( visitor1 ); zoo.getVisitors().add( visitor2 ); zoo.getVisitors().add( visitor3 ); - session.save( zoo ); - session.save( visitor1 ); - session.save( visitor2 ); - session.save( visitor3 ); + session.persist( zoo ); + session.persist( visitor1 ); + session.persist( visitor2 ); + session.persist( visitor3 ); session.getTransaction().commit(); session.clear(); @@ -194,10 +194,10 @@ public class OrderByTest extends BaseCoreFunctionalTestCase { // Cleanup data. session.getTransaction().begin(); - session.delete( visitor1 ); - session.delete( visitor2 ); - session.delete( visitor3 ); - session.delete( zoo ); + session.remove( visitor1 ); + session.remove( visitor2 ); + session.remove( visitor3 ); + session.remove( zoo ); session.getTransaction().commit(); session.close(); @@ -235,8 +235,8 @@ public class OrderByTest extends BaseCoreFunctionalTestCase { // Cleanup data. session.getTransaction().begin(); - session.delete( zoo1 ); - session.delete( zoo2 ); + session.remove( zoo1 ); + session.remove( zoo2 ); session.getTransaction().commit(); session.close(); @@ -276,10 +276,10 @@ public class OrderByTest extends BaseCoreFunctionalTestCase { // Cleanup data. session.getTransaction().begin(); - session.delete( item1 ); - session.delete( item2 ); - session.delete( item3 ); - session.delete( box1 ); + session.remove( item1 ); + session.remove( item2 ); + session.remove( item3 ); + session.remove( box1 ); session.getTransaction().commit(); session.close(); @@ -300,7 +300,7 @@ public class OrderByTest extends BaseCoreFunctionalTestCase { account.addTransaction( "zzzzz" ); account.addTransaction( "aaaaa" ); account.addTransaction( "mmmmm" ); - s.save( account ); + s.persist( account ); s.getTransaction().commit(); s.close(); @@ -413,9 +413,9 @@ public class OrderByTest extends BaseCoreFunctionalTestCase { computer2.setComputerName( "Alice's computer" ); computer2.setEmployee( employee ); - s.save( employee ); - s.save( computer2 ); - s.save( computer ); + s.persist( employee ); + s.persist( computer2 ); + s.persist( computer ); s.flush(); s.clear(); @@ -490,7 +490,7 @@ public class OrderByTest extends BaseCoreFunctionalTestCase { assertEquals( "c21", b2cs.get( 0 ).getName() ); assertEquals( "c22", b2cs.get( 1 ).getName() ); - s.delete( a ); + s.remove( a ); s.getTransaction().commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java index f37f1c6eee..4cfc3ea91c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OneToOneTest.java @@ -218,8 +218,8 @@ public class OneToOneTest extends BaseNonConfigCoreFunctionalTestCase { assertNotNull( party.partyAffiliate ); assertEquals( party.partyId, party.partyAffiliate.partyId ); - s.delete( party ); - s.delete( party.partyAffiliate ); + s.remove( party ); + s.remove( party.partyAffiliate ); tx.commit(); } catch (Exception e) { @@ -267,8 +267,8 @@ public class OneToOneTest extends BaseNonConfigCoreFunctionalTestCase { assertNotNull( zip.trousers ); assertEquals( trousers.id, zip.trousers.id ); - s.delete( zip ); - s.delete( zip.trousers ); + s.remove( zip ); + s.remove( zip.trousers ); tx.commit(); } catch (Exception e) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java index 50268e3cdd..a02372e199 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMappedByTest.java @@ -83,7 +83,7 @@ public class OptionalOneToOneMappedByTest extends BaseCoreFunctionalTestCase { ); assertNull( affiliate.party ); - session.delete( affiliate ); + session.remove( affiliate ); } ); } @@ -122,7 +122,7 @@ public class OptionalOneToOneMappedByTest extends BaseCoreFunctionalTestCase { ); assertNull( personAddress.getPerson() ); - session.delete( personAddress ); + session.remove( personAddress ); } ); } @@ -182,7 +182,7 @@ public class OptionalOneToOneMappedByTest extends BaseCoreFunctionalTestCase { // .add( Restrictions.eq( "personAddress", personAddress ) ) // .uniqueResult(); - session.delete( personAddress ); + session.remove( personAddress ); assertNotSame( person, personAddress.getPerson() ); personAddress.getPerson().setPersonAddress( null ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java index 256ef0845c..65f476e210 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOneMapsIdQueryTest.java @@ -54,7 +54,7 @@ public class OptionalOneToOneMapsIdQueryTest extends BaseNonConfigCoreFunctional doInHibernate( this::sessionFactory, session -> { final FooHasBarWithIdNamedId foo = session.get( FooHasBarWithIdNamedId.class, 1L ); - session.delete( foo.bar ); + session.remove( foo.bar ); foo.bar = null; }); @@ -105,7 +105,7 @@ public class OptionalOneToOneMapsIdQueryTest extends BaseNonConfigCoreFunctional doInHibernate( this::sessionFactory, session -> { final FooHasBarWithNoIdOrPropNamedId foo = session.get( FooHasBarWithNoIdOrPropNamedId.class, 1L ); - session.delete( foo.bar ); + session.remove( foo.bar ); foo.bar = null; }); @@ -176,7 +176,7 @@ public class OptionalOneToOneMapsIdQueryTest extends BaseNonConfigCoreFunctional doInHibernate( this::sessionFactory, session -> { final FooHasBarWithNonIdPropNamedId foo = session.get( FooHasBarWithNonIdPropNamedId.class, 1L ); - session.delete( foo.bar ); + session.remove( foo.bar ); foo.bar = null; }); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java index 5d29a3e6a8..61005bd53c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCQueryTest.java @@ -52,7 +52,7 @@ public class OptionalOneToOnePKJCQueryTest extends BaseNonConfigCoreFunctionalTe doInHibernate( this::sessionFactory, session -> { final FooHasBarWithIdNamedId foo = session.get( FooHasBarWithIdNamedId.class, 1L ); - session.delete( foo.bar ); + session.remove( foo.bar ); foo.bar = null; }); @@ -103,7 +103,7 @@ public class OptionalOneToOnePKJCQueryTest extends BaseNonConfigCoreFunctionalTe doInHibernate( this::sessionFactory, session -> { final FooHasBarWithNoIdOrPropNamedId foo = session.get( FooHasBarWithNoIdOrPropNamedId.class, 1L ); - session.delete( foo.bar ); + session.remove( foo.bar ); foo.bar = null; }); @@ -174,7 +174,7 @@ public class OptionalOneToOnePKJCQueryTest extends BaseNonConfigCoreFunctionalTe doInHibernate( this::sessionFactory, session -> { final FooHasBarWithNonIdPropNamedId foo = session.get( FooHasBarWithNonIdPropNamedId.class, 1L ); - session.delete( foo.bar ); + session.remove( foo.bar ); foo.bar = null; }); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java index a2617671f6..d35dca99a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/OptionalOneToOnePKJCTest.java @@ -110,7 +110,7 @@ public class OptionalOneToOnePKJCTest extends BaseCoreFunctionalTestCase { // .uniqueResult(); assertNotNull( owner ); assertNull( owner.getAddress() ); - s.delete( owner ); + s.remove( owner ); s.getTransaction().commit(); s.close(); } @@ -148,7 +148,7 @@ public class OptionalOneToOnePKJCTest extends BaseCoreFunctionalTestCase { assertNotNull( party ); assertEquals( "id", party.partyId ); assertNull( party.partyAffiliate ); - s.delete( party ); + s.remove( party ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/HHH4851Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/HHH4851Test.java index 1a1c8a2538..5dc66ac802 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/HHH4851Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetoone/hhh4851/HHH4851Test.java @@ -6,64 +6,64 @@ */ package org.hibernate.orm.test.annotations.onetoone.hhh4851; -import org.junit.Test; - import org.hibernate.PropertyValueException; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import static org.junit.Assert.fail; +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.ServiceRegistry; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.hibernate.testing.orm.junit.Setting; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Fail.fail; + /** * @author Emmanuel Bernard */ -@TestForIssue( jiraKey = "HHH-4851" ) -public class HHH4851Test extends BaseCoreFunctionalTestCase { - @Test - public void testHHH4851() throws Exception { - Session session = openSession(); - Transaction trx = session.beginTransaction(); - Owner org = new Owner(); - org.setName( "root" ); - session.saveOrUpdate( org ); - - ManagedDevice lTerminal = new ManagedDevice(); - lTerminal.setName( "test" ); - lTerminal.setOwner( org ); - session.saveOrUpdate( lTerminal ); - - Device terminal = new Device(); - terminal.setTag( "test" ); - terminal.setOwner( org ); - try { - session.saveOrUpdate( terminal ); - } - catch ( PropertyValueException e ) { - fail( "not-null checking should not be raised: " + e.getMessage() ); - } - trx.commit(); - session.close(); - } - - @Override - protected void configure(Configuration cfg) { - super.configure( cfg ); - cfg.setProperty( Environment.CHECK_NULLABILITY, true ); - } - - @Override - protected Class[] getAnnotatedClasses() { - return new Class[] { +@JiraKey("HHH-4851") +@DomainModel( + annotatedClasses = { Hardware.class, DeviceGroupConfig.class, Hardware.class, ManagedDevice.class, Device.class, Owner.class - }; + } +) +@SessionFactory +@ServiceRegistry( + settings = @Setting(name = Environment.CHECK_NULLABILITY, value = "true") +) +public class HHH4851Test { + + @Test + public void testHHH4851(SessionFactoryScope scope) { + scope.inTransaction( + session -> { + Owner org = new Owner(); + org.setName( "root" ); + session.persist( org ); + + ManagedDevice lTerminal = new ManagedDevice(); + lTerminal.setName( "test" ); + lTerminal.setOwner( org ); + session.persist( lTerminal ); + + Device terminal = new Device(); + terminal.setTag( "test" ); + terminal.setOwner( org ); + try { + session.merge( terminal ); + } + catch (PropertyValueException e) { + fail( "not-null checking should not be raised: " + e.getMessage() ); + } + } + ); } + } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java index be25bf9f73..d6d80675fc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/NamedQueryTest.java @@ -48,7 +48,7 @@ public class NamedQueryTest { session -> { for ( String title : GAME_TITLES ) { Game game = new Game( title ); - session.save( game ); + session.persist( game ); } } ); } 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 44e5861826..6815e429ab 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 @@ -321,7 +321,7 @@ public class QueryAndSQLTest { session.persist( p ); Query q = session.getNamedQuery( "plane.getAll" ); assertEquals( 1, q.list().size() ); - session.delete( q.list().get( 0 ) ); + session.remove( q.list().get( 0 ) ); } ); } @@ -361,7 +361,7 @@ public class QueryAndSQLTest { assertEquals( 1, stats.getQueryCachePutCount() ); q = session.getNamedQuery( "night.duration" ); q.setParameter( "duration", 14l ); - session.delete( q.list().get( 0 ) ); + session.remove( q.list().get( 0 ) ); assertEquals( 1, stats.getQueryCacheHitCount() ); } ); @@ -401,8 +401,8 @@ public class QueryAndSQLTest { List areas = session.getNamedQuery( "getAreaByNative" ).list(); assertTrue( 1 == areas.size() ); assertEquals( area.getName(), ( (Area) areas.get( 0 ) ).getName() ); - session.delete( areas.get( 0 ) ); - session.delete( n2 ); + session.remove( areas.get( 0 ) ); + session.remove( n2 ); tx.commit(); } finally { @@ -476,8 +476,8 @@ public class QueryAndSQLTest { assertEquals( 1, stats.getQueryCacheHitCount() ); Night n2 = (Night) ( (Object[]) result.get( 0 ) )[0]; assertEquals( n2.getDuration(), n.getDuration() ); - session.delete( n2.getArea() ); - session.delete( n2 ); + session.remove( n2.getArea() ); + session.remove( n2 ); } ); @@ -503,7 +503,7 @@ public class QueryAndSQLTest { List result = q.list(); assertEquals( 1, result.size() ); assertEquals( ship.getModel(), ( (SpaceShip) result.get( 0 ) ).getModel() ); - session.delete( result.get( 0 ) ); + session.remove( result.get( 0 ) ); tx.commit(); } finally { @@ -551,8 +551,8 @@ public class QueryAndSQLTest { //FIXME vary depending on databases assertTrue( row[1].toString().startsWith( "50" ) ); assertTrue( row[2].toString().startsWith( "500" ) ); - session.delete( spaceShip.getCaptain() ); - session.delete( spaceShip ); + session.remove( spaceShip.getCaptain() ); + session.remove( spaceShip ); tx.commit(); } finally { @@ -587,8 +587,8 @@ public class QueryAndSQLTest { results.get( 0 ) instanceof SynonymousDictionary || results.get( 1 ) instanceof SynonymousDictionary ); - session.delete( results.get( 0 ) ); - session.delete( results.get( 1 ) ); + session.remove( results.get( 0 ) ); + session.remove( results.get( 1 ) ); tx.commit(); } finally { @@ -629,7 +629,7 @@ public class QueryAndSQLTest { scope.inTransaction( session -> - session.delete( session.get( Plane.class, plane.getId() ) ) + session.remove( session.get( Plane.class, plane.getId() ) ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java index 76abdf3b41..70378f89c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/quote/resultsetmappings/ExplicitSqlResultSetMappingTest.java @@ -33,7 +33,7 @@ public class ExplicitSqlResultSetMappingTest extends BaseCoreFunctionalTestCase char close = getDialect().closeQuote(); queryString="select t."+open+"NAME"+close+" as "+open+"QuotEd_nAMe"+close+" from "+open+"MY_ENTITY_TABLE"+close+" t"; inTransaction( - s -> s.save( new MyEntity( "mine" ) ) + s -> s.persist( new MyEntity( "mine" ) ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java index accbac398e..dd25e528c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/referencedcolumnname/ReferencedColumnNameTest.java @@ -47,8 +47,8 @@ public class ReferencedColumnNameTest extends BaseCoreFunctionalTestCase { assertNotNull( h.getPostman() ); assertEquals( "Bob", h.getPostman().getName() ); Postman pm = h.getPostman(); - s.delete( h ); - s.delete( pm ); + s.remove( h ); + s.remove( pm ); } ); } @@ -74,8 +74,8 @@ public class ReferencedColumnNameTest extends BaseCoreFunctionalTestCase { assertNotNull( rambler ); assertNotNull( rambler.getBags() ); assertEquals( 1, rambler.getBags().size() ); - s.delete( rambler.getBags().iterator().next() ); - s.delete( rambler ); + s.remove( rambler.getBags().iterator().next() ); + s.remove( rambler ); } ); } @@ -99,8 +99,8 @@ public class ReferencedColumnNameTest extends BaseCoreFunctionalTestCase { assertNotNull( luggage.getHasInside() ); assertEquals( 1, luggage.getHasInside().size() ); - s.delete( luggage.getHasInside().iterator().next() ); - s.delete( luggage ); + s.remove( luggage.getHasInside().iterator().next() ); + s.remove( luggage ); } ); @@ -144,10 +144,10 @@ public class ReferencedColumnNameTest extends BaseCoreFunctionalTestCase { assertEquals( whiteHouse.getAddress(), bill.getLivesIn().iterator().next().getAddress() ); whiteHouse = bill.getLivesIn().iterator().next(); - s.delete( whiteHouse ); + s.remove( whiteHouse ); Iterator it = whiteHouse.getHasInhabitants().iterator(); while ( it.hasNext() ) { - s.delete( it.next() ); + s.remove( it.next() ); } tx.commit(); s.close(); @@ -206,7 +206,7 @@ public class ReferencedColumnNameTest extends BaseCoreFunctionalTestCase { inTransaction( s -> { - s.save( house ); + s.persist( house ); s.flush(); HousePlaces get = s.get( HousePlaces.class, house.id ); @@ -257,7 +257,7 @@ public class ReferencedColumnNameTest extends BaseCoreFunctionalTestCase { // assertNotNull( s.createCriteria( HousePlaces.class ) // .add( Restrictions.eq( "neighbourPlaces.livingRoom.owner", "his" ) ).uniqueResult() ); - s.delete( house ); + s.remove( house ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java index 4f3ed66159..34f6713e5b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/ParentChildWithSameSecondaryTableTest.java @@ -105,7 +105,7 @@ public class ParentChildWithSameSecondaryTableTest { scope.inTransaction( session -> { - session.delete( session.get( EntityC.class, 1L ) ); + session.remove( session.get( EntityC.class, 1L ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/UpdateDetachedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/MergeDetachedTest.java similarity index 61% rename from hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/UpdateDetachedTest.java rename to hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/MergeDetachedTest.java index 61b6193017..b37749d37d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/UpdateDetachedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/selectbeforeupdate/MergeDetachedTest.java @@ -8,6 +8,15 @@ package org.hibernate.orm.test.annotations.selectbeforeupdate; import java.util.HashSet; import java.util.Set; + +import org.hibernate.annotations.SelectBeforeUpdate; + +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.Test; + import jakarta.persistence.Column; import jakarta.persistence.ElementCollection; import jakarta.persistence.Embeddable; @@ -18,143 +27,142 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import jakarta.persistence.Version; -import org.hibernate.annotations.SelectBeforeUpdate; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.hibernate.testing.transaction.TransactionUtil; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; /** * @author Chris Cranford */ -public class UpdateDetachedTest extends BaseCoreFunctionalTestCase{ - - @Override - protected Class[] getAnnotatedClasses() { - return new Class[] { Foo.class, Bar.class }; - } +@DomainModel( + annotatedClasses = { + MergeDetachedTest.Foo.class, + MergeDetachedTest.Bar.class + } +) +@SessionFactory +public class MergeDetachedTest { @Test - @TestForIssue(jiraKey = "HHH-5908") - public void testUpdateDetachedUnchanged() { + @JiraKey("HHH-5908") + public void testUpdateDetachedUnchanged(SessionFactoryScope scope) { final Bar bar = new Bar( 1, "Bar" ); final Foo foo = new Foo( 1, "Foo", bar ); // this should generate versions - TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.save( bar ); - session.save( foo ); + scope.inTransaction( session -> { + session.persist( bar ); + session.persist( foo ); } ); // this shouldn't generate a new version. - TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.update( foo ); - } ); + Foo merged = scope.fromTransaction( session -> + session.merge( foo ) + ); - assertEquals( Integer.valueOf( 0 ), bar.getVersion() ); - assertEquals( Integer.valueOf( 0 ), foo.getVersion() ); + assertThat( bar.getVersion() ).isEqualTo( 0 ); + assertThat( merged.getVersion() ).isEqualTo( 0 ); // this should generate a new version - TransactionUtil.doInHibernate( this::sessionFactory, session -> { - foo.setName( "FooChanged" ); - session.update( foo ); + Foo merged2 = scope.fromTransaction( session -> { + merged.setName( "FooChanged" ); + return session.merge( merged ); } ); - assertEquals( Integer.valueOf( 0 ), bar.getVersion() ); - assertEquals( Integer.valueOf( 1 ), foo.getVersion() ); + assertThat( bar.getVersion() ).isEqualTo( 0 ); + assertThat( merged2.getVersion() ).isEqualTo( 1 ); } @Test - @TestForIssue(jiraKey = "HHH-5908") - public void testUpdateDetachedChanged() { + @JiraKey("HHH-5908") + public void testUpdateDetachedChanged(SessionFactoryScope scope) { final Bar bar = new Bar( 2, "Bar" ); final Foo foo = new Foo( 2, "Foo", bar ); // this should generate versions - TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.save( bar ); - session.save( foo ); + scope.inTransaction( session -> { + session.persist( bar ); + session.persist( foo ); } ); // this should generate a new version - TransactionUtil.doInHibernate( this::sessionFactory, session -> { + Foo merged = scope.fromTransaction( session -> { foo.setName( "FooChanged" ); - session.update( foo ); + return session.merge( foo ); } ); - assertEquals( Integer.valueOf( 0 ), bar.getVersion() ); - assertEquals( Integer.valueOf( 1 ), foo.getVersion() ); + assertThat( bar.getVersion() ).isEqualTo( 0 ); + assertThat( merged.getVersion() ).isEqualTo( 1 ); } @Test - @TestForIssue(jiraKey = "HHH-5908") - public void testUpdateDetachedUnchangedAndChanged() { + @JiraKey("HHH-5908") + public void testUpdateDetachedUnchangedAndChanged(SessionFactoryScope scope) { final Bar bar = new Bar( 3, "Bar" ); final Foo foo = new Foo( 3, "Foo", bar ); // this should generate versions - TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.save( bar ); - session.save( foo ); + scope.inTransaction( session -> { + session.persist( bar ); + session.persist( foo ); } ); // this shouldn't generate a new version. - TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.update( foo ); - } ); + Foo merged = scope.fromTransaction( + session -> + session.merge( foo ) + ); // this should generate a new version - TransactionUtil.doInHibernate( this::sessionFactory, session -> { - foo.setName( "FooChanged" ); - session.update( foo ); + Foo merged2 = scope.fromTransaction( session -> { + merged.setName( "FooChanged" ); + return session.merge( merged ); } ); - assertEquals( Integer.valueOf( 0 ), bar.getVersion() ); - assertEquals( Integer.valueOf( 1 ), foo.getVersion() ); + assertThat( bar.getVersion() ).isEqualTo( 0 ); + assertThat( merged2.getVersion() ).isEqualTo( 1 ); } @Test - @TestForIssue(jiraKey = "HHH-5908") - public void testUpdateDetachedChangedAndUnchanged() { + @JiraKey("HHH-5908") + public void testUpdateDetachedChangedAndUnchanged(SessionFactoryScope scope) { final Bar bar = new Bar( 4, "Bar" ); final Foo foo = new Foo( 4, "Foo", bar ); // this should generate versions - TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.save( bar ); - session.save( foo ); + scope.inTransaction( session -> { + session.persist( bar ); + session.persist( foo ); } ); // this should generate a new version - TransactionUtil.doInHibernate( this::sessionFactory, session -> { + Foo merged = scope.fromTransaction( session -> { foo.setName( "FooChanged" ); - session.update( foo ); + return session.merge( foo ); } ); // this shouldn't generate a new version. - TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.update( foo ); - } ); + Foo merged2 = scope.fromTransaction( + session -> + session.merge( merged ) + ); - assertEquals( Integer.valueOf( 0 ), bar.getVersion() ); - assertEquals( Integer.valueOf( 1 ), foo.getVersion() ); + assertThat( bar.getVersion() ).isEqualTo( 0 ); + assertThat( merged2.getVersion() ).isEqualTo( 1 ); } @Test - @TestForIssue(jiraKey = "HHH-14319") - public void testUpdateDetachedWithAttachedPersistentSet() { + @JiraKey("HHH-14319") + public void testUpdateDetachedWithAttachedPersistentSet(SessionFactoryScope scope) { final Bar bar = new Bar( 5, "Bar" ); final Set comments = new HashSet<>(); comments.add( new Comment( "abc", "me" ) ); bar.comments = comments; // this should generate versions - TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.save( bar ); + scope.inTransaction( session -> { + session.persist( bar ); } ); - final Bar loadedBar = TransactionUtil.doInHibernate( this::sessionFactory, session -> { + + final Bar loadedBar = scope.fromTransaction( session -> { // We set the comments to the hash set and leave it "dirty" Bar b = session.find( Bar.class, bar.getId() ); b.comments = comments; @@ -167,10 +175,10 @@ public class UpdateDetachedTest extends BaseCoreFunctionalTestCase{ // It's vital that we try merging a detached instance session.detach( b ); - return (Bar) session.merge( b ); + return session.merge( b ); } ); - assertEquals( 1, loadedBar.comments.size() ); + assertThat( loadedBar.comments.size() ).isEqualTo( 1 ); } @Entity(name = "Foo") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java index f40dba6bef..04123002ef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/subselect/SubselectTest.java @@ -32,19 +32,19 @@ public class SubselectTest extends BaseCoreFunctionalTestCase { Item item = new Item(); item.setName("widget"); item.setId(itemId); - s.save(item); + s.persist(item); Bid bid1 = new Bid(); bid1.setAmount(100.0); bid1.setItemId(itemId); bid1.setId(1); - s.save(bid1); + s.persist(bid1); Bid bid2 = new Bid(); bid2.setAmount(200.0); bid2.setItemId(itemId); bid2.setId(2); - s.save(bid2); + s.persist(bid2); //Because we use 'synchronize' annotation, this query should trigger session flush Query query = s.createQuery("from HighestBid b where b.name = :name"); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java index 0e1d3c8db6..73a73a04f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/IndexTest.java @@ -53,8 +53,8 @@ public class IndexTest { tank.setRegistrationNumber( "324VX43" ); session.persist( tank ); session.flush(); - session.delete( tank ); - session.delete( emmanuel ); + session.remove( tank ); + session.remove( emmanuel ); } ); } @@ -77,9 +77,9 @@ public class IndexTest { truck.setCurrentConductor( cond ); session.persist( truck ); session.flush(); - session.delete( truck ); - session.delete( agreement ); - session.delete( cond ); + session.remove( truck ); + session.remove( agreement ); + session.remove( cond ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmTest.java index e29c03bd31..e86a5aba78 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/hbm/HbmTest.java @@ -36,14 +36,14 @@ public class HbmTest { scope.inTransaction( session -> { session.createQuery( "from Government" ).list().forEach( gov -> { - session.delete( gov ); + session.remove( gov ); } ); session.createQuery( "from PrimeMinister" ).list().forEach( p -> { - session.delete( p ); + session.remove( p ); } ); - session.createQuery( "delete from EarthSky" ).executeUpdate(); - session.createQuery( "delete from CloudType" ).executeUpdate(); + session.createMutationQuery( "delete from EarthSky" ).executeUpdate(); + session.createMutationQuery( "delete from CloudType" ).executeUpdate(); } ); } @@ -54,11 +54,11 @@ public class HbmTest { session -> { Government gov = new Government(); gov.setName( "Liberals" ); - session.save( gov ); + session.persist( gov ); PrimeMinister pm = new PrimeMinister(); pm.setName( "Murray" ); pm.setCurrentGovernment( gov ); - session.save( pm ); + session.persist( pm ); } ); } @@ -71,8 +71,8 @@ public class HbmTest { gov.setName( "Liberals" ); Government gov2 = new Government(); gov2.setName( "Liberals2" ); - session.save( gov ); - session.save( gov2 ); + session.persist( gov ); + session.persist( gov2 ); PrimeMinister pm = new PrimeMinister(); pm.setName( "Murray" ); pm.setCurrentGovernment( gov ); @@ -81,7 +81,7 @@ public class HbmTest { pm.getGovernments().add( gov ); gov.setPrimeMinister( pm ); gov2.setPrimeMinister( pm ); - session.save( pm ); + session.persist( pm ); session.flush(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyEagerHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyEagerHbmTest.java index fb4427bf03..783b6f980a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyEagerHbmTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyEagerHbmTest.java @@ -39,7 +39,7 @@ public class AnyEagerHbmTest { final PropertySet propertySet = new PropertySet( "string" ); final Property property = new StringProperty( "name", "Alex" ); propertySet.setSomeProperty( property ); - session.save( propertySet ); + session.persist( propertySet ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyLazyHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyLazyHbmTest.java index d9b41a8c37..2c4a82e2d6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyLazyHbmTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyLazyHbmTest.java @@ -40,7 +40,7 @@ public class AnyLazyHbmTest { LazyPropertySet set = new LazyPropertySet( "string" ); Property property = new StringProperty( "name", "Alex" ); set.setSomeProperty( property ); - session.save( set ); + session.persist( set ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java index 04463ddf5c..de51d699c9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/any/hbm/AnyTypeTest.java @@ -40,8 +40,8 @@ public class AnyTypeTest { scope.inTransaction( session -> { - session.saveOrUpdate( person ); - session.saveOrUpdate( address ); + session.persist( person ); + session.persist( address ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/array/ArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/array/ArrayTest.java index ef900bd681..df1676a439 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/array/ArrayTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/array/ArrayTest.java @@ -45,8 +45,8 @@ public class ArrayTest { assertEquals( 1, retrieved.getBs().length ); assertNotNull( retrieved.getBs()[0] ); - session.delete( retrieved ); - session.delete( retrieved.getBs()[0] ); + session.remove( retrieved ); + session.remove( retrieved.getBs()[0] ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java index debdfbd553..9a9ccb944e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchTest.java @@ -79,7 +79,7 @@ public class BatchTest extends BaseCoreFunctionalTestCase { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); if ( ( i + 1 ) % nBeforeFlush == 0 ) { s.flush(); s.clear(); @@ -114,7 +114,7 @@ public class BatchTest extends BaseCoreFunctionalTestCase { .scroll( ScrollMode.FORWARD_ONLY )) { while ( sr.next() ) { DataPoint dp = (DataPoint) sr.get(); - s.delete( dp ); + s.remove( dp ); if ( ++i % nBeforeFlush == 0 ) { s.flush(); s.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java index b3b9615b02..c16de03fc7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/OptionalSecondaryTableBatchTest.java @@ -74,50 +74,6 @@ public class OptionalSecondaryTableBatchTest { } ); } - @Test - public void testSaveOrUpdate(SessionFactoryScope scope) { - final List companies = scope.fromTransaction( (session) -> { - //noinspection CodeBlock2Expr - return session.createQuery( "from Company", Company.class ).list(); - } ); - - scope.inTransaction( (session) -> { - for ( int i = 0 ; i < companies.size() ; i++ ) { - final Company company = companies.get( i ); - company.taxNumber = 2 * i; - session.saveOrUpdate( company ); - } - } ); - - scope.inTransaction( (session) -> { - for ( int i = 0 ; i < companies.size() ; i++ ) { - assertThat( session.get( Company.class, companies.get( i ).id ).taxNumber ).isEqualTo( 2 * i ); - } - } ); - } - - @Test - public void testUpdate(SessionFactoryScope scope) { - final List companies = scope.fromTransaction( (session) -> { - //noinspection CodeBlock2Expr - return session.createQuery( "from Company", Company.class ).list(); - } ); - - scope.inTransaction( (session) -> { - for ( int i = 0 ; i < companies.size() ; i++ ) { - final Company company = companies.get( i ); - company.taxNumber = 2 * i; - session.update( company ); - } - } ); - - scope.inTransaction( (session) -> { - for ( int i = 0; i < companies.size(); i++ ) { - assertThat( session.get( Company.class, companies.get( i ).id ).taxNumber ).isEqualTo( 2 * i ); - } - } ); - } - @BeforeEach public void setupTestData(SessionFactoryScope scope) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchNotFoundIgnoreDynamicStyleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchNotFoundIgnoreDynamicStyleTest.java index 7fadc048ae..967c468caf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchNotFoundIgnoreDynamicStyleTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchNotFoundIgnoreDynamicStyleTest.java @@ -94,8 +94,8 @@ public class BatchFetchNotFoundIgnoreDynamicStyleTest { session -> { // delete 2nd and 8th Task so that the non-found Task entities will be queried // in 2 different batches. - session.delete( tasks.get( 1 ) ); - session.delete( tasks.get( 7 ) ); + session.remove( tasks.get( 1 ) ); + session.remove( tasks.get( 7 ) ); } ); @@ -136,7 +136,7 @@ public class BatchFetchNotFoundIgnoreDynamicStyleTest { session -> { // delete all but last Task entity for ( int i = 0; i < 7; i++ ) { - session.delete( tasks.get( i ) ); + session.remove( tasks.get( i ) ); } } ); @@ -178,7 +178,7 @@ public class BatchFetchNotFoundIgnoreDynamicStyleTest { scope.inTransaction( session -> { // delete task so it is not found later when getting the Employee. - session.delete( tasks.get( 0 ) ); + session.remove( tasks.get( 0 ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java index 82b5e96ebb..d4e0b4d7f8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/BatchFetchReferencedColumnNameTest.java @@ -62,19 +62,19 @@ public class BatchFetchReferencedColumnNameTest { scope.inTransaction( session -> { Parent p = new Parent(); p.setId( 1L ); - session.save( p ); + session.persist( p ); Child c1 = new Child(); c1.setCreatedOn( ZonedDateTime.now() ); c1.setParentId( 1L ); c1.setId( 10L ); - session.save( c1 ); + session.persist( c1 ); Child c2 = new Child(); c2.setCreatedOn( ZonedDateTime.now() ); c2.setParentId( 1L ); c2.setId( 11L ); - session.save( c2 ); + session.persist( c2 ); } ); scope.inTransaction( session -> { 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 51857ddf28..8f772c8512 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 @@ -58,7 +58,7 @@ public class BatchFetchTest { Model hsv = new Model( cars ); hsv.setName( "hsv" ); hsv.setDescription( "Holden Commodore HSV" ); - session.save( cars ); + session.persist( cars ); ossProductLine.setDescription( "OSS" ); Model jboss = new Model( ossProductLine ); @@ -70,7 +70,7 @@ public class BatchFetchTest { Model cache = new Model( ossProductLine ); cache.setName( "JBossCache" ); cache.setDescription( "JBoss TreeCache" ); - session.save( ossProductLine ); + session.persist( ossProductLine ); } ); @@ -127,8 +127,8 @@ public class BatchFetchTest { ProductLine oss = list.get( 1 ); assertEquals( cars.getModels().size(), 2 ); assertEquals( oss.getModels().size(), 3 ); - session.delete( cars ); - session.delete( oss ); + session.remove( cars ); + session.remove( oss ); } ); } @@ -140,7 +140,7 @@ public class BatchFetchTest { scope.inTransaction( session -> { for ( int i = 0; i < size; i++ ) { - session.save( new BatchLoadableEntity( i ) ); + session.persist( new BatchLoadableEntity( i ) ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java index c31092b37c..316e06afbf 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/batchfetch/DynamicBatchFetchTestCase.java @@ -46,8 +46,8 @@ public class DynamicBatchFetchTestCase { IntStream.range( 0, numberOfCountries ).forEach( i -> { Country c = new Country( "Country " + i ); - session.save( c ); - session.save( new City( "City " + i, c ) ); + session.persist( c ); + session.persist( new City( "City " + i, c ) ); } ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessTest.java index 9213b3d397..9e5892b1ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/access/jpa/AccessTest.java @@ -74,7 +74,7 @@ public class AccessTest { User user = session.get( User.class, john.getId() ); assertEquals( 1, user.getFriends().size(), "Wrong number of friends" ); assertNull( user.firstname ); - session.delete( user ); + session.remove( user ); tx.commit(); } ); @@ -98,7 +98,7 @@ public class AccessTest { Furniture retrievedFurniture = session.get( Furniture.class, fur.getId() ); assertFalse( retrievedFurniture.isAlive ); assertNotNull( retrievedFurniture.getColor() ); - session.delete( retrievedFurniture ); + session.remove( retrievedFurniture ); tx.commit(); } ); @@ -119,7 +119,7 @@ public class AccessTest { tx = session.beginTransaction(); Furniture retrievedFurniture = session.get( Furniture.class, fur.getId() ); assertNotNull( retrievedFurniture.getGod() ); - session.delete( retrievedFurniture ); + session.remove( retrievedFurniture ); tx.commit(); } ); @@ -140,7 +140,7 @@ public class AccessTest { tx = session.beginTransaction(); Furniture retrievedFurniture = session.get( Furniture.class, fur.getId() ); assertEquals( 5, retrievedFurniture.weight ); - session.delete( retrievedFurniture ); + session.remove( retrievedFurniture ); tx.commit(); } ); @@ -162,7 +162,7 @@ public class AccessTest { tx = session.beginTransaction(); Chair retrievedChair = session.get( Chair.class, chair.getId() ); assertNull( retrievedChair.getPillow() ); - session.delete( retrievedChair ); + session.remove( retrievedChair ); tx.commit(); } ); @@ -183,7 +183,7 @@ public class AccessTest { BigBed retievedBed = session.get( BigBed.class, bed.getId() ); assertEquals( 5, retievedBed.size ); assertNull( retievedBed.getQuality() ); - session.delete( retievedBed ); + session.remove( retievedBed ); tx.commit(); } ); @@ -204,7 +204,7 @@ public class AccessTest { Gardenshed retrievedGardenshed = session.get( Gardenshed.class, gs.getId() ); assertEquals( 4, retrievedGardenshed.floors ); assertEquals( 6, retrievedGardenshed.getFloors() ); - session.delete( retrievedGardenshed ); + session.remove( retrievedGardenshed ); tx.commit(); } ); @@ -234,7 +234,7 @@ public class AccessTest { catch (RuntimeException e) { // success } - session.delete( retrievedCircle ); + session.remove( retrievedCircle ); tx.commit(); } ); @@ -262,7 +262,7 @@ public class AccessTest { catch (RuntimeException e) { // success } - session.delete( retrievedsquare ); + session.remove( retrievedsquare ); tx.commit(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java index 8b8064504f..557fbf6bb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/EmbeddedOverrideTests.java @@ -127,10 +127,10 @@ public class EmbeddedOverrideTests { session -> { session.createQuery( "from DomesticCustomer", DomesticCustomer.class ) .list() - .forEach( cust -> session.delete( cust ) ); + .forEach( cust -> session.remove( cust ) ); session.createQuery( "from ForeignCustomer", ForeignCustomer.class ) .list() - .forEach( cust -> session.delete( cust ) ); + .forEach( cust -> session.remove( cust ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java index 3854810d8f..c2fc180810 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/MappedSuperclassOverrideTests.java @@ -93,10 +93,10 @@ public class MappedSuperclassOverrideTests { session -> { session.createQuery( "from DomesticCustomer", DomesticCustomer.class ) .list() - .forEach( cust -> session.delete( cust ) ); + .forEach( cust -> session.remove( cust ) ); session.createQuery( "from ForeignCustomer", ForeignCustomer.class ) .list() - .forEach( cust -> session.delete( cust ) ); + .forEach( cust -> session.remove( cust ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java index a546aac422..d7bc941d7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/attributeOverrides/TablePerClassOverrideTests.java @@ -117,10 +117,10 @@ public class TablePerClassOverrideTests { session -> { session.createQuery( "from DomesticCustomer", DomesticCustomer.class ) .list() - .forEach( cust -> session.delete( cust ) ); + .forEach( cust -> session.remove( cust ) ); session.createQuery( "from ForeignCustomer", ForeignCustomer.class ) .list() - .forEach( cust -> session.delete( cust ) ); + .forEach( cust -> session.remove( cust ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java index 3412ad1793..84fc279150 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCheckQueryExecutedTest.java @@ -94,8 +94,8 @@ public class EmbeddedCheckQueryExecutedTest { session -> { InternetProvider internetProvider = session.get( InternetProvider.class, provider.getId() ); Manager manager = internetProvider.getOwner().getTopManagement().iterator().next(); - session.delete( manager ); - session.delete( internetProvider ); + session.remove( manager ); + session.remove( internetProvider ); } ); } @@ -140,8 +140,8 @@ public class EmbeddedCheckQueryExecutedTest { session -> { InternetProvider internetProvider = session.get( InternetProvider.class, provider.getId() ); Manager manager = internetProvider.getOwner().getTopManagement().iterator().next(); - session.delete( manager ); - session.delete( internetProvider ); + session.remove( manager ); + session.remove( internetProvider ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java index 0e570bf92e..b156b91f13 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedCircularFetchTests.java @@ -60,7 +60,7 @@ public class EmbeddedCircularFetchTests { session -> { RootEntity root = new RootEntity(); root.id = 1; - session.save( root ); + session.persist( root ); LeafEntity leafEntity1 = new LeafEntity(); leafEntity1.id = 10; @@ -68,8 +68,8 @@ public class EmbeddedCircularFetchTests { LeafEntity leafEntity2 = new LeafEntity(); leafEntity2.id = 11; - session.save( leafEntity1 ); - session.save( leafEntity2 ); + session.persist( leafEntity1 ); + session.persist( leafEntity2 ); leafEntity2.rootEntity = root; leafEntity1.rootEntity = root; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java index 0cf5ee0d02..0994fc0fe6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java @@ -66,7 +66,7 @@ public class EmbeddedTest { public void cleanup(SessionFactoryScope scope) { scope.inTransaction( session -> { for ( Person person : session.createQuery( "from Person", Person.class ).getResultList() ) { - session.delete( person ); + session.remove( person ); } session.createQuery( "delete from InternetProvider" ).executeUpdate(); session.createQuery( "delete from Manager" ).executeUpdate(); @@ -347,7 +347,7 @@ public class EmbeddedTest { assertNotNull( "Floating leg retrieved as null", floating ); assertEquals( Frequency.SEMIANNUALLY, fixed.getPaymentFrequency() ); assertEquals( Frequency.QUARTERLY, floating.getPaymentFrequency() ); - session.delete( vanillaSwap ); + session.remove( vanillaSwap ); } ); } @@ -444,7 +444,7 @@ public class EmbeddedTest { assertEquals( 1.1, spreadDeal.getShortSwap().getFloatLeg().getRateSpread(), 0.01 ); assertEquals( 0.8, spreadDeal.getSwap().getFloatLeg().getRateSpread(), 0.01 ); assertEquals( 0.8, spreadDeal.getLongSwap().getFloatLeg().getRateSpread(), 0.01 ); - session.delete( spreadDeal ); + session.remove( spreadDeal ); } ); } @@ -471,7 +471,7 @@ public class EmbeddedTest { Book loadedBook = session.get( Book.class, book.getIsbn() ); assertNotNull( loadedBook.getSummary() ); assertEquals( book.getSummary().getText(), loadedBook.getSummary().getText() ); - session.delete( loadedBook ); + session.remove( loadedBook ); tx.commit(); } catch (Exception e) { @@ -504,7 +504,7 @@ public class EmbeddedTest { Book loadedBook = session.get( Book.class, book.getIsbn() ); assertNotNull( loadedBook.getSummary() ); assertEquals( loadedBook, loadedBook.getSummary().getSummarizedBook() ); - session.delete( loadedBook ); + session.remove( loadedBook ); } ); } @@ -544,9 +544,9 @@ public class EmbeddedTest { ); assertNotNull( "2nd Many to one not set", internetProvider.getOwner().getOrigin() ); assertEquals( "Wrong 2nd link", nat.getName(), internetProvider.getOwner().getOrigin().getName() ); - session.delete( internetProvider ); - session.delete( internetProvider.getOwner().getCorporationType() ); - session.delete( internetProvider.getOwner().getOrigin() ); + session.remove( internetProvider ); + session.remove( internetProvider.getOwner().getCorporationType() ); + session.remove( internetProvider.getOwner().getOrigin() ); } ); } @@ -579,8 +579,8 @@ public class EmbeddedTest { assertEquals( "Wrong number of elements", 1, topManagement.size() ); Manager manager = topManagement.iterator().next(); assertEquals( "Wrong element", "Bill", manager.getName() ); - session.delete( manager ); - session.delete( internetProvider ); + session.remove( manager ); + session.remove( internetProvider ); } ); } @@ -640,8 +640,8 @@ public class EmbeddedTest { session -> { InternetProvider internetProvider = session.get( InternetProvider.class, provider.getId() ); Manager manager = internetProvider.getOwner().getTopManagement().iterator().next(); - session.delete( manager ); - session.delete( internetProvider ); + session.remove( manager ); + session.remove( internetProvider ); } ); } 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 826459e783..17817442cc 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 @@ -35,7 +35,7 @@ public class InvocationTargetExceptionTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); Bean bean = new Bean(); bean.setSomeString( "my-bean" ); - s.save( bean ); + s.persist( bean ); s.getTransaction().commit(); s.close(); @@ -54,7 +54,7 @@ public class InvocationTargetExceptionTest extends BaseCoreFunctionalTestCase { fail( "unexpected exception type : " + t ); } - s.delete( bean ); + s.remove( bean ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/BagAndSetFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/BagAndSetFetchTest.java index 6096df1da2..ad4dffb352 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/BagAndSetFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/BagAndSetFetchTest.java @@ -67,20 +67,20 @@ public class BagAndSetFetchTest { a.addAttribute( b ); a.addAttribute( b1 ); - session.save( c ); - session.save( c1 ); - session.save( c2 ); - session.save( c3 ); - session.save( c4 ); + session.persist( c ); + session.persist( c1 ); + session.persist( c2 ); + session.persist( c3 ); + session.persist( c4 ); - session.save( d ); - session.save( d1 ); - session.save( d2 ); + session.persist( d ); + session.persist( d1 ); + session.persist( d2 ); - session.save( b ); - session.save( b1 ); + session.persist( b ); + session.persist( b1 ); - session.save( a ); + session.persist( a ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/EagerBagsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/EagerBagsTest.java index 8b6c3b5c64..4d5cf481af 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/EagerBagsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/bag/EagerBagsTest.java @@ -58,16 +58,16 @@ public class EagerBagsTest { a.addAttribute( b ); a.addAttribute( b1 ); - session.save( c ); - session.save( c1 ); - session.save( c2 ); - session.save( c3 ); - session.save( c4 ); + session.persist( c ); + session.persist( c1 ); + session.persist( c2 ); + session.persist( c3 ); + session.persist( c4 ); - session.save( b ); - session.save( b1 ); + session.persist( b ); + session.persist( b1 ); - session.save( a ); + session.persist( a ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java index 7d7cfb54a4..cb05208536 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/BasicSessionTest.java @@ -39,8 +39,8 @@ public class BasicSessionTest { @Test public void test(SessionFactoryScope scope) { scope.inTransaction( s -> { - s.save( new MyEntity( 1L ) ); - s.save( new MyEntity( 2L ) ); + s.persist( new MyEntity( 1L ) ); + s.persist( new MyEntity( 2L ) ); } ); MyEntity[] entities = new MyEntity[2]; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java index 46a8dfdbef..2584191722 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionTest.java @@ -74,7 +74,7 @@ public class CascadeDeleteCollectionTest { .uniqueResult(); checkInterceptor( scope, loadedParent, false ); assertFalse( Hibernate.isInitialized( loadedParent.getChildren() ) ); - s.delete( loadedParent ); + s.remove( loadedParent ); } ); // If the lazy relation is not fetch on cascade there is a constraint violation on commit } @@ -90,7 +90,7 @@ public class CascadeDeleteCollectionTest { checkInterceptor( scope, loadedParent, false ); loadedParent.getChildren().size(); assertTrue( Hibernate.isInitialized( loadedParent.getChildren() ) ); - s.delete( loadedParent ); + s.remove( loadedParent ); } ); // If the lazy relation is not fetch on cascade there is a constraint violation on commit } @@ -108,7 +108,7 @@ public class CascadeDeleteCollectionTest { // Delete the detached Parent with uninitialized children scope.inTransaction( s -> { - s.delete( detachedParent ); + s.remove( detachedParent ); } ); // If the lazy relation is not fetch on cascade there is a constraint violation on commit } @@ -129,7 +129,7 @@ public class CascadeDeleteCollectionTest { // Delete the detached Parent with initialized children scope.inTransaction( s -> { - s.delete( detachedParent ); + s.remove( detachedParent ); } ); // If the lazy relation is not fetch on cascade there is a constraint violation on commit } @@ -145,7 +145,7 @@ public class CascadeDeleteCollectionTest { // Delete the Parent scope.inTransaction( s -> { - s.delete( originalParent ); + s.remove( originalParent ); } ); // If the lazy relation is not fetch on cascade there is a constraint violation on commit } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.java index c8701fb41c..da447930c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest.java @@ -84,7 +84,7 @@ public class CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest { .uniqueResult(); checkInterceptor( scope, loadedParent, false ); assertFalse( Hibernate.isPropertyInitialized( loadedParent, "children" ) ); - s.delete( loadedParent ); + s.remove( loadedParent ); } ); // If the lazy relation is not fetch on cascade there is a constraint violation on commit } @@ -100,7 +100,7 @@ public class CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest { checkInterceptor( scope, loadedParent, false ); loadedParent.getChildren(); assertTrue( Hibernate.isPropertyInitialized( loadedParent, "children" ) ); - s.delete( loadedParent ); + s.remove( loadedParent ); } ); // If the lazy relation is not fetch on cascade there is a constraint violation on commit } @@ -118,7 +118,7 @@ public class CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest { // Delete the detached Parent with uninitialized children scope.inTransaction( s -> { - s.delete( detachedParent ); + s.remove( detachedParent ); } ); // If the lazy relation is not fetch on cascade there is a constraint violation on commit } @@ -141,7 +141,7 @@ public class CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest { // Delete the detached Parent with initialized children scope.inTransaction( s -> { - s.delete( detachedParent ); + s.remove( detachedParent ); } ); // If the lazy relation is not fetch on cascade there is a constraint violation on commit } @@ -157,7 +157,7 @@ public class CascadeDeleteCollectionWithCollectionInDefaultFetchGroupFalseTest { // Delete the Parent scope.inTransaction( s -> { - s.delete( originalParent ); + s.remove( originalParent ); } ); // If the lazy relation is not fetch on cascade there is a constraint violation on commit } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java index 1adebccaad..368ffb36f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeDeleteManyToOneTest.java @@ -85,7 +85,7 @@ public class CascadeDeleteManyToOneTest { assertThat( managedChild.getParent() ).isNotInstanceOf( HibernateProxy.class ); assertFalse( Hibernate.isInitialized( managedChild.getParent() ) ); - s.delete( managedChild ); + s.remove( managedChild ); } ); @@ -122,7 +122,7 @@ public class CascadeDeleteManyToOneTest { // Delete the detached Child with initialized parent scope.inTransaction( - (s) -> s.delete( detachedChild ) + (s) -> s.remove( detachedChild ) ); // Explicitly check that both got deleted @@ -144,7 +144,7 @@ public class CascadeDeleteManyToOneTest { // Delete the Child scope.inTransaction( s -> { - s.delete( originalChild ); + s.remove( originalChild ); } ); // Explicitly check that both got deleted diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java index 255711c34f..7f62eab8db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedTest.java @@ -133,7 +133,7 @@ public class CascadeOnUninitializedTest { final SQLStatementInspector statementInspector = extractFromSession( session ); statementInspector.clear(); - session.delete( detachedPerson ); + session.remove( detachedPerson ); // 1) select Person#addresses // 2) select Person#primaryAddress @@ -184,7 +184,7 @@ public class CascadeOnUninitializedTest { // deleting detachedPerson should result in detachedPerson.address being initialized, // so that the DELETE operation can be cascaded to it. - scope.inTransaction( session -> session.delete( detachedPerson ) ); + scope.inTransaction( session -> session.remove( detachedPerson ) ); // both the Person and its Address should be deleted scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedWithCollectionInDefaultFetchGroupFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedWithCollectionInDefaultFetchGroupFalseTest.java index 0dbd86f2ce..306a1f2bbb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedWithCollectionInDefaultFetchGroupFalseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeOnUninitializedWithCollectionInDefaultFetchGroupFalseTest.java @@ -143,7 +143,7 @@ public class CascadeOnUninitializedWithCollectionInDefaultFetchGroupFalseTest { final SQLStatementInspector statementInspector = extractFromSession( session ); statementInspector.clear(); - session.delete( detachedPerson ); + session.remove( detachedPerson ); // 1) select Person#addresses // 2) select Person#primaryAddress @@ -197,7 +197,7 @@ public class CascadeOnUninitializedWithCollectionInDefaultFetchGroupFalseTest { // deleting detachedPerson should result in detachedPerson.address being initialized, // so that the DELETE operation can be cascaded to it. - scope.inTransaction( session -> session.delete( detachedPerson ) ); + scope.inTransaction( session -> session.remove( detachedPerson ) ); // both the Person and its Address should be deleted scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java index c27fa9e102..74b3b760ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/AbstractMultiPathCircleCascadeTest.java @@ -53,48 +53,12 @@ public abstract class AbstractMultiPathCircleCascadeTest { return s.merge( entity ); } }; - private static EntityOperation SAVE_OPERATION = - new EntityOperation() { - @Override - public boolean isLegacy() { - return true; - } - - @Override - public Object doEntityOperation(Object entity, Session s) { - s.save( entity ); - return entity; - } - }; - private static EntityOperation SAVE_UPDATE_OPERATION = - new EntityOperation() { - @Override - public boolean isLegacy() { - return true; - } - - @Override - public Object doEntityOperation(Object entity, Session s) { - s.saveOrUpdate( entity ); - return entity; - } - }; @Test public void testMergeEntityWithNonNullableTransientEntity(SessionFactoryScope scope) { testEntityWithNonNullableTransientEntity( scope, MERGE_OPERATION ); } - @Test - public void testSaveEntityWithNonNullableTransientEntity(SessionFactoryScope scope) { - testEntityWithNonNullableTransientEntity( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateEntityWithNonNullableTransientEntity(SessionFactoryScope scope) { - testEntityWithNonNullableTransientEntity( scope, SAVE_UPDATE_OPERATION ); - } - private void testEntityWithNonNullableTransientEntity(SessionFactoryScope scope, EntityOperation operation) { Route route = getUpdatedDetachedEntity( scope ); @@ -136,16 +100,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testEntityWithNonNullableEntityNull( scope, MERGE_OPERATION ); } - @Test - public void testSaveEntityWithNonNullableEntityNull(SessionFactoryScope scope) { - testEntityWithNonNullableEntityNull( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateEntityWithNonNullableEntityNull(SessionFactoryScope scope) { - testEntityWithNonNullableEntityNull( scope, SAVE_UPDATE_OPERATION ); - } - private void testEntityWithNonNullableEntityNull(SessionFactoryScope scope, EntityOperation operation) { Route route = getUpdatedDetachedEntity( scope ); @@ -181,18 +135,9 @@ public abstract class AbstractMultiPathCircleCascadeTest { testEntityWithNonNullablePropSetToNull( scope, MERGE_OPERATION ); } - @Test - public void testSaveEntityWithNonNullablePropSetToNull(SessionFactoryScope scope) { - testEntityWithNonNullablePropSetToNull( scope, SAVE_OPERATION ); - } + void testEntityWithNonNullablePropSetToNull(SessionFactoryScope scope, EntityOperation operation) { + final Route route = getUpdatedDetachedEntity( scope );; - @Test - public void testSaveUpdateEntityWithNonNullablePropSetToNull(SessionFactoryScope scope) { - testEntityWithNonNullablePropSetToNull( scope, SAVE_UPDATE_OPERATION ); - } - - private void testEntityWithNonNullablePropSetToNull(SessionFactoryScope scope, EntityOperation operation) { - Route route = getUpdatedDetachedEntity( scope ); Node node = (Node) route.getNodes().iterator().next(); node.setName( null ); @@ -226,11 +171,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testRoute( MERGE_OPERATION, scope ); } - // skip SAVE_OPERATION since Route is not transient - @Test - public void testSaveUpdateRoute(SessionFactoryScope scope) { - testRoute( SAVE_UPDATE_OPERATION, scope ); - } private void testRoute( EntityOperation operation, SessionFactoryScope scope) { @@ -259,16 +199,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testPickupNode( scope, MERGE_OPERATION ); } - @Test - public void testSavePickupNode(SessionFactoryScope scope) { - testPickupNode( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdatePickupNode(SessionFactoryScope scope) { - testPickupNode( scope, SAVE_UPDATE_OPERATION ); - } - private void testPickupNode(SessionFactoryScope scope, EntityOperation operation) { Route r = getUpdatedDetachedEntity( scope ); @@ -309,16 +239,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testDeliveryNode( scope, MERGE_OPERATION ); } - @Test - public void testSaveDeliveryNode(SessionFactoryScope scope) { - testDeliveryNode( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateDeliveryNode(SessionFactoryScope scope) { - testDeliveryNode( scope, SAVE_UPDATE_OPERATION ); - } - private void testDeliveryNode(SessionFactoryScope scope, EntityOperation operation) { Route r = getUpdatedDetachedEntity( scope ); @@ -360,15 +280,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testTour( scope, MERGE_OPERATION ); } - @Test - public void testSaveTour(SessionFactoryScope scope) { - testTour( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateTour(SessionFactoryScope scope) { - testTour( scope, SAVE_UPDATE_OPERATION ); - } private void testTour(SessionFactoryScope scope, EntityOperation operation) { @@ -397,16 +308,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testTransport( scope, MERGE_OPERATION ); } - @Test - public void testSaveTransport(SessionFactoryScope scope) { - testTransport( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateTransport(SessionFactoryScope scope) { - testTransport( scope, SAVE_UPDATE_OPERATION ); - } - private void testTransport(SessionFactoryScope scope, EntityOperation operation) { Route r = getUpdatedDetachedEntity( scope ); @@ -439,12 +340,55 @@ public abstract class AbstractMultiPathCircleCascadeTest { ); } - private Node getSimpleUpdatedDetachedEntity() { +// private Node getSimpleUpdatedDetachedEntity() { +// +// Node deliveryNode = new Node(); +// deliveryNode.setName( "deliveryNodeB" ); +// return deliveryNode; +// } - Node deliveryNode = new Node(); - deliveryNode.setName( "deliveryNodeB" ); - return deliveryNode; - } +// private Route createEntity() { +// +// Route route = new Route(); +// route.setName( "routeA" ); +// +// route.setName( "new routeA" ); +// route.setTransientField( "sfnaouisrbn" ); +// +// Tour tour = new Tour(); +// tour.setName( "tourB" ); +// +// Transport transport = new Transport(); +// transport.setName( "transportB" ); +// +// Node pickupNode = new Node(); +// pickupNode.setName( "pickupNodeB" ); +// +// Node deliveryNode = new Node(); +// deliveryNode.setName( "deliveryNodeB" ); +// +// pickupNode.setRoute( route ); +// pickupNode.setTour( tour ); +// pickupNode.getPickupTransports().add( transport ); +// pickupNode.setTransientField( "pickup node aaaaaaaaaaa" ); +// +// deliveryNode.setRoute( route ); +// deliveryNode.setTour( tour ); +// deliveryNode.getDeliveryTransports().add( transport ); +// deliveryNode.setTransientField( "delivery node aaaaaaaaa" ); +// +// tour.getNodes().add( pickupNode ); +// tour.getNodes().add( deliveryNode ); +// +// route.getNodes().add( pickupNode ); +// route.getNodes().add( deliveryNode ); +// +// transport.setPickupNode( pickupNode ); +// transport.setDeliveryNode( deliveryNode ); +// transport.setTransientField( "aaaaaaaaaaaaaa" ); +// +// return route; +// } private Route getUpdatedDetachedEntity(SessionFactoryScope scope) { @@ -453,7 +397,7 @@ public abstract class AbstractMultiPathCircleCascadeTest { session -> { route.setName( "routeA" ); - session.save( route ); + session.persist( route ); } ); @@ -568,15 +512,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testData3Nodes( scope, MERGE_OPERATION ); } - @Test - public void testSaveData3Nodes(SessionFactoryScope scope) { - testData3Nodes( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateData3Nodes(SessionFactoryScope scope) { - testData3Nodes( scope, SAVE_UPDATE_OPERATION ); - } private void testData3Nodes(SessionFactoryScope scope, EntityOperation operation) { @@ -585,7 +520,7 @@ public abstract class AbstractMultiPathCircleCascadeTest { session -> { r.setName( "routeA" ); - session.save( r ); + session.persist( r ); } ); @@ -669,7 +604,7 @@ public abstract class AbstractMultiPathCircleCascadeTest { } } else { - Assertions.assertTrue( ( ex instanceof JDBCException ) || ( ex.getCause() instanceof JDBCException ) ); + Assertions.assertTrue( ( ex instanceof JDBCException ) || ( ex.getCause() instanceof JDBCException ), ex.getMessage() ); } } else { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java index c4d97bdecc..fb27f3568d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java @@ -15,7 +15,9 @@ import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.Setting; +import org.junit.jupiter.api.Test; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java index 1ae009c042..61fcf34dc9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java @@ -15,7 +15,9 @@ import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced; import org.hibernate.testing.orm.junit.DomainModel; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.hibernate.testing.orm.junit.Setting; +import org.junit.jupiter.api.Test; /** * @author Gail Badner diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/deletetransient/DeleteTransientEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/deletetransient/DeleteTransientEntityTest.java index d45d0fa5c5..792ac41db9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/deletetransient/DeleteTransientEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/deletetransient/DeleteTransientEntityTest.java @@ -88,7 +88,7 @@ public class DeleteTransientEntityTest { session -> { Person p = new Person(); p.getAddresses().add( address ); - session.delete( p ); + session.remove( p ); } ); @@ -117,7 +117,7 @@ public class DeleteTransientEntityTest { Address address = session.get( Address.class, id ); Person p = new Person(); p.getAddresses().add( address ); - session.delete( p ); + session.remove( p ); } ); @@ -138,7 +138,7 @@ public class DeleteTransientEntityTest { session -> { address.setInfo( "123 Main St." ); p.getAddresses().add( address ); - session.save( p ); + session.persist( p ); } ); @@ -147,7 +147,7 @@ public class DeleteTransientEntityTest { Suite suite = new Suite(); address.getSuites().add( suite ); p.getAddresses().clear(); - session.saveOrUpdate( p ); + session.merge( p ); } ); @@ -173,7 +173,7 @@ public class DeleteTransientEntityTest { scope.inTransaction( session -> { - session.save( address ); + session.persist( address ); } ); @@ -183,7 +183,7 @@ public class DeleteTransientEntityTest { note.setDescription( "a description" ); suite.getNotes().add( note ); address.getSuites().clear(); - session.saveOrUpdate( address ); + session.merge( address ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNotInDefaultFetchGroupPersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNotInDefaultFetchGroupPersistTest.java index 0a346683f3..a9d1720825 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNotInDefaultFetchGroupPersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingNotInDefaultFetchGroupPersistTest.java @@ -66,7 +66,7 @@ public class DirtyTrackingNotInDefaultFetchGroupPersistTest { } ); scope.inTransaction( session -> { hentity.bumpNumber(); - session.saveOrUpdate( hentity ); + session.merge( hentity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java index b77f9798b4..68a0cb6947 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java @@ -64,7 +64,7 @@ public class DirtyTrackingPersistTest { } ); scope.inTransaction( session -> { hentity.bumpNumber(); - session.saveOrUpdate( hentity ); + session.merge( hentity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java index cd052c4503..78a1033966 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/eviction/EvictionTest.java @@ -85,7 +85,7 @@ public class EvictionTest { assertNull( managedParent.$$_hibernate_getPreviousManagedEntity() ); assertNull( managedParent.$$_hibernate_getNextManagedEntity() ); - s.delete( managedParent ); + s.remove( managedParent ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/join/HHH3949Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/join/HHH3949Test.java index 3cc96b41dd..c15c7c6d5f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/join/HHH3949Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/join/HHH3949Test.java @@ -69,21 +69,21 @@ public class HHH3949Test { Person person1 = new Person( "Johnny" ); Person person2 = new Person( "Ricky" ); Person person3 = new Person( "Rosy" ); - s.save( person1 ); - s.save( person2 ); - s.save( person3 ); + s.persist( person1 ); + s.persist( person2 ); + s.persist( person3 ); Vehicle vehicle1 = new Vehicle( "Volkswagen Golf" ); vehicle1.setDriver( person1 ); - s.save( vehicle1 ); + s.persist( vehicle1 ); Vehicle vehicle2 = new Vehicle( "Subaru Impreza" ); vehicle2.setDriver( person2 ); person2.setVehicle( vehicle2 ); - s.save( vehicle2 ); + s.persist( vehicle2 ); Vehicle vehicle3 = new Vehicle( "Renault Truck" ); - s.save( vehicle3 ); + s.persist( vehicle3 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java index 890c8edcf2..ffebe26cdc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest1.java @@ -46,9 +46,9 @@ public class UnexpectedDeleteTest1 { Bar bar1 = new Bar(); Bar bar2 = new Bar(); Foo foo = new Foo(); - s.save( bar1 ); - s.save( bar2 ); - s.save( foo ); + s.persist( bar1 ); + s.persist( bar2 ); + s.persist( foo ); bar1.foo = foo; bar2.foo = foo; fooId = foo.id; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java index fa8121e4b3..3c342b0312 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest2.java @@ -43,9 +43,9 @@ public class UnexpectedDeleteTest2 { Bar bar = new Bar(); Foo foo1 = new Foo(); Foo foo2 = new Foo(); - s.save( bar ); - s.save( foo1 ); - s.save( foo2 ); + s.persist( bar ); + s.persist( foo1 ); + s.persist( foo2 ); bar.foos.add( foo1 ); bar.foos.add( foo2 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java index fbe0bbfc7e..bcee75a8c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/HHH_10708/UnexpectedDeleteTest3.java @@ -42,14 +42,14 @@ public class UnexpectedDeleteTest3 { scope.inTransaction( s -> { Child child = new Child(); child.setId( 2L ); - s.save( child ); + s.persist( child ); Parent parent = new Parent(); parent.setId( 1L ); parent.setNames( Collections.singleton( "name" ) ); parent.addChild( child ); - s.save( parent ); + s.persist( parent ); } ); } @@ -60,12 +60,12 @@ public class UnexpectedDeleteTest3 { Child child = new Child(); child.setId( 1L ); - s.save( child ); + s.persist( child ); parent.addChild( child ); // We need to leave at least one attribute unfetchd //parent.getNames().size(); - s.save( parent ); + s.persist( parent ); } ); scope.inTransaction( s -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java index edfd29db42..5df558d21f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionDeletedTest.java @@ -73,8 +73,8 @@ public class LazyCollectionDeletedTest { details.post = post; details.details = "Some data"; post.additionalDetails = details; - - postId = (Long) s.save( post ); + s.persist( post ); + postId = post.id; } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java index 685b9ea721..f9bdc39ed7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazyCollectionHandlingTest.java @@ -37,7 +37,7 @@ public class LazyCollectionHandlingTest { public void test(SessionFactoryScope scope) { scope.inTransaction( s -> { JafSid sid = new JafSid(); - s.save( sid ); + s.persist( sid ); s.flush(); s.clear(); 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 3766062d6a..990e747a6d 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 @@ -60,7 +60,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); // modify detached entity @@ -82,7 +82,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); // modify detached entity @@ -108,18 +108,18 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); // modify detached entity modifyEntity( a ); - scope.inTransaction( + A merged = scope.fromTransaction( session -> - session.update( a ) + session.merge( a ) ); - verifyModifications( scope, a.getId() ); + verifyModifications( scope, merged.getId() ); } @Test @@ -131,7 +131,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); scope.inTransaction( @@ -154,7 +154,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); // modify detached entity @@ -205,7 +205,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); // modify detached entity @@ -255,7 +255,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); // modify detached entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java index efa2adffc9..cb9ef648ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/NaturalIdInUninitializedAssociationTest.java @@ -121,7 +121,7 @@ public class NaturalIdInUninitializedAssociationTest { public void cleanUpTestData(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.delete( session.get( AnEntity.class, 3 ) ); + session.remove( session.get( AnEntity.class, 3 ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java index c6927f6850..dda489462b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/StatelessQueryScrollingTest.java @@ -115,20 +115,20 @@ public class StatelessQueryScrollingTest { Resource yourClock = new Resource( "clock", you ); Task task = new Task( me, "clean", yourClock, now ); // :) - session.save( me ); - session.save( you ); - session.save( yourClock ); - session.save( task ); + session.persist( me ); + session.persist( you ); + session.persist( yourClock ); + session.persist( task ); User u3 = new User( "U3" ); User u4 = new User( "U4" ); Resource it = new Resource( "it", u4 ); Task task2 = new Task( u3, "beat", it, now ); // :)) - session.save( u3 ); - session.save( u4 ); - session.save( it ); - session.save( task2 ); + session.persist( u3 ); + session.persist( u4 ); + session.persist( it ); + session.persist( task2 ); } ); @@ -137,22 +137,22 @@ public class StatelessQueryScrollingTest { Producer p1 = new Producer( 1, "Acme" ); Producer p2 = new Producer( 2, "ABC" ); - session.save( p1 ); - session.save( p2 ); + session.persist( p1 ); + session.persist( p2 ); Vendor v1 = new Vendor( 1, "v1" ); Vendor v2 = new Vendor( 2, "v2" ); - session.save( v1 ); - session.save( v2 ); + session.persist( v1 ); + session.persist( v2 ); final Product product1 = new Product( 1, "123", v1, p1 ); final Product product2 = new Product( 2, "456", v1, p1 ); final Product product3 = new Product( 3, "789", v1, p2 ); - session.save( product1 ); - session.save( product2 ); - session.save( product3 ); + session.persist( product1 ); + session.persist( product2 ); + session.persist( product3 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/backref/BackrefCompositeMapKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/backref/BackrefCompositeMapKeyTest.java index 3ffc704851..0e81987bf2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/backref/BackrefCompositeMapKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/backref/BackrefCompositeMapKeyTest.java @@ -59,7 +59,7 @@ public class BackrefCompositeMapKeyTest { prod.getParts().remove( mapKey ); - session.delete( prod ); + session.remove( prod ); } ); @@ -90,7 +90,7 @@ public class BackrefCompositeMapKeyTest { scope.inTransaction( session -> - session.delete( session.get( Product.class, "Widget" ) ) + session.remove( session.get( Product.class, "Widget" ) ) ); } @@ -115,7 +115,7 @@ public class BackrefCompositeMapKeyTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); @@ -147,69 +147,7 @@ public class BackrefCompositeMapKeyTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); - } - ); - } - - @Test - public void testOrphanDeleteOnSaveOrUpdate(SessionFactoryScope scope) { - Product prod = new Product( "Widget" ); - MapKey mapKey = new MapKey( "Top" ); - scope.inTransaction( - session -> { - Part part = new Part( "Widge", "part if a Widget" ); - prod.getParts().put( mapKey, part ); - Part part2 = new Part( "Get", "another part if a Widget" ); - prod.getParts().put( new MapKey( "Bottom" ), part2 ); - session.persist( prod ); - } - ); - - prod.getParts().remove( mapKey ); - - scope.inTransaction( - session -> - session.saveOrUpdate( prod ) - ); - - scope.inTransaction( - session -> { - assertNull( session.get( Part.class, "Widge" ) ); - assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); - } - ); - } - - @Test - public void testOrphanDeleteOnSaveOrUpdateAfterSerialization(SessionFactoryScope scope) { - Product prod = new Product( "Widget" ); - MapKey mapKey = new MapKey( "Top" ); - scope.inTransaction( - session -> { - Part part = new Part( "Widge", "part if a Widget" ); - prod.getParts().put( mapKey, part ); - Part part2 = new Part( "Get", "another part if a Widget" ); - prod.getParts().put( new MapKey( "Bottom" ), part2 ); - session.persist( prod ); - } - ); - - prod.getParts().remove( mapKey ); - - Product cloned = (Product) SerializationHelper.clone( prod ); - - scope.inTransaction( - session -> - session.saveOrUpdate( cloned ) - ); - - scope.inTransaction( - session -> { - assertNull( session.get( Part.class, "Widge" ) ); - assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -252,7 +190,7 @@ public class BackrefCompositeMapKeyTest { assertTrue( Hibernate.isInitialized( prod.getParts() ) ); assertNull( prod.getParts().get( new MapKey( "Top" ) ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -283,7 +221,7 @@ public class BackrefCompositeMapKeyTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java index 9332e8246c..9e92cf7470 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicFieldAccessTest.java @@ -109,12 +109,12 @@ public class LazyBasicFieldAccessTest { scope.inTransaction( s -> { entity.description = "desc1"; - s.update( entity ); + LazyEntity merged = s.merge( entity ); - checkDirtyTracking( entity, "description" ); + checkDirtyTracking( merged, "description" ); - assertEquals( "desc1", entity.description ); - assertTrue( isPropertyInitialized( entity, "description" ) ); + assertEquals( "desc1", merged.description ); + assertTrue( isPropertyInitialized( merged, "description" ) ); } ); scope.inTransaction( s -> { @@ -124,7 +124,7 @@ public class LazyBasicFieldAccessTest { scope.inTransaction( s -> { entity.description = "desc2"; - LazyEntity mergedEntity = (LazyEntity) s.merge( entity ); + LazyEntity mergedEntity = s.merge( entity ); //Assert.assertFalse( Hibernate.isPropertyInitialized( entity, "description" ) ); checkDirtyTracking( mergedEntity, "description" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java index 75772f7d90..8e64cc3e7b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/basic/LazyBasicPropertyAccessTest.java @@ -106,12 +106,12 @@ public class LazyBasicPropertyAccessTest { scope.inTransaction( s -> { entity.setDescription( "desc1" ); - s.update( entity ); + LazyEntity merged = s.merge( entity ); - checkDirtyTracking( entity, "description" ); + checkDirtyTracking( merged, "description" ); - assertEquals( "desc1", entity.getDescription() ); - assertTrue( isPropertyInitialized( entity, "description" ) ); + assertEquals( "desc1", merged.getDescription() ); + assertTrue( isPropertyInitialized( merged, "description" ) ); } ); scope.inTransaction( s -> { @@ -121,7 +121,7 @@ public class LazyBasicPropertyAccessTest { scope.inTransaction( s -> { entity.setDescription( "desc2" ); - LazyEntity mergedEntity = (LazyEntity) s.merge( entity ); + LazyEntity mergedEntity = s.merge( entity ); // Assert.assertFalse( isPropertyInitialized( entity, "description" ) ); checkDirtyTracking( mergedEntity, "description" ); 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 678c068042..e4a210242b 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 @@ -56,7 +56,7 @@ public class BasicAttributesLazyGroupTest { Review review = new Review(); review.setComment( "My first review" ); review.setRating( Rating.ONE ); - session.save( review ); + session.persist( review ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupMappedByTest.java index 6f0f437bf9..2ee1ae52a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupMappedByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupMappedByTest.java @@ -72,7 +72,7 @@ public class LazyGroupMappedByTest { from.setToRelation( to ); to.setFromRelation( from ); - session.save( from ); + session.persist( from ); session.flush(); return from.getId(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupTest.java index 85da12aad5..c967e95850 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/LazyGroupTest.java @@ -82,8 +82,8 @@ public class LazyGroupTest { c2.alternateParent = p1; p1.alternateChildren.add( c2 ); - s.save( p1 ); - s.save( p2 ); + s.persist( p1 ); + s.persist( p2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java index 6804908f87..69f9540356 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/group/SimpleLazyGroupUpdateTest.java @@ -60,7 +60,7 @@ public class SimpleLazyGroupUpdateTest { @BeforeEach public void prepare(SessionFactoryScope scope) { scope.inTransaction( s -> { - s.save( new TestEntity( 1L, "entity 1", "blah", REALLY_BIG_STRING ) ); + s.persist( new TestEntity( 1L, "entity 1", "blah", REALLY_BIG_STRING ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java index ca1b9ab587..c81081c46c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundManyToOneNonUpdatableNonInsertableTest.java @@ -58,7 +58,7 @@ public class LazyNotFoundManyToOneNonUpdatableNonInsertableTest { } ); - scope.inTransaction( session -> session.delete( session.get( Lazy.class, ID ) ) ); + scope.inTransaction( session -> session.remove( session.get( Lazy.class, ID ) ) ); scope.inTransaction( session -> { User user = session.find( User.class, ID ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java index 38c858b45a..1298f8947c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneNonUpdatableNonInsertableTest.java @@ -52,7 +52,7 @@ public class LazyNotFoundOneToOneNonUpdatableNonInsertableTest { } ); - scope.inTransaction( session -> session.delete( session.get( Lazy.class, ID ) ) ); + scope.inTransaction( session -> session.remove( session.get( Lazy.class, ID ) ) ); scope.inTransaction( session -> { User user = session.find( User.class, ID ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java index bbbfc692cb..984f9de7eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/notfound/LazyNotFoundOneToOneTest.java @@ -60,7 +60,7 @@ public class LazyNotFoundOneToOneTest { } ); - scope.inTransaction( session -> session.delete( session.get( Lazy.class, ID ) ) ); + scope.inTransaction( session -> session.remove( session.get( Lazy.class, ID ) ) ); scope.inTransaction( session -> { SQLStatementInspector statementInspector = (SQLStatementInspector) scope.getSessionFactory() 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 d1a6250d81..8bc638c961 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 @@ -75,7 +75,7 @@ public class BytecodeEnhancedLazyLoadingOnDeletedEntityTest { } ); assertThatThrownBy( () -> scope.inTransaction( session -> { AssociationOwner owner = session.load( AssociationOwner.class, 1 ); - session.delete( owner ); + session.remove( owner ); session.flush(); owner.getNonOwners().size(); } ) ) @@ -93,7 +93,7 @@ public class BytecodeEnhancedLazyLoadingOnDeletedEntityTest { } ); assertThatThrownBy( () -> scope.inTransaction( session -> { AssociationNonOwner nonOwner = session.load( AssociationNonOwner.class, 1 ); - session.delete( nonOwner ); + session.remove( nonOwner ); session.flush(); nonOwner.getOwners().size(); } ) ) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java index 707f29db31..c570e1b592 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/EntitySharedInCollectionAndToOneTest.java @@ -84,10 +84,10 @@ public class EntitySharedInCollectionAndToOneTest { final CodeTableItem item2 = new CodeTableItem( 2, 1, "second" ); final CodeTableItem item3 = new CodeTableItem( 3, 1, "third" ); - session.save( codeTable1 ); - session.save( item1 ); - session.save( item2 ); - session.save( item3 ); + session.persist( codeTable1 ); + session.persist( item1 ); + session.persist( item2 ); + session.persist( item3 ); codeTable1.getCodeTableItems().add( item1 ); item1.setCodeTable( codeTable1 ); @@ -104,8 +104,8 @@ public class EntitySharedInCollectionAndToOneTest { final CodeTable codeTable2 = new CodeTable( 2, 1 ); final CodeTableItem item4 = new CodeTableItem( 4, 1, "fourth" ); - session.save( codeTable2 ); - session.save( item4 ); + session.persist( codeTable2 ); + session.persist( item4 ); codeTable2.getCodeTableItems().add( item4 ); item4.setCodeTable( codeTable2 ); @@ -121,7 +121,7 @@ public class EntitySharedInCollectionAndToOneTest { // inTransaction( // session -> { // for ( CodeTable codeTable : session.createQuery( "from CodeTable", CodeTable.class ).list() ) { -// session.delete( codeTable ); +// session.remove( codeTable ); // } // } // ); 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 9d73e82c99..d073a4ec54 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 @@ -594,13 +594,13 @@ public class FetchGraphTest { DEntity.class ).list(); result.forEach( entity -> { - session.delete( entity ); - session.delete( entity.getE() ); - session.delete( entity.getA() ); + session.remove( entity ); + session.remove( entity.getE() ); + session.remove( entity.getA() ); Set bs = entity.getBs(); - bs.forEach( bEntity -> session.delete( bEntity ) ); - session.delete( entity.getC() ); - session.delete( entity.getG() ); + bs.forEach( bEntity -> session.remove( bEntity ) ); + session.remove( entity.getC() ); + session.remove( entity.getG() ); } ); } @@ -612,13 +612,13 @@ public class FetchGraphTest { scope.inTransaction( session -> { DEntity entity = session.load( DEntity.class, 1L ); - session.delete( entity ); - session.delete( entity.getE() ); - session.delete( entity.getA() ); + session.remove( entity ); + session.remove( entity.getE() ); + session.remove( entity.getA() ); Set bs = entity.getBs(); - bs.forEach( bEntity -> session.delete( bEntity ) ); - session.delete( entity.getC() ); - session.delete( entity.getG() ); + bs.forEach( bEntity -> session.remove( bEntity ) ); + session.remove( entity.getC() ); + session.remove( entity.getG() ); } ); } @@ -628,13 +628,13 @@ public class FetchGraphTest { scope.inTransaction( session -> { DEntity entity = session.get( DEntity.class, 1L ); - session.delete( entity ); - session.delete( entity.getE() ); - session.delete( entity.getA() ); + session.remove( entity ); + session.remove( entity.getE() ); + session.remove( entity.getA() ); Set bs = entity.getBs(); - bs.forEach( bEntity -> session.delete( bEntity ) ); - session.delete( entity.getC() ); - session.delete( entity.getG() ); + bs.forEach( bEntity -> session.remove( bEntity ) ); + session.remove( entity.getC() ); + session.remove( entity.getG() ); } ); } @@ -644,8 +644,8 @@ public class FetchGraphTest { scope.inTransaction( session -> { EEntity entity = session.get( EEntity.class, 17L ); - session.delete( entity ); - session.delete( entity.getD() ); + session.remove( entity ); + session.remove( entity.getD() ); } ); } @@ -655,8 +655,8 @@ public class FetchGraphTest { scope.inTransaction( session -> { EEntity entity = session.load( EEntity.class, 17L ); - session.delete( entity ); - session.delete( entity.getD() ); + session.remove( entity ); + session.remove( entity.getD() ); } ); } @@ -670,8 +670,8 @@ public class FetchGraphTest { EEntity.class ).list(); result.forEach( entity -> { - session.delete( entity ); - session.delete( entity.getD() ); + session.remove( entity ); + session.remove( entity.getD() ); } ); } ); @@ -733,13 +733,13 @@ public class FetchGraphTest { d.setG( g ); - session.save( b1 ); - session.save( b2 ); - session.save( a ); - session.save( c ); - session.save( g ); - session.save( d ); - session.save( e ); + session.persist( b1 ); + session.persist( b2 ); + session.persist( a ); + session.persist( c ); + session.persist( g ); + session.persist( d ); + session.persist( e ); // create a slew of Activity objects, some with Instruction reference @@ -750,17 +750,17 @@ public class FetchGraphTest { if ( i % 2 == 0 ) { final Instruction instr = new Instruction( i, "Instruction #" + i ); activity.setInstruction( instr ); - session.save( instr ); + session.persist( instr ); } else { final WebApplication webApplication = new WebApplication( i, "http://" + i + ".com" ); webApplication.setName( "name #" + i ); activity.setWebApplication( webApplication ); webApplication.getActivities().add( activity ); - session.save( webApplication ); + session.persist( webApplication ); } - session.save( activity ); + session.persist( activity ); } RoleEntity roleEntity = new RoleEntity(); @@ -781,10 +781,10 @@ public class FetchGraphTest { roleEntity.setKey( specializedKey ); roleEntity.setSpecializedKey( moreSpecializedKey ); moreSpecializedKey.addRole( roleEntity ); - session.save( specializedEntity ); - session.save( roleEntity ); - session.save( specializedKey ); - session.save( moreSpecializedKey ); + session.persist( specializedEntity ); + session.persist( roleEntity ); + session.persist( specializedKey ); + session.persist( moreSpecializedKey ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java index 63fd896e76..a68b3e3aa1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyCollectionDeletedAllowProxyTest.java @@ -132,8 +132,8 @@ public class LazyCollectionDeletedAllowProxyTest { details.setPost( post ); post.setAdditionalDetails( details ); details.setDetails( "Some data" ); - - postId = (Long) s.save( post ); + s.persist( post ); + postId = post.id; } ); } @@ -143,7 +143,7 @@ public class LazyCollectionDeletedAllowProxyTest { Query query = s.createQuery( "from Post" ); List posts = query.getResultList(); posts.forEach( post -> { - s.delete( post ); + s.remove( post ); } ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceAllowProxyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceAllowProxyTest.java index 197dc08830..169062a0b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceAllowProxyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceAllowProxyTest.java @@ -218,45 +218,45 @@ public class LazyGroupWithInheritanceAllowProxyTest { final Address austin = new Address( 1, "Austin" ); final Address london = new Address( 2, "London" ); - session.save( austin ); - session.save( london ); + session.persist( austin ); + session.persist( london ); final ForeignCustomer acme = new ForeignCustomer( 1, "Acme", london, "1234" ); final ForeignCustomer acmeBrick = new ForeignCustomer( 2, "Acme Brick", london, "9876", acme ); final ForeignCustomer freeBirds = new ForeignCustomer( 3, "Free Birds", austin, "13579" ); - session.save( acme ); - session.save( acmeBrick ); - session.save( freeBirds ); + session.persist( acme ); + session.persist( acmeBrick ); + session.persist( freeBirds ); final Order order1 = new Order( 1, "some text", freeBirds ); freeBirds.getOrders().add( order1 ); - session.save( order1 ); + session.persist( order1 ); final OrderSupplemental orderSupplemental = new OrderSupplemental( 1, 1 ); order1.setSupplemental( orderSupplemental ); final OrderSupplemental2 orderSupplemental2_1 = new OrderSupplemental2( 2, 2 ); order1.setSupplemental2( orderSupplemental2_1 ); orderSupplemental2_1.setOrder( order1 ); - session.save( orderSupplemental ); - session.save( orderSupplemental2_1 ); + session.persist( orderSupplemental ); + session.persist( orderSupplemental2_1 ); final Order order2 = new Order( 2, "some text", acme ); acme.getOrders().add( order2 ); - session.save( order2 ); + session.persist( order2 ); final OrderSupplemental2 orderSupplemental2_2 = new OrderSupplemental2( 3, 3 ); order2.setSupplemental2( orderSupplemental2_2 ); orderSupplemental2_2.setOrder( order2 ); - session.save( orderSupplemental2_2 ); + session.persist( orderSupplemental2_2 ); final CreditCardPayment payment1 = new CreditCardPayment( 1, 1F, "1" ); - session.save( payment1 ); + session.persist( payment1 ); order1.getPayments().add( payment1 ); final DebitCardPayment payment2 = new DebitCardPayment( 2, 2F, "2" ); - session.save( payment2 ); + session.persist( payment2 ); order1.getPayments().add( payment2 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceTest.java index cec1a92323..d975c2f0f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/LazyGroupWithInheritanceTest.java @@ -213,45 +213,45 @@ public class LazyGroupWithInheritanceTest { final Address austin = new Address( 1, "Austin" ); final Address london = new Address( 2, "London" ); - session.save( austin ); - session.save( london ); + session.persist( austin ); + session.persist( london ); final ForeignCustomer acme = new ForeignCustomer( 1, "Acme", london, "1234" ); final ForeignCustomer acmeBrick = new ForeignCustomer( 2, "Acme Brick", london, "9876", acme ); final ForeignCustomer freeBirds = new ForeignCustomer( 3, "Free Birds", austin, "13579" ); - session.save( acme ); - session.save( acmeBrick ); - session.save( freeBirds ); + session.persist( acme ); + session.persist( acmeBrick ); + session.persist( freeBirds ); final Order order1 = new Order( 1, "some text", freeBirds ); freeBirds.getOrders().add( order1 ); - session.save( order1 ); + session.persist( order1 ); final OrderSupplemental orderSupplemental = new OrderSupplemental( 1, 1 ); order1.setSupplemental( orderSupplemental ); final OrderSupplemental2 orderSupplemental2_1 = new OrderSupplemental2( 2, 2 ); order1.setSupplemental2( orderSupplemental2_1 ); orderSupplemental2_1.setOrder( order1 ); - session.save( orderSupplemental ); - session.save( orderSupplemental2_1 ); + session.persist( orderSupplemental ); + session.persist( orderSupplemental2_1 ); final Order order2 = new Order( 2, "some text", acme ); acme.getOrders().add( order2 ); - session.save( order2 ); + session.persist( order2 ); final OrderSupplemental2 orderSupplemental2_2 = new OrderSupplemental2( 3, 3 ); order2.setSupplemental2( orderSupplemental2_2 ); orderSupplemental2_2.setOrder( order2 ); - session.save( orderSupplemental2_2 ); + session.persist( orderSupplemental2_2 ); final CreditCardPayment payment1 = new CreditCardPayment( 1, 1F, "1" ); - session.save( payment1 ); + session.persist( payment1 ); order1.getPayments().add( payment1 ); final DebitCardPayment payment2 = new DebitCardPayment( 2, 2F, "2" ); - session.save( payment2 ); + session.persist( payment2 ); order1.getPayments().add( payment2 ); 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 610bc94dec..ccd0ec5377 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 @@ -192,17 +192,17 @@ public class MergeProxyTest { if ( i % 2 == 0 ) { final Instruction instr = new Instruction( i, "Instruction #" + i ); activity.setInstruction( instr ); - session.save( instr ); + session.persist( instr ); } else { final WebApplication webApplication = new WebApplication( i, "http://" + i + ".com" ); webApplication.setName( "name #" + i ); activity.setWebApplication( webApplication ); webApplication.getActivities().add( activity ); - session.save( webApplication ); + session.persist( webApplication ); } - session.save( activity ); + session.persist( activity ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java index 9508e8cd7e..f877941021 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/ProxyDeletionTest.java @@ -44,8 +44,8 @@ public class ProxyDeletionTest extends BaseNonConfigCoreFunctionalTestCase { inTransaction( session -> { EEntity entity = session.get( EEntity.class, 17L ); - session.delete( entity ); - session.delete( entity.getD() ); + session.remove( entity ); + session.remove( entity.getD() ); } ); } @@ -139,13 +139,13 @@ public class ProxyDeletionTest extends BaseNonConfigCoreFunctionalTestCase { d.setG( g ); - session.save( b1 ); - session.save( b2 ); - session.save( a ); - session.save( c ); - session.save( g ); - session.save( d ); - session.save( e ); + session.persist( b1 ); + session.persist( b2 ); + session.persist( a ); + session.persist( c ); + session.persist( g ); + session.persist( d ); + session.persist( e ); // create a slew of Activity objects, some with Instruction reference @@ -156,17 +156,17 @@ public class ProxyDeletionTest extends BaseNonConfigCoreFunctionalTestCase { if ( i % 2 == 0 ) { final Instruction instr = new Instruction( i, "Instruction #" + i ); activity.setInstruction( instr ); - session.save( instr ); + session.persist( instr ); } else { final WebApplication webApplication = new WebApplication( i, "http://" + i + ".com" ); webApplication.setName( "name #" + i ); activity.setWebApplication( webApplication ); webApplication.getActivities().add( activity ); - session.save( webApplication ); + session.persist( webApplication ); } - session.save( activity ); + session.persist( activity ); } RoleEntity roleEntity = new RoleEntity(); @@ -187,10 +187,10 @@ public class ProxyDeletionTest extends BaseNonConfigCoreFunctionalTestCase { roleEntity.setKey( specializedKey ); roleEntity.setSpecializedKey( moreSpecializedKey ); moreSpecializedKey.addRole( roleEntity ); - session.save( specializedEntity ); - session.save( roleEntity ); - session.save( specializedKey ); - session.save( moreSpecializedKey ); + session.persist( specializedEntity ); + session.persist( roleEntity ); + session.persist( specializedKey ); + session.persist( moreSpecializedKey ); } ); } 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 7b0c0df215..50df45f289 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 @@ -180,7 +180,7 @@ public class SimpleUpdateTestWithLazyLoading { assertEquals( 1, stats.getPrepareStatementCount() ); assertThat( loadedChild.getParent().getName(), is( parentName ) ); assertEquals( 1, stats.getPrepareStatementCount() ); - s.save( parent ); + s.persist( parent ); } ); scope.inTransaction( s -> { 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 48ccac52f0..8b09930336 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 @@ -148,7 +148,7 @@ public class SimpleUpdateTestWithLazyLoadingAndInlineDirtyTracking { assertEquals( 1, stats.getPrepareStatementCount() ); assertThat( loadedChild.getParent().getName(), is( parentName ) ); assertEquals( 1, stats.getPrepareStatementCount() ); - s.save( parent ); + s.persist( parent ); } ); scope.inTransaction( s -> { 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 caa9c1a398..852b5b70a3 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 @@ -199,7 +199,7 @@ public class SimpleUpdateWithLazyLoadingWithCollectionInDefaultFetchGroupFalseTe assertEquals( 1, stats.getPrepareStatementCount() ); assertThat( loadedChild.getParent().getName(), is( parentName ) ); assertEquals( 1, stats.getPrepareStatementCount() ); - s.save( parent ); + s.persist( parent ); } ); scope.inTransaction( s -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java index dc378a1132..76508cd1d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/DirtyCheckPrivateUnMappedCollectionTest.java @@ -73,7 +73,7 @@ public class DirtyCheckPrivateUnMappedCollectionTest { Measurement measurementDescriptor = new Measurement(); measurementDescriptor.addTag( tag ); - session.save( measurementDescriptor ); + session.persist( measurementDescriptor ); } ); } 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 42355d8970..9e14703d5c 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 @@ -80,8 +80,8 @@ public class EntityWithMutableAttributesTest { user.setRole( role ); - session.save( role ); - session.save( user ); + session.persist( role ); + session.persist( user ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java index a08ff37a86..c65572326f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/LoadAndUpdateEntitiesWithCollectionsTest.java @@ -85,10 +85,10 @@ public class LoadAndUpdateEntitiesWithCollectionsTest { order.setCustomer( customer ); - session.save( user ); - session.save( role ); - session.save( customer ); - session.save( order ); + session.persist( user ); + session.persist( role ); + session.persist( customer ); + session.persist( order ); } ); } @@ -137,7 +137,7 @@ public class LoadAndUpdateEntitiesWithCollectionsTest { Role role = new Role(); role.setName( "superuser" ); user.addRole( role ); - session.save( role ); + session.persist( role ); } ); @@ -157,7 +157,7 @@ public class LoadAndUpdateEntitiesWithCollectionsTest { Role role = new Role(); role.setName( "user" ); user.getRoles().add( role ); - session.save( role ); + session.persist( role ); } ); @@ -181,7 +181,7 @@ public class LoadAndUpdateEntitiesWithCollectionsTest { .get( 0 ); Role role = new Role(); user.getRoles().add( role ); - session.save( role ); + session.persist( role ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java index 9931909726..da941482e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOnePropertyAccessByFieldTest.java @@ -166,14 +166,14 @@ public class ManyToOnePropertyAccessByFieldTest { Office office = buildOffice( "second office", "Fab", officePhones ); scope.inTransaction( session -> { - session.save( office ); + session.persist( office ); } ); scope.inTransaction( session -> { Office result = session.find( Office.class, office.id ); - session.delete( result ); + session.remove( result ); } ); @@ -242,7 +242,7 @@ public class ManyToOnePropertyAccessByFieldTest { Office office = buildOffice( "second office", "Fab", officePhones ); - session.save( office ); + session.persist( office ); List offices = new ArrayList<>(); offices.add( office ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java index 91cb99c7a4..e17c27dfc4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/ManyToOneWithEmbeddedAndNotOptionalFieldTest.java @@ -74,13 +74,13 @@ public class ManyToOneWithEmbeddedAndNotOptionalFieldTest { client.setLog( log ); - session.save( client ); + session.persist( client ); user.setName( "Fab" ); user.setClient( client ); - session.save( user ); + session.persist( user ); } ); userId = user.getId(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java index d2bd953d01..62e78ffe5a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/SimpleDynamicUpdateTest.java @@ -82,8 +82,8 @@ public class SimpleDynamicUpdateTest { user.setRole( role ); - session.save( role ); - session.save( user ); + session.persist( role ); + session.persist( user ); } ); } @@ -174,7 +174,7 @@ public class SimpleDynamicUpdateTest { role.setId( 3 ); role.setName( "user" ); entity.setRole( role ); - session.save( role ); + session.persist( role ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java index f6a4c61674..2a4e93dcfa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/inlinedirtychecking/dynamicupdate/DynamicUpdateAndCollectionsTest.java @@ -87,10 +87,10 @@ public class DynamicUpdateAndCollectionsTest { order.setNote( "it is a sample" ); order.setCustomer( customer ); - session.save( user ); - session.save( role ); - session.save( customer ); - session.save( order ); + session.persist( user ); + session.persist( role ); + session.persist( customer ); + session.persist( order ); } ); } @@ -157,7 +157,7 @@ public class DynamicUpdateAndCollectionsTest { Role role = new Role(); role.setName( "superuser" ); user.addRole( role ); - session.save( role ); + session.persist( role ); } ); @@ -176,7 +176,7 @@ public class DynamicUpdateAndCollectionsTest { User user = samplingOrder.getCustomer().getUser(); Role role = new Role(); user.getRoles().add( role ); - session.save( role ); + session.persist( role ); } ); @@ -194,7 +194,7 @@ public class DynamicUpdateAndCollectionsTest { User user = session.createQuery( "from User", User.class ).list().get( 0 ); Role role = new Role(); user.getRoles().add( role ); - session.save( role ); + session.persist( role ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java index 8a8fe12529..7d9abf776e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/CompositeMergeTest.java @@ -92,7 +92,7 @@ public class CompositeMergeTest { checkDirtyTracking( parent[1], "address.country" ); scope.inTransaction( s -> { - s.saveOrUpdate( parent[1] ); + s.merge( parent[1] ); checkDirtyTracking( parent[1], "address.country" ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java index 849e8606f3..775c007a30 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java @@ -53,7 +53,7 @@ public class MergeDetachedCascadedCollectionInEmbeddableTest { entity.name = "new"; entity.setGrouping( new Grouping() ); entity.getGrouping().getThings().add( new Thing() ); - session.save( entity ); + session.persist( entity ); return entity; } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java index e7cea27725..1a64699a16 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java @@ -48,8 +48,8 @@ public class MergeDetachedNonCascadedCollectionInEmbeddableTest { entity.setGrouping( new Grouping() ); Thing thing = new Thing(); entity.getGrouping().getThings().add( thing ); - session.save( thing ); - session.save( entity ); + session.persist( thing ); + session.persist( entity ); return entity; } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java index fc18345591..217b109762 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java @@ -36,7 +36,7 @@ public class MergeEnhancedDetachedOrphanRemovalTest { final Root entity = scope.fromTransaction( session -> { Root root = new Root(); root.setName( "new" ); - session.save( root ); + session.persist( root ); return root; } ); @@ -56,7 +56,7 @@ public class MergeEnhancedDetachedOrphanRemovalTest { Leaf leaf = new Leaf(); leaf.setRoot( root ); root.getLeaves().add( leaf ); - session.save( root ); + session.persist( root ); return root; } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java index 53d3616160..ae2796a9b2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityDynamicUpdateTest.java @@ -120,7 +120,7 @@ public class MergeEnhancedEntityDynamicUpdateTest extends BaseCoreFunctionalTest @After public void cleanup() { doInHibernate( this::sessionFactory, s -> { - s.delete( person ); + s.remove( person ); } ); doInHibernate( this::sessionFactory, s -> { s.createQuery( "delete from NullablePerson" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java index da51afd97a..f02ace68f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/merge/MergeEnhancedEntityTest.java @@ -120,7 +120,7 @@ public class MergeEnhancedEntityTest { @AfterEach public void cleanup(SessionFactoryScope scope) { scope.inTransaction( s -> { - s.delete( person ); + s.remove( person ); } ); scope.inTransaction( s -> { s.createQuery( "delete from NullablePerson" ); 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 f48dcb9a49..8cd0e73f45 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 @@ -161,10 +161,10 @@ public class OnDemandLoadTest { public void cleanup(SessionFactoryScope scope) throws Exception { scope.inTransaction( s -> { Store store = s.find( Store.class, 1L ); - s.delete( store ); + s.remove( store ); Product product= s.find( Product.class, "007" ); - s.delete( product ); + s.remove( product ); } ); } 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 83d28810e6..6a5f0ada9f 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 @@ -173,10 +173,10 @@ public class OnDemandLoadWithCollectionInDefaultFetchGroupFalseTest { public void cleanup(SessionFactoryScope scope) throws Exception { scope.inTransaction( s -> { Store store = s.find( Store.class, 1L ); - s.delete( store ); + s.remove( store ); Product product= s.find( Product.class, "007" ); - s.delete( product ); + s.remove( product ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoad2Test.java index 5efdb36451..ee939b0a28 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoad2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoad2Test.java @@ -61,7 +61,7 @@ public class OneToManyPersistAndLoad2Test { scope.inTransaction( session -> { Parent parent = session.get( Parent.class, 1l ); - session.delete( parent ); + session.remove( parent ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoadTest.java index e03f688bec..2c2b147f8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OneToManyPersistAndLoadTest.java @@ -61,7 +61,7 @@ public class OneToManyPersistAndLoadTest { scope.inTransaction( session -> { Parent parent = session.get( Parent.class, 1l ); - session.delete( parent ); + session.remove( parent ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanTest.java index 383a8d71e8..30cac21530 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/orphan/OrphanTest.java @@ -73,7 +73,7 @@ public class OrphanTest { prod.getParts().remove( part ); - session.delete( prod ); + session.remove( prod ); } ); @@ -112,7 +112,7 @@ public class OrphanTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -143,7 +143,7 @@ public class OrphanTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -179,7 +179,7 @@ public class OrphanTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -207,14 +207,14 @@ public class OrphanTest { scope.inTransaction( session -> - session.saveOrUpdate( prod ) + session.merge( prod ) ); scope.inTransaction( session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -244,14 +244,14 @@ public class OrphanTest { scope.inTransaction( session -> - session.saveOrUpdate( cloned ) + session.merge( cloned ) ); scope.inTransaction( session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -292,7 +292,7 @@ public class OrphanTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -328,7 +328,7 @@ public class OrphanTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -359,7 +359,7 @@ public class OrphanTest { scope.inTransaction( session -> { assertNull( session.get( Part.class, "Widge" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -397,7 +397,7 @@ public class OrphanTest { scope.inTransaction( session -> { assertNotNull( session.get( Part.class, "Widge" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java index c1742897b5..d5d2ee90f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/otherentityentrycontext/OtherEntityEntryContextTest.java @@ -51,47 +51,18 @@ public class OtherEntityEntryContextTest { @Test public void test(SessionFactoryScope scope) { - scope.inTransaction( s -> { - Parent p = s.get( Parent.class, 1L ); - assertTrue( ManagedEntity.class.isInstance( p ) ); - p.name = "second"; - - assertTrue( s.contains( p ) ); - - // open another session and evict p from the new session - scope.inTransaction( session2 -> { - - // s2 should contains no entities - assertFalse( session2.contains( p ) ); - - // evict should do nothing, since p is not associated with s2 - session2.evict( p ); - - assertFalse( session2.contains( p ) ); - assertNull( session2.getPersistenceContext().getEntry( p ) ); - - try { - session2.update( p ); - fail( "should have failed because p is already associated with a PersistenceContext that is still open." ); - } - catch ( HibernateException ignored ) { - // expected - } - } ); - } ); - scope.inTransaction( s -> { Parent p = s.get( Parent.class, 1L ); p.name = "third"; - s.update( p ); + s.merge( p ); assertTrue( s.contains( p ) ); s.evict( p ); assertFalse( s.contains( p ) ); p = s.get( Parent.class, p.id ); - assertEquals( "second", p.name ); + assertEquals( "first", p.name ); } ); } 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 0fd8db17a2..31b01df521 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 @@ -62,7 +62,7 @@ public class ByteCodeEnhancedImmutableReferenceCacheTest extends BaseCoreFunctio // save a reference in one session Session s = openSession(); s.beginTransaction(); - s.save( myReferenceData ); + s.persist( myReferenceData ); s.getTransaction().commit(); s.close(); @@ -92,7 +92,7 @@ public class ByteCodeEnhancedImmutableReferenceCacheTest extends BaseCoreFunctio // cleanup s = openSession(); s.beginTransaction(); - s.delete( myReferenceData ); + s.remove( myReferenceData ); s.getTransaction().commit(); s.close(); } @@ -106,8 +106,8 @@ public class ByteCodeEnhancedImmutableReferenceCacheTest extends BaseCoreFunctio // save a reference in one session Session s1 = openSession(); s1.beginTransaction(); - s1.save( myReferenceData ); - s1.save( myOtherReferenceData ); + s1.persist( myReferenceData ); + s1.persist( myOtherReferenceData ); s1.getTransaction().commit(); s1.close(); @@ -199,13 +199,13 @@ public class ByteCodeEnhancedImmutableReferenceCacheTest extends BaseCoreFunctio assertEquals( Status.READ_ONLY, myOtherReferenceData.$$_hibernate_getEntityEntry().getStatus() ); // delete myReferenceData from s1 - s1.delete( myReferenceData ); + s1.remove( myReferenceData ); assertEquals( Status.DELETED, myReferenceData.$$_hibernate_getEntityEntry().getStatus() ); assertEquals( Status.READ_ONLY, myOtherReferenceData.$$_hibernate_getEntityEntry().getStatus() ); // delete myOtherReferenceData from s2 - s2.delete( myOtherReferenceData ); + s2.remove( myOtherReferenceData ); assertEquals( Status.DELETED, myReferenceData.$$_hibernate_getEntityEntry().getStatus() ); assertEquals( Status.DELETED, myOtherReferenceData.$$_hibernate_getEntityEntry().getStatus() ); 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 c1b110ccf6..fbde65f0b4 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 @@ -46,7 +46,7 @@ public class CacheAnnotationTests extends BaseCoreFunctionalTestCase { public void testCacheWriteConcurrencyStrategyNone() { doInHibernate( this::sessionFactory, session -> { NoCacheConcurrencyStrategyEntity entity = new NoCacheConcurrencyStrategyEntity(); - session.save( entity ); + session.persist( entity ); session.flush(); session.clear(); } ); @@ -58,7 +58,7 @@ public class CacheAnnotationTests extends BaseCoreFunctionalTestCase { doInHibernate( this::sessionFactory, session -> { NoCacheConcurrencyStrategyEntity entity = new NoCacheConcurrencyStrategyEntity(); entity.setName( "name" ); - session.save( entity ); + session.persist( entity ); session.flush(); this.entityId = entity.getId(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java index bf2fcf0b1a..10097f174d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CacheRegionStatisticsTest.java @@ -90,7 +90,7 @@ public class CacheRegionStatisticsTest extends BaseNonConfigCoreFunctionalTestCa this::sessionFactory, session -> { List dogs = session.createQuery( "from Dog", Dog.class ).getResultList(); for ( Dog dog : dogs ) { - session.delete( dog ); + session.remove( dog ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java index 2be94c6522..a52777fd22 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionTest.java @@ -63,13 +63,13 @@ public class CollectionCacheEvictionTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); Company company1 = new Company( 1 ); - s.save( company1 ); + s.persist( company1 ); User user = new User( 1, company1 ); - s.save( user ); + s.persist( user ); Company company2 = new Company( 2 ); - s.save( company2 ); + s.persist( company2 ); s.getTransaction().commit(); s.close(); @@ -124,7 +124,7 @@ public class CollectionCacheEvictionTest extends BaseCoreFunctionalTestCase { assertEquals( 1, company.getUsers().size() ); User user = new User( 2, company ); - s.save( user ); + s.persist( user ); s.getTransaction().commit(); s.close(); @@ -150,7 +150,7 @@ public class CollectionCacheEvictionTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); User user = new User( 2, company ); - s.save( user ); + s.persist( user ); s.getTransaction().commit(); s.close(); @@ -171,7 +171,7 @@ public class CollectionCacheEvictionTest extends BaseCoreFunctionalTestCase { // init cache of collection assertEquals( 1, company.getUsers().size() ); - s.delete( company.getUsers().get( 0 ) ); + s.remove( company.getUsers().get( 0 ) ); s.getTransaction().commit(); s.close(); @@ -199,7 +199,7 @@ public class CollectionCacheEvictionTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( company.getUsers().get( 0 ) ); + s.remove( company.getUsers().get( 0 ) ); s.getTransaction().commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java index 0ed730c6a0..acb7e24d3e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/CollectionCacheEvictionWithoutMappedByTest.java @@ -89,7 +89,7 @@ public class CollectionCacheEvictionWithoutMappedByTest extends BaseCoreFunction people = session.get( People.class, people.id ); Person person = new Person(); - session.save( person ); + session.persist( person ); people.people.add( person ); session.getTransaction().commit(); @@ -113,7 +113,7 @@ public class CollectionCacheEvictionWithoutMappedByTest extends BaseCoreFunction people = session.get( People.class, people.id ); Person person = people.people.remove( 0 ); - session.delete( person ); + session.remove( person ); session.getTransaction().commit(); session.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/InsertedDataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/InsertedDataTest.java index 90515da760..101d0d1b06 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/InsertedDataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/InsertedDataTest.java @@ -45,7 +45,7 @@ public class InsertedDataTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.getTransaction().commit(); s.close(); @@ -66,7 +66,7 @@ public class InsertedDataTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.getTransaction().rollback(); s.close(); @@ -82,7 +82,7 @@ public class InsertedDataTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); item.setName( "new data" ); s.getTransaction().commit(); @@ -106,7 +106,7 @@ public class InsertedDataTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); item.setName( "new data" ); s.getTransaction().rollback(); @@ -129,7 +129,7 @@ public class InsertedDataTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.refresh( item ); s.getTransaction().commit(); @@ -152,7 +152,7 @@ public class InsertedDataTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.refresh( item ); s.getTransaction().rollback(); @@ -179,7 +179,7 @@ public class InsertedDataTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.clear(); s.getTransaction().commit(); @@ -202,7 +202,7 @@ public class InsertedDataTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.clear(); item = (CacheableItem) s.get( CacheableItem.class, item.getId() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java index c27fddffbe..d6a31e604c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/LockModeTest.java @@ -52,13 +52,13 @@ public class LockModeTest extends BaseCoreFunctionalTestCase { inTransaction( s -> { Company company1 = new Company( 1 ); - s.save( company1 ); + s.persist( company1 ); User user = new User( 1, company1 ); - s.save( user ); + s.persist( user ); Company company2 = new Company( 2 ); - s.save( company2 ); + s.persist( company2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java index deabc9c92b..8e5695265d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/ManyToManyCollectionCacheEvictionTest.java @@ -60,11 +60,11 @@ public class ManyToManyCollectionCacheEvictionTest extends BaseCoreFunctionalTes s.beginTransaction(); Application application = new Application(); - s.save( application ); + s.persist( application ); Customer customer = new Customer(); customer.applications.add( application ); - s.save( customer ); + s.persist( customer ); s.getTransaction().commit(); s.close(); @@ -82,7 +82,7 @@ public class ManyToManyCollectionCacheEvictionTest extends BaseCoreFunctionalTes Customer customer2 = new Customer(); customer2.applications.add( application ); - s.save( customer2 ); + s.persist( customer2 ); s.getTransaction().commit(); s.close(); 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 3b20182598..789d407ca5 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 @@ -54,7 +54,7 @@ public class ReferenceCacheTest extends BaseCoreFunctionalTestCase { // save a reference in one session Session s = openSession(); s.beginTransaction(); - s.save( myReferenceData ); + s.persist( myReferenceData ); s.getTransaction().commit(); s.close(); @@ -82,7 +82,7 @@ public class ReferenceCacheTest extends BaseCoreFunctionalTestCase { // cleanup s = openSession(); s.beginTransaction(); - s.delete( myReferenceData ); + s.remove( myReferenceData ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java index cddabb45a0..a679d7167f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/RefreshUpdatedDataTest.java @@ -126,8 +126,8 @@ public class RefreshUpdatedDataTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( readWriteCacheableItem ); - s.delete( readWriteVersionedCacheableItem ); + s.remove( readWriteCacheableItem ); + s.remove( readWriteVersionedCacheableItem ); s.getTransaction().commit(); s.close(); } @@ -182,7 +182,7 @@ public class RefreshUpdatedDataTest extends BaseCoreFunctionalTestCase { assertEquals( version, readWriteVersionedCacheableItem.version ); assertEquals( 2, readWriteVersionedCacheableItem.getTags().size() ); - s2.delete( readWriteVersionedCacheableItem ); + s2.remove( readWriteVersionedCacheableItem ); s2.getTransaction().commit(); s2.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java index 4e37be84e7..7abe27262a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedDomainDataAndQueryResultsTest.java @@ -397,7 +397,7 @@ public class SharedDomainDataAndQueryResultsTest extends BaseNonConfigCoreFuncti this::sessionFactory, session -> { List dogs = session.createQuery( "from Dog", Dog.class ).getResultList(); for ( Dog dog : dogs ) { - session.delete( dog ); + session.remove( dog ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java index f73afc14a7..9ae6d055fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/SharedRegionTest.java @@ -45,7 +45,7 @@ public class SharedRegionTest extends BaseNonConfigCoreFunctionalTestCase { // create a StateCodes Session s = openSession(); s.beginTransaction(); - s.save( new StateCodes( 1 ) ); + s.persist( new StateCodes( 1 ) ); s.getTransaction().commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/HHH13179Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/HHH13179Test.java index 998aaaf6a8..6e2b01648a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/HHH13179Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cache/hhh13179/HHH13179Test.java @@ -6,164 +6,125 @@ */ package org.hibernate.orm.test.cache.hhh13179; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.Configuration; import org.hibernate.stat.CacheRegionStatistics; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; /** * Check that second level caching works for hbm mapped joined subclass inheritance structures */ -@TestForIssue(jiraKey = "HHH-13179") -public class HHH13179Test extends BaseCoreFunctionalTestCase { - - // Add your entities here. - @Override - protected Class[] getAnnotatedClasses() { - return new Class[] { - JoinedSubclassPerson.class, - JoinedSubclassUIPerson.class, - JoinedSubclassNonUIPerson.class, - UnionSubclassPerson.class, - UnionSubclassUIPerson.class, - UnionSubclassNonUIPerson.class, - DiscriminatorSubclassPerson.class, - DiscriminatorSubclassUIPerson.class, - DiscriminatorSubclassNonUIPerson.class - }; - } - - // If you use *.hbm.xml mappings, instead of annotations, add the mappings here. - @Override - protected String[] getMappings() { - return new String[] { +@JiraKey("HHH-13179") +@DomainModel( + xmlMappings = { "org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml", "org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.hbm.xml", "org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml" - }; - } + } +) +@SessionFactory(generateStatistics = true) +public class HHH13179Test { - // If those mappings reside somewhere other than resources/org/hibernate/test, change this. - @Override - protected String getBaseForMappings() { - return ""; - } - - // Add in any settings that are specific to your test. See resources/hibernate.properties for the defaults. - @Override - protected void configure(Configuration configuration) { - super.configure( configuration ); - - configuration.setProperty( AvailableSettings.SHOW_SQL, true ); - configuration.setProperty( AvailableSettings.FORMAT_SQL, true ); - configuration.setProperty( AvailableSettings.GENERATE_STATISTICS, true ); - } @Test - public void testJoinedSubclassCaching() { + public void testJoinedSubclassCaching(SessionFactoryScope scope) { // BaseCoreFunctionalTestCase automatically creates the SessionFactory and provides the Session. - Session s = openSession(); - Transaction tx = s.beginTransaction(); - String regionName = JoinedSubclassPerson.class.getName(); + scope.inTransaction( + session -> { + CacheRegionStatistics cacheRegionStatistics = session.getSessionFactory() + .getStatistics() + .getCacheRegionStatistics( + regionName ); + assertThat( cacheRegionStatistics.getPutCount() ).as( "Cache put should be 0" ).isEqualTo( 0 ); - // sanity check - CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( - regionName ); - Assert.assertEquals( "Cache put should be 0", 0, cacheRegionStatistics.getPutCount() ); + JoinedSubclassPerson person1 = new JoinedSubclassUIPerson(); + person1.setOid( 1L ); + session.persist( person1 ); + } + ); - JoinedSubclassPerson person1 = new JoinedSubclassUIPerson(); - person1.setOid( 1L ); - s.save( person1 ); + scope.inTransaction( + session -> { + JoinedSubclassPerson person2 = session.get( JoinedSubclassPerson.class, 1L ); - tx.commit(); + CacheRegionStatistics cacheRegionStatistics = session.getSessionFactory() + .getStatistics() + .getCacheRegionStatistics( regionName ); + assertThat( cacheRegionStatistics.getHitCount() ).as( "Cache hit should be 1" ).isEqualTo( 1 ); + assertThat( cacheRegionStatistics.getPutCount() ).as( "Cache put should be 1" ).isEqualTo( 1 ); + } + ); - s.close(); - - s = openSession(); - tx = s.beginTransaction(); - - JoinedSubclassPerson person2 = s.get( JoinedSubclassPerson.class, 1L ); - - cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( regionName ); - Assert.assertEquals( "Cache hit should be 1", 1, cacheRegionStatistics.getHitCount() ); - Assert.assertEquals( "Cache put should be 1", 1, cacheRegionStatistics.getPutCount() ); - - tx.commit(); - s.close(); } @Test - public void testUnionSubclassCaching() { + public void testUnionSubclassCaching(SessionFactoryScope scope) { // BaseCoreFunctionalTestCase automatically creates the SessionFactory and provides the Session. - Session s = openSession(); - Transaction tx = s.beginTransaction(); - String regionName = UnionSubclassPerson.class.getName(); + scope.inTransaction( + session -> { + CacheRegionStatistics cacheRegionStatistics = session.getSessionFactory() + .getStatistics() + .getCacheRegionStatistics( + regionName ); + assertThat( cacheRegionStatistics.getPutCount() ).as( "Cache put should be 0" ).isEqualTo( 0 ); - // sanity check - CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( - regionName ); - Assert.assertEquals( "Cache put should be 0", 0, cacheRegionStatistics.getPutCount() ); + UnionSubclassPerson person1 = new UnionSubclassUIPerson(); + person1.setOid( 1L ); + session.persist( person1 ); + } + ); - UnionSubclassPerson person1 = new UnionSubclassUIPerson(); - person1.setOid( 1L ); - s.save( person1 ); + scope.inTransaction( + session -> { + UnionSubclassPerson person2 = session.get( UnionSubclassPerson.class, 1L ); - tx.commit(); - - s.close(); - - s = openSession(); - tx = s.beginTransaction(); - - UnionSubclassPerson person2 = s.get( UnionSubclassPerson.class, 1L ); - - cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( regionName ); - Assert.assertEquals( "Cache hit should be 1", 1, cacheRegionStatistics.getHitCount() ); - Assert.assertEquals( "Cache put should be 1", 1, cacheRegionStatistics.getPutCount() ); - - tx.commit(); - s.close(); + CacheRegionStatistics cacheRegionStatistics = session.getSessionFactory() + .getStatistics() + .getCacheRegionStatistics( regionName ); + assertThat( cacheRegionStatistics.getHitCount() ).as( "Cache hit should be 1" ).isEqualTo( 1 ); + assertThat( cacheRegionStatistics.getPutCount() ).as( "Cache put should be 1" ).isEqualTo( 1 ); + } + ); } @Test - public void testDiscriminatorSubclassCaching() { + public void testDiscriminatorSubclassCaching(SessionFactoryScope scope) { // BaseCoreFunctionalTestCase automatically creates the SessionFactory and provides the Session. - Session s = openSession(); - Transaction tx = s.beginTransaction(); - String regionName = DiscriminatorSubclassPerson.class.getName(); - // sanity check - CacheRegionStatistics cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( - regionName ); - Assert.assertEquals( "Cache put should be 0", 0, cacheRegionStatistics.getPutCount() ); + scope.inTransaction( + session -> { + CacheRegionStatistics cacheRegionStatistics = session.getSessionFactory() + .getStatistics() + .getCacheRegionStatistics( + regionName ); + assertThat( cacheRegionStatistics.getPutCount() ).as( "Cache put should be 0" ).isEqualTo( 0 ); - DiscriminatorSubclassPerson person1 = new DiscriminatorSubclassUIPerson(); - person1.setOid( 1L ); - s.save( person1 ); + DiscriminatorSubclassPerson person1 = new DiscriminatorSubclassUIPerson(); + person1.setOid( 1L ); + session.persist( person1 ); - tx.commit(); + } + ); - s.close(); - s = openSession(); - tx = s.beginTransaction(); + scope.inTransaction( + session -> { + session.get( DiscriminatorSubclassPerson.class, 1L ); - DiscriminatorSubclassPerson person2 = s.get( DiscriminatorSubclassPerson.class, 1L ); - - cacheRegionStatistics = s.getSessionFactory().getStatistics().getCacheRegionStatistics( regionName ); - Assert.assertEquals( "Cache hit should be 1", 1, cacheRegionStatistics.getHitCount() ); - Assert.assertEquals( "Cache put should be 1", 1, cacheRegionStatistics.getPutCount() ); - - tx.commit(); - s.close(); + CacheRegionStatistics cacheRegionStatistics = session.getSessionFactory() + .getStatistics() + .getCacheRegionStatistics( regionName ); + assertThat( cacheRegionStatistics.getHitCount() ).as( "Cache hit should be 1" ).isEqualTo( 1 ); + assertThat( cacheRegionStatistics.getPutCount() ).as( "Cache put should be 1" ).isEqualTo( 1 ); + } + ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java index 1a1e08d530..17bcf8cd76 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/caching/mocked/ReadWriteCacheTest.java @@ -80,7 +80,7 @@ public class ReadWriteCacheTest extends BaseCoreFunctionalTestCase { doInHibernate( this::sessionFactory, session -> { log.info( "Delete Book" ); Book book = session.get( Book.class, bookId ); - session.delete( book ); + session.remove( book ); interceptTransaction.set( true ); } ); @@ -161,7 +161,7 @@ public class ReadWriteCacheTest extends BaseCoreFunctionalTestCase { log.info( "Update Book" ); Book book = session.get( Book.class, bookId ); book.setTitle( UPDATED_TITLE ); - session.save( book ); + session.persist( book ); interceptTransaction.set( true ); } ); @@ -251,7 +251,7 @@ public class ReadWriteCacheTest extends BaseCoreFunctionalTestCase { Book book = new Book(); book.setId( bookId ); book.setTitle( ORIGINAL_TITLE ); - session.save( book ); + session.persist( book ); } private Consumer getCacheConfig() { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java index cb5f344343..6ea258a188 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java @@ -41,7 +41,7 @@ public class BidirectionalOneToManyCascadeTest { scope.inTransaction( session -> { List parents = session.createQuery( "from Parent" ).list(); - parents.forEach( parent -> session.delete( parent ) ); + parents.forEach( parent -> session.remove( parent ) ); } ); } @@ -58,7 +58,7 @@ public class BidirectionalOneToManyCascadeTest { Child child = new Child(); child.setParent( parent ); parent.setChildren( Collections.singleton( child ) ); - session.save( parent ); + session.persist( parent ); } ); @@ -84,7 +84,7 @@ public class BidirectionalOneToManyCascadeTest { Child child = new Child(); child.setParent( parent ); parent.setChildren( Collections.singleton( child ) ); - session.save( child ); + session.persist( child ); } ); @@ -111,7 +111,7 @@ public class BidirectionalOneToManyCascadeTest { DeleteOrphanChild child = new DeleteOrphanChild(); child.setParent( parent ); parent.setDeleteOrphanChildren( Collections.singleton( child ) ); - session.save( parent ); + session.persist( parent ); } ); @@ -137,7 +137,7 @@ public class BidirectionalOneToManyCascadeTest { DeleteOrphanChild child = new DeleteOrphanChild(); child.setParent( parent ); parent.setDeleteOrphanChildren( Collections.singleton( child ) ); - session.save( child ); + session.persist( child ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java index 17f2b0d1c9..4c3d67e744 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java @@ -42,7 +42,7 @@ public class CascadeTestWithAssignedParentIdTest { parent.setChildren( Collections.singleton( child ) ); parent.setId( Long.valueOf( 123L ) ); // this should figure out that the parent needs saving first since id is assigned. - session.save( child ); + session.persist( child ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java index 3730a96b9a..08896b0a32 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MergeTest.java @@ -42,7 +42,7 @@ public class MergeTest { session -> { List orders = session.createQuery( "from Order" ).list(); orders.forEach( order -> - session.delete( order ) + session.remove( order ) ); } ); 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 3788aea619..1604cbe728 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 @@ -51,7 +51,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); // modify detached entity @@ -73,7 +73,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); // modify detached entity @@ -90,29 +90,6 @@ public class MultiPathCascadeTest { verifyModifications( scope, a.getId() ); } - @Test - public void testMultiPathUpdateModifiedDetached(SessionFactoryScope scope) { - // persist a simple A in the database - - A a = new A(); - a.setData( "Anna" ); - - scope.inTransaction( - session -> - session.save( a ) - ); - - // modify detached entity - modifyEntity( a ); - - scope.inTransaction( - session -> - session.update( a ) - ); - - verifyModifications( scope, a.getId() ); - } - @Test public void testMultiPathGetAndModify(SessionFactoryScope scope) { // persist a simple A in the database @@ -122,7 +99,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); scope.inTransaction( @@ -145,7 +122,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); // modify detached entity @@ -196,7 +173,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); // modify detached entity @@ -246,7 +223,7 @@ public class MultiPathCascadeTest { scope.inTransaction( session -> - session.save( a ) + session.persist( a ) ); // modify detached entity diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java index 8fddd81e4d..6e6b1f055e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshLazyOneToManyTest.java @@ -43,10 +43,10 @@ public class RefreshLazyOneToManyTest extends BaseCoreFunctionalTestCase { public void testRefreshCascade() { doInHibernate( this::sessionFactory, session -> { Invoice invoice = new Invoice( "An invoice for John Smith" ); - session.save( invoice ); + session.persist( invoice ); - session.save( new Line( "1 pen - 5€", invoice ) ); - session.save( new Tax( "21%", invoice ) ); + session.persist( new Line( "1 pen - 5€", invoice ) ); + session.persist( new Tax( "21%", invoice ) ); } ); doInHibernate( this::sessionFactory, session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java index 3360f1f11e..c824dd5a59 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/RefreshTest.java @@ -56,7 +56,7 @@ public class RefreshTest { batch.createJob().processingInstructions = "I know you can do it!"; // write the stuff to the database; at this stage all job.status values are zero - session.save( batch ); + session.persist( batch ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java index 4fea49250c..7b726c5e38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/AbstractMultiPathCircleCascadeTest.java @@ -47,48 +47,12 @@ public abstract class AbstractMultiPathCircleCascadeTest { return s.merge( entity ); } }; - private static EntityOperation SAVE_OPERATION = - new EntityOperation() { - @Override - public boolean isLegacy() { - return true; - } - - @Override - public Object doEntityOperation(Object entity, Session s) { - s.save( entity ); - return entity; - } - }; - private static EntityOperation SAVE_UPDATE_OPERATION = - new EntityOperation() { - @Override - public boolean isLegacy() { - return true; - } - - @Override - public Object doEntityOperation(Object entity, Session s) { - s.saveOrUpdate( entity ); - return entity; - } - }; @Test public void testMergeEntityWithNonNullableTransientEntity(SessionFactoryScope scope) { testEntityWithNonNullableTransientEntity( scope, MERGE_OPERATION ); } - @Test - public void testSaveEntityWithNonNullableTransientEntity(SessionFactoryScope scope) { - testEntityWithNonNullableTransientEntity( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateEntityWithNonNullableTransientEntity(SessionFactoryScope scope) { - testEntityWithNonNullableTransientEntity( scope, SAVE_UPDATE_OPERATION ); - } - private void testEntityWithNonNullableTransientEntity(SessionFactoryScope scope, EntityOperation operation) { Route route = getUpdatedDetachedEntity( scope ); @@ -130,16 +94,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testEntityWithNonNullableEntityNull( scope, MERGE_OPERATION ); } - @Test - public void testSaveEntityWithNonNullableEntityNull(SessionFactoryScope scope) { - testEntityWithNonNullableEntityNull( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateEntityWithNonNullableEntityNull(SessionFactoryScope scope) { - testEntityWithNonNullableEntityNull( scope, SAVE_UPDATE_OPERATION ); - } - private void testEntityWithNonNullableEntityNull(SessionFactoryScope scope, EntityOperation operation) { Route route = getUpdatedDetachedEntity( scope ); @@ -175,16 +129,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testEntityWithNonNullablePropSetToNull( scope, MERGE_OPERATION ); } - @Test - public void testSaveEntityWithNonNullablePropSetToNull(SessionFactoryScope scope) { - testEntityWithNonNullablePropSetToNull( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateEntityWithNonNullablePropSetToNull(SessionFactoryScope scope) { - testEntityWithNonNullablePropSetToNull( scope, SAVE_UPDATE_OPERATION ); - } - private void testEntityWithNonNullablePropSetToNull(SessionFactoryScope scope, EntityOperation operation) { Route route = getUpdatedDetachedEntity( scope ); Node node = (Node) route.getNodes().iterator().next(); @@ -220,12 +164,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testRoute( scope, MERGE_OPERATION ); } - // skip SAVE_OPERATION since Route is not transient - @Test - public void testSaveUpdateRoute(SessionFactoryScope scope) { - testRoute( scope, SAVE_UPDATE_OPERATION ); - } - private void testRoute(SessionFactoryScope scope, EntityOperation operation) { Route r = getUpdatedDetachedEntity( scope ); @@ -253,16 +191,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testPickupNode( scope, MERGE_OPERATION ); } - @Test - public void testSavePickupNode(SessionFactoryScope scope) { - testPickupNode( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdatePickupNode(SessionFactoryScope scope) { - testPickupNode( scope, SAVE_UPDATE_OPERATION ); - } - private void testPickupNode(SessionFactoryScope scope, EntityOperation operation) { Route r = getUpdatedDetachedEntity( scope ); @@ -303,16 +231,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testDeliveryNode( scope, MERGE_OPERATION ); } - @Test - public void testSaveDeliveryNode(SessionFactoryScope scope) { - testDeliveryNode( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateDeliveryNode(SessionFactoryScope scope) { - testDeliveryNode( scope, SAVE_UPDATE_OPERATION ); - } - private void testDeliveryNode(SessionFactoryScope scope, EntityOperation operation) { Route r = getUpdatedDetachedEntity( scope ); @@ -354,16 +272,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testTour( scope, MERGE_OPERATION ); } - @Test - public void testSaveTour(SessionFactoryScope scope) { - testTour( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateTour(SessionFactoryScope scope) { - testTour( scope, SAVE_UPDATE_OPERATION ); - } - private void testTour(SessionFactoryScope scope, EntityOperation operation) { Route r = getUpdatedDetachedEntity( scope ); @@ -391,16 +299,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testTransport( scope, MERGE_OPERATION ); } - @Test - public void testSaveTransport(SessionFactoryScope scope) { - testTransport( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateTransport(SessionFactoryScope scope) { - testTransport( scope, SAVE_UPDATE_OPERATION ); - } - private void testTransport(SessionFactoryScope scope, EntityOperation operation) { Route r = getUpdatedDetachedEntity( scope ); @@ -447,7 +345,7 @@ public abstract class AbstractMultiPathCircleCascadeTest { session -> { route.setName( "routeA" ); - session.save( route ); + session.persist( route ); } ); @@ -562,16 +460,6 @@ public abstract class AbstractMultiPathCircleCascadeTest { testData3Nodes( scope, MERGE_OPERATION ); } - @Test - public void testSaveData3Nodes(SessionFactoryScope scope) { - testData3Nodes( scope, SAVE_OPERATION ); - } - - @Test - public void testSaveUpdateData3Nodes(SessionFactoryScope scope) { - testData3Nodes( scope, SAVE_UPDATE_OPERATION ); - } - private void testData3Nodes(SessionFactoryScope scope, EntityOperation operation) { Route r = new Route(); @@ -579,7 +467,7 @@ public abstract class AbstractMultiPathCircleCascadeTest { session -> { r.setName( "routeA" ); - session.save( r ); + session.persist( r ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java index 9f4e180af5..0944f8ba30 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java @@ -68,7 +68,7 @@ public class CascadeMergeToChildBeforeParentTest { scope.inTransaction( session -> { r.setName( "routeA" ); - session.save( r ); + session.persist( r ); } ); @@ -118,7 +118,7 @@ public class CascadeMergeToChildBeforeParentTest { session -> { r.setName( "routeA" ); - session.save( r ); + session.persist( r ); } ); @@ -183,7 +183,7 @@ public class CascadeMergeToChildBeforeParentTest { session -> { r.setName( "routeA" ); - session.save( r ); + session.persist( r ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.java index 5f9a5bd02b..11af4de75a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdWithGeneratorTest.java @@ -13,127 +13,112 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.Set; -import org.hibernate.Session; -import org.hibernate.Transaction; +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKey; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.Test; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.junit.Test; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; /** - * Tests the use of composite-id with a generator. - * Test this behavior in all the various entity states (transient, managed, detached) + * Tests the use of composite-id with a generator. + * Test this behavior in all the various entity states (transient, managed, detached) * and the different state transitions. - * + *

* For HHH-2060. - * + * * @author Jacob Robertson */ -@TestForIssue( jiraKey = "HHH-2060" ) -public class CompositeIdWithGeneratorTest extends BaseCoreFunctionalTestCase { +@JiraKey("HHH-2060") +@DomainModel( + xmlMappings = { + "org/hibernate/orm/test/cid/PurchaseRecord.hbm.xml" + } +) +@SessionFactory +public class CompositeIdWithGeneratorTest { private DateFormat df = SimpleDateFormat.getDateTimeInstance( DateFormat.LONG, DateFormat.LONG ); - private Calendar cal = new GregorianCalendar(2021, 1, 31, 17, 30, 0); - - @Override - protected String getBaseForMappings() { - return "org/hibernate/orm/test/"; - } - - @Override - public String[] getMappings() { - return new String[] { "cid/PurchaseRecord.hbm.xml" }; - } + private Calendar cal = new GregorianCalendar( 2021, 1, 31, 17, 30, 0 ); @Test - public void testCompositeIdSimple() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - - // persist the record to get the id generated + public void testCompositeIdSimple(SessionFactoryScope scope) { PurchaseRecord record = new PurchaseRecord(); - record.setTimestamp( cal.getTime() ); - s.persist(record); - - t.commit(); - s.close(); + scope.inTransaction( + session -> { + // persist the record to get the id generated + record.setTimestamp( cal.getTime() ); + session.persist( record ); + } + ); // test that the id was generated PurchaseRecord.Id generatedId = record.getId(); Date timestamp = record.getTimestamp(); - assertNotNull(generatedId); - assertNotNull( generatedId.getPurchaseSequence() ); - assertTrue(generatedId.getPurchaseNumber() > 0); - - s = openSession(); - t = s.beginTransaction(); - - // find the record, and see that the ids match - PurchaseRecord find = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId); - assertNotNull(find); - assertEquals( generatedId, find.getId() ); - assertEquals( df.format(timestamp), df.format(find.getTimestamp()) ); + assertThat( generatedId ).isNotNull(); + assertThat( generatedId.getPurchaseSequence() ).isNotNull(); + assertTrue( generatedId.getPurchaseNumber() > 0 ); - t.commit(); - s.close(); + PurchaseRecord find1 = scope.fromTransaction( + session -> { + // find the record, and see that the ids match + PurchaseRecord find = session.get( PurchaseRecord.class, generatedId ); + assertThat( find ).isNotNull(); + assertThat( find.getId() ).isEqualTo( generatedId ); + assertThat( df.format( find.getTimestamp() ) ).isEqualTo( df.format( timestamp ) ); + return find; + } + ); - s = openSession(); - t = s.beginTransaction(); - - // generate another new record - cal.roll( Calendar.SECOND, true ); PurchaseRecord record2 = new PurchaseRecord(); - record2.setTimestamp( cal.getTime() ); - s.persist(record2); - - t.commit(); - s.close(); + scope.inTransaction( + session -> { + // generate another new record + cal.roll( Calendar.SECOND, true ); + record2.setTimestamp( cal.getTime() ); + session.persist( record2 ); + } + ); + PurchaseRecord.Id generatedId2 = record2.getId(); Date timestamp2 = record2.getTimestamp(); - s = openSession(); - t = s.beginTransaction(); - - PurchaseRecord find2 = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId2); - - t.commit(); - s.close(); - + PurchaseRecord find2 = scope.fromTransaction( + session -> { + return session.get( PurchaseRecord.class, generatedId2 ); + + } + ); + // test that the ids are different - PurchaseRecord.Id id1 = find.getId(); + PurchaseRecord.Id id1 = find1.getId(); PurchaseRecord.Id id2 = find2.getId(); String seq1 = id1.getPurchaseSequence(); String seq2 = id2.getPurchaseSequence(); int num1 = id1.getPurchaseNumber(); int num2 = id2.getPurchaseNumber(); - - assertEquals( df.format(timestamp2), df.format(find2.getTimestamp()) ); - assertFalse( id1.equals(id2) ); - assertFalse( seq1.equals(seq2) ); - assertFalse(num1 == num2); + + assertThat( df.format( find2.getTimestamp() ) ).isEqualTo( df.format( timestamp2 ) ); + assertThat( id1 ).isNotEqualTo( id2 ); + assertThat( seq1 ).isNotEqualTo( seq2 ); + assertThat( num1 ).isNotEqualTo( num2 ); } @Test - public void testDetachedProperty() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - - // persist the record + public void testDetachedProperty(SessionFactoryScope scope) { PurchaseRecord record = new PurchaseRecord(); - cal.roll( Calendar.SECOND, true ); - record.setTimestamp( cal.getTime() ); - s.persist(record); - - // close session so we know the record is detached - t.commit(); - s.close(); + scope.inTransaction( + session -> { + // persist the record + cal.roll( Calendar.SECOND, true ); + record.setTimestamp( cal.getTime() ); + session.persist( record ); + } + ); PurchaseRecord.Id generatedId = record.getId(); @@ -141,353 +126,272 @@ public class CompositeIdWithGeneratorTest extends BaseCoreFunctionalTestCase { Date persistedTimestamp = record.getTimestamp(); cal.roll( Calendar.SECOND, true ); Date newTimestamp = cal.getTime(); - record.setTimestamp(newTimestamp); - - s = openSession(); - t = s.beginTransaction(); + record.setTimestamp( newTimestamp ); - PurchaseRecord find = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId); - - t.commit(); - s.close(); + PurchaseRecord find = scope.fromTransaction( + session -> + session.get( PurchaseRecord.class, generatedId ) + ); // see that we get the original id, and the original timestamp - assertEquals( generatedId, find.getId() ); - assertEquals( df.format(persistedTimestamp), df.format(find.getTimestamp()) ); - - s = openSession(); - t = s.beginTransaction(); + assertThat( find.getId() ).isEqualTo( generatedId ); + assertThat( df.format( find.getTimestamp() ) ).isEqualTo( df.format( persistedTimestamp ) ); + + scope.inTransaction( + session -> { + // update with the new timestamp + session.merge( record ); + } + ); - // update with the new timestamp - s.update(record); - - t.commit(); - s.close(); - // find the newly updated record - s = openSession(); - t = s.beginTransaction(); - - PurchaseRecord find2 = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId); - - t.commit(); - s.close(); + PurchaseRecord find2 = scope.fromTransaction( + session -> + session.get( PurchaseRecord.class, generatedId ) + ); // see that we get the original id, and the new timestamp - assertEquals( generatedId, find2.getId() ); - assertEquals( df.format(newTimestamp), df.format(find2.getTimestamp()) ); + assertThat( find2.getId() ).isEqualTo( generatedId ); + assertThat( df.format( find2.getTimestamp() ) ).isEqualTo( df.format( newTimestamp ) ); } @Test - public void testDetachedId() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - + public void testDetachedId(SessionFactoryScope scope) { Date timestamp1 = cal.getTime(); cal.roll( Calendar.SECOND, true ); Date timestamp2 = cal.getTime(); - - // persist two records PurchaseRecord record1 = new PurchaseRecord(); - record1.setTimestamp(timestamp1); PurchaseRecord record2 = new PurchaseRecord(); - record2.setTimestamp(timestamp2); - s.persist(record1); - s.persist(record2); - - // close session so we know the records are detached - t.commit(); - s.close(); + + scope.inTransaction( + session -> { + // persist two records + record1.setTimestamp( timestamp1 ); + record2.setTimestamp( timestamp2 ); + session.persist( record1 ); + session.persist( record2 ); + } + ); PurchaseRecord.Id generatedId1 = record1.getId(); PurchaseRecord.Id generatedId2 = record2.getId(); - + // change the ids around - effectively making record1 have the same id as record2 // do not persist yet PurchaseRecord.Id toChangeId1 = new PurchaseRecord.Id(); toChangeId1.setPurchaseNumber( record2.getId().getPurchaseNumber() ); toChangeId1.setPurchaseSequence( record2.getId().getPurchaseSequence() ); - record1.setId(toChangeId1); - - s = openSession(); - t = s.beginTransaction(); + record1.setId( toChangeId1 ); - PurchaseRecord find1 = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId1); - PurchaseRecord find2 = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId2); - - t.commit(); - s.close(); + PurchaseRecord find1 = scope.fromTransaction( + session -> + session.get( PurchaseRecord.class, generatedId1 ) + ); + + + PurchaseRecord find2 = scope.fromTransaction( + session -> + session.get( PurchaseRecord.class, generatedId2 ) + ); // see that we get the original ids (and timestamps) // i.e. weren't changed by changing the detached object - assertEquals( generatedId1, find1.getId() ); - assertEquals( df.format(timestamp1), df.format(find1.getTimestamp()) ); - assertEquals( generatedId2, find2.getId() ); - assertEquals( df.format(timestamp2), df.format(find2.getTimestamp()) ); - - s = openSession(); - t = s.beginTransaction(); + assertThat( find1.getId() ).isEqualTo( generatedId1 ); + assertThat( df.format( find1.getTimestamp() ) ).isEqualTo( df.format( timestamp1 ) ); + assertThat( find2.getId() ).isEqualTo( generatedId2 ); + assertThat( df.format( find2.getTimestamp() ) ).isEqualTo( df.format( timestamp2 ) ); - // update with the new changed record id - s.update(record1); - - t.commit(); - s.close(); + scope.inTransaction( + session -> + // update with the new changed record id + session.merge( record1 ) + ); // test that record1 did not get a new generated id, and kept record2's id PurchaseRecord.Id foundId1 = record1.getId(); - assertSame(toChangeId1, foundId1); - assertEquals( toChangeId1.getPurchaseNumber(), foundId1.getPurchaseNumber() ); - assertEquals( toChangeId1.getPurchaseSequence(), foundId1.getPurchaseSequence() ); - + assertThat( toChangeId1 ).isSameAs( foundId1 ); + assertThat( foundId1.getPurchaseNumber() ).isEqualTo( toChangeId1.getPurchaseNumber() ); + assertThat( foundId1.getPurchaseSequence() ).isEqualTo( toChangeId1.getPurchaseSequence() ); + // find record 2 and see that it has the timestamp originally found in record 1 - s = openSession(); - t = s.beginTransaction(); - - find2 = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId2); - - t.commit(); - s.close(); + PurchaseRecord find3 = scope.fromTransaction( + session -> + session.get( PurchaseRecord.class, generatedId2 ) + ); // see that we get the original id (2), and the new timestamp (1) - assertEquals( df.format(timestamp1), df.format(find2.getTimestamp()) ); - assertEquals( generatedId2, find2.getId() ); + assertThat( df.format( find3.getTimestamp() ) ).isEqualTo( df.format( timestamp1 ) ); + assertThat( find3.getId() ).isEqualTo( generatedId2 ); } @Test - public void testSaveOrUpdate() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - - Date timestamp1 = cal.getTime(); - cal.roll( Calendar.SECOND, true ); - Date timestamp2 = cal.getTime(); - - // persist the record + public void testLoad(SessionFactoryScope scope) { PurchaseRecord record = new PurchaseRecord(); - record.setTimestamp(timestamp1); - s.saveOrUpdate(record); - - t.commit(); - s.close(); - - // test that the id was generated - PurchaseRecord.Id generatedId = record.getId(); - assertNotNull(generatedId); - assertNotNull( generatedId.getPurchaseSequence() ); - - // change the timestamp - record.setTimestamp(timestamp2); - - s = openSession(); - t = s.beginTransaction(); - - s.saveOrUpdate(record); - - t.commit(); - s.close(); - - // see that we get the *same* id, and the new timestamp - assertSame( generatedId, record.getId() ); - assertEquals( df.format(timestamp2), df.format(record.getTimestamp()) ); - } - - @Test - public void testLoad() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - - // persist the record, then get the id and timestamp back - PurchaseRecord record = new PurchaseRecord(); - record.setTimestamp( cal.getTime() ); - s.persist(record); - - t.commit(); - s.close(); + scope.inTransaction( + session -> { + // persist the record, then get the id and timestamp back + record.setTimestamp( cal.getTime() ); + session.persist( record ); + } + ); PurchaseRecord.Id id = record.getId(); Date timestamp = record.getTimestamp(); - + // using the given id, load a transient record PurchaseRecord toLoad = new PurchaseRecord(); - - s = openSession(); - t = s.beginTransaction(); - s.load(toLoad, id); - - t.commit(); - s.close(); - + scope.inTransaction( + session -> + session.load( toLoad, id ) + ); + // show that the correct timestamp and ids were loaded - assertEquals( id, toLoad.getId() ); - assertEquals( df.format(timestamp), df.format(toLoad.getTimestamp()) ); + assertThat( toLoad.getId() ).isEqualTo( id ); + assertThat( df.format( toLoad.getTimestamp() ) ).isEqualTo( df.format( timestamp ) ); } @Test - public void testEvict() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - + public void testEvict(SessionFactoryScope scope) { Date timestamp1 = cal.getTime(); cal.roll( Calendar.SECOND, true ); Date timestamp2 = cal.getTime(); - - // persist the record, then evict it, then make changes to it ("within" the session) + PurchaseRecord record = new PurchaseRecord(); - record.setTimestamp(timestamp1); - s.persist(record); - s.flush(); - s.evict(record); - - record.setTimestamp(timestamp2); - - t.commit(); - s.close(); + scope.inTransaction( + session -> { + // persist the record, then evict it, then make changes to it ("within" the session) + record.setTimestamp( timestamp1 ); + session.persist( record ); + session.flush(); + session.evict( record ); + + record.setTimestamp( timestamp2 ); + } + ); PurchaseRecord.Id generatedId = record.getId(); - + // now, re-fetch the record and show that the timestamp change wasn't persisted - s = openSession(); - t = s.beginTransaction(); + PurchaseRecord persistent = scope.fromTransaction( + session -> + session.get( PurchaseRecord.class, generatedId ) + ); - PurchaseRecord persistent = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId); - - t.commit(); - s.close(); - - assertEquals( generatedId, persistent.getId() ); - assertEquals( df.format(timestamp1), df.format(persistent.getTimestamp()) ); + assertThat( persistent.getId() ).isEqualTo( generatedId ); + assertThat( df.format( persistent.getTimestamp() ) ).isEqualTo( df.format( timestamp1 ) ); } - - @Test - public void testMerge() { - Session s = openSession(); - Transaction t = s.beginTransaction(); + @Test + public void testMerge(SessionFactoryScope scope) { Date timestamp1 = cal.getTime(); cal.roll( Calendar.SECOND, true ); Date timestamp2 = cal.getTime(); - - // persist the record PurchaseRecord record = new PurchaseRecord(); - record.setTimestamp( timestamp1 ); - s.persist(record); - - t.commit(); - s.close(); + scope.inTransaction( + session -> { + // persist the record + record.setTimestamp( timestamp1 ); + session.persist( record ); + } + ); // test that the id was generated PurchaseRecord.Id generatedId = record.getId(); - assertNotNull(generatedId); - assertNotNull( generatedId.getPurchaseSequence() ); - - s = openSession(); - t = s.beginTransaction(); + assertThat( generatedId ).isNotNull(); + assertThat( generatedId.getPurchaseSequence() ).isNotNull(); - // update detached object, retrieve persistent object, then merge - PurchaseRecord detached = record; - detached.setTimestamp(timestamp2); - PurchaseRecord persistent = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId); - - // show that the timestamp hasn't changed - assertEquals( df.format(timestamp1), df.format(persistent.getTimestamp()) ); - - s.merge(detached); - - t.commit(); - s.close(); + PurchaseRecord persistent = scope.fromTransaction( + session -> { + // update detached object, retrieve persistent object, then merge + PurchaseRecord detached = record; + detached.setTimestamp( timestamp2 ); + PurchaseRecord p = session.get( PurchaseRecord.class, generatedId ); + + // show that the timestamp hasn't changed + assertThat( df.format( p.getTimestamp() ) ).isEqualTo( df.format( timestamp1 ) ); + + session.merge( detached ); + return p; + } + ); // show that the persistent object was changed only after the session flush - assertEquals( timestamp2, persistent.getTimestamp() ); - + assertThat( df.format( persistent.getTimestamp() ) ).isEqualTo( df.format( timestamp2 ) ); + // show that the persistent store was updated - not just the in-memory object - s = openSession(); - t = s.beginTransaction(); + scope.fromTransaction( + session -> + session.get( PurchaseRecord.class, generatedId ) + ); - persistent = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId); - t.commit(); - s.close(); - - assertEquals( df.format(timestamp2), df.format(persistent.getTimestamp()) ); + assertThat( df.format( persistent.getTimestamp() ) ).isEqualTo( df.format( timestamp2 ) ); } @Test - public void testDelete() { - Session s = openSession(); - Transaction t = s.beginTransaction(); + public void testDelete(SessionFactoryScope scope) { + PurchaseRecord record = new PurchaseRecord(); // persist the record - PurchaseRecord record = new PurchaseRecord(); - s.saveOrUpdate(record); - - t.commit(); - s.close(); + scope.inTransaction( + session -> + session.persist( record ) + ); PurchaseRecord.Id generatedId = record.getId(); - - // re-fetch, then delete the record - s = openSession(); - t = s.beginTransaction(); - PurchaseRecord find = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId); - s.delete(find); - assertFalse( s.contains(find) ); - - t.commit(); - s.close(); + // re-fetch, then delete the record + scope.inTransaction( + session -> { + PurchaseRecord find = session.get( PurchaseRecord.class, generatedId ); + session.remove( find ); + assertFalse( session.contains( find ) ); + } + ); // attempt to re-fetch - show it was deleted - s = openSession(); - t = s.beginTransaction(); + PurchaseRecord find = scope.fromTransaction( + session -> + session.get( PurchaseRecord.class, generatedId ) + ); - find = (PurchaseRecord) s.get(PurchaseRecord.class, generatedId); - - t.commit(); - s.close(); - - assertNull(find); + assertThat( find ).isNull(); } - - @Test - public void testGeneratedIdsWithChildren() { - - Session s = openSession(); - Transaction t = s.beginTransaction(); + @Test + public void testGeneratedIdsWithChildren(SessionFactoryScope scope) { // set up the record and details PurchaseRecord record = new PurchaseRecord(); Set details = record.getDetails(); - details.add( new PurchaseDetail(record, "p@1", 1) ); - details.add( new PurchaseDetail(record, "p@2", 2) ); + details.add( new PurchaseDetail( record, "p@1", 1 ) ); + details.add( new PurchaseDetail( record, "p@2", 2 ) ); + + scope.inTransaction( + session -> + session.persist( record ) + ); - s.persist(record); - - t.commit(); - s.close(); - // show that the ids were generated (non-zero) and come out the same int foundPurchaseNumber = record.getId().getPurchaseNumber(); String foundPurchaseSequence = record.getId().getPurchaseSequence(); - assertNotNull( record.getId() ); - assertTrue(foundPurchaseNumber > 0); - assertNotNull(foundPurchaseSequence); - + assertThat( record.getId() ).isNotNull(); + assertThat( foundPurchaseNumber ).isGreaterThan( 0 ); + assertThat( foundPurchaseSequence ).isNotNull(); + // search on detail1 by itself and show it got the parent's id - s = openSession(); - t = s.beginTransaction(); // doAfterTransactionCompletion a find to show that it will wire together fine - PurchaseRecord foundRecord = (PurchaseRecord) s.get(PurchaseRecord.class, - new PurchaseRecord.Id(foundPurchaseNumber, foundPurchaseSequence) - ); - - t.commit(); - s.close(); + PurchaseRecord foundRecord = scope.fromTransaction( + session -> + session.get( + PurchaseRecord.class, + new PurchaseRecord.Id( foundPurchaseNumber, foundPurchaseSequence ) + ) + ); // some simple test to see it fetched - assertEquals( 2, foundRecord.getDetails().size() ); + assertThat( foundRecord.getDetails().size() ).isEqualTo( 2 ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/classloader/ProxyInterfaceClassLoaderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/classloader/ProxyInterfaceClassLoaderTest.java index 4dd73164a5..9756936589 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/classloader/ProxyInterfaceClassLoaderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/classloader/ProxyInterfaceClassLoaderTest.java @@ -51,7 +51,7 @@ public class ProxyInterfaceClassLoaderTest extends BaseCoreFunctionalTestCase { Assert.assertTrue( "Loaded entity is not an instance of the proxy interface", IPerson.class.isInstance( lp ) ); Assert.assertFalse( "Proxy class was not created", Person.class.isInstance( lp ) ); - s.delete( lp ); + s.remove( lp ); t.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java index 5f3d414004..08d3583121 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/backref/map/compkey/BackrefCompositeMapKeyTest.java @@ -50,7 +50,7 @@ public class BackrefCompositeMapKeyTest { prod.getParts().remove( mapKey ); - session.delete( prod ); + session.remove( prod ); } ); @@ -81,7 +81,7 @@ public class BackrefCompositeMapKeyTest { scope.inTransaction( session -> - session.delete( session.get( Product.class, "Widget" ) ) + session.remove( session.get( Product.class, "Widget" ) ) ); } @@ -106,7 +106,7 @@ public class BackrefCompositeMapKeyTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); @@ -138,69 +138,7 @@ public class BackrefCompositeMapKeyTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); - } - ); - } - - @Test - public void testOrphanDeleteOnSaveOrUpdate(SessionFactoryScope scope) { - Product prod = new Product( "Widget" ); - MapKey mapKey = new MapKey( "Top" ); - scope.inTransaction( - session -> { - Part part = new Part( "Widge", "part if a Widget" ); - prod.getParts().put( mapKey, part ); - Part part2 = new Part( "Get", "another part if a Widget" ); - prod.getParts().put( new MapKey( "Bottom" ), part2 ); - session.persist( prod ); - } - ); - - prod.getParts().remove( mapKey ); - - scope.inTransaction( - session -> - session.saveOrUpdate( prod ) - ); - - scope.inTransaction( - session -> { - assertNull( session.get( Part.class, "Widge" ) ); - assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); - } - ); - } - - @Test - public void testOrphanDeleteOnSaveOrUpdateAfterSerialization(SessionFactoryScope scope) { - Product prod = new Product( "Widget" ); - MapKey mapKey = new MapKey( "Top" ); - scope.inTransaction( - session -> { - Part part = new Part( "Widge", "part if a Widget" ); - prod.getParts().put( mapKey, part ); - Part part2 = new Part( "Get", "another part if a Widget" ); - prod.getParts().put( new MapKey( "Bottom" ), part2 ); - session.persist( prod ); - } - ); - - prod.getParts().remove( mapKey ); - - Product cloned = (Product) SerializationHelper.clone( prod ); - - scope.inTransaction( - session -> - session.saveOrUpdate( cloned ) - ); - - scope.inTransaction( - session -> { - assertNull( session.get( Part.class, "Widge" ) ); - assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -243,7 +181,7 @@ public class BackrefCompositeMapKeyTest { assertTrue( Hibernate.isInitialized( prod.getParts() ) ); assertNull( prod.getParts().get( new MapKey( "Top" ) ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -274,7 +212,7 @@ public class BackrefCompositeMapKeyTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagAndSetFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagAndSetFetchTest.java index cfca1c00dd..3f755dd367 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagAndSetFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagAndSetFetchTest.java @@ -67,20 +67,20 @@ public class BagAndSetFetchTest { a.addAttribute( b ); a.addAttribute( b1 ); - session.save( c ); - session.save( c1 ); - session.save( c2 ); - session.save( c3 ); - session.save( c4 ); + session.persist( c ); + session.persist( c1 ); + session.persist( c2 ); + session.persist( c3 ); + session.persist( c4 ); - session.save( d ); - session.save( d1 ); - session.save( d2 ); + session.persist( d ); + session.persist( d1 ); + session.persist( d2 ); - session.save( b ); - session.save( b1 ); + session.persist( b ); + session.persist( b1 ); - session.save( a ); + session.persist( a ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java index bd8bf1fd75..e2790aecc5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/BagElementNullBasicTest.java @@ -64,7 +64,7 @@ public class BagElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -93,7 +93,7 @@ public class BagElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -136,7 +136,7 @@ public class BagElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -168,7 +168,7 @@ public class BagElementNullBasicTest { assertEquals( 1, e.aCollection.size() ); assertEquals( 1, getCollectionElementRows( e.id, scope ).size() ); assertEquals( "ghi", e.aCollection.get( 0 ) ); - session.delete( e ); + session.remove( e ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/EagerBagsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/EagerBagsTest.java index bcdb55b643..1252246ec5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/EagerBagsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/EagerBagsTest.java @@ -52,15 +52,15 @@ public class EagerBagsTest { a.addAttribute( b ); a.addAttribute( b1 ); - session.save( c ); - session.save( c1 ); - session.save( c2 ); - session.save( c3 ); + session.persist( c ); + session.persist( c1 ); + session.persist( c2 ); + session.persist( c3 ); - session.save( b ); - session.save( b1 ); + session.persist( b ); + session.persist( b1 ); - session.save( a ); + session.persist( a ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java index edaeb9a7d3..e13a003340 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagContainsTest.java @@ -78,7 +78,7 @@ public class PersistentBagContainsTest { scope.inTransaction( session -> { Order order = session.find( Order.class, _order.getId() ); - session.delete( order ); + session.remove( order ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagTest.java index b2f704820c..bc7a31ea8c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/bag/PersistentBagTest.java @@ -47,7 +47,7 @@ public class PersistentBagTest { scope.inTransaction( session -> { - session.save( parent ); + session.persist( parent ); session.flush(); // at this point, the list on parent has now been replaced with a PersistentBag... PersistentBag children = (PersistentBag) parent.getChildren(); @@ -66,7 +66,7 @@ public class PersistentBagTest { assertFalse( children.isDirty() ); children.clear(); - session.delete( child ); + session.remove( child ); assertTrue( children.isDirty() ); session.flush(); @@ -74,7 +74,7 @@ public class PersistentBagTest { children.clear(); assertFalse( children.isDirty() ); - session.delete( parent ); + session.remove( parent ); } ); } @@ -110,7 +110,7 @@ public class PersistentBagTest { session -> { Order order = session.get( Order.class, orderId ); assertEquals( 2, order.getItems().size() ); - session.delete( order ); + session.remove( order ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java index 0d496a47fb..44da3ea609 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/BagDelayedOperationTest.java @@ -77,7 +77,7 @@ public class BagDelayedOperationTest { session -> { Parent parent = session.get( Parent.class, parentId ); parent.getChildren().clear(); - session.delete( parent ); + session.remove( parent ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java index da7483fa0a..399d0bdde1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/DetachedBagDelayedOperationTest.java @@ -219,116 +219,6 @@ public class DetachedBagDelayedOperationTest { assertFalse( opDetachedWatcher.wasTriggered() ); } - @Test - @TestForIssue(jiraKey = "HHH-11209") - public void testSaveOrUpdateDetachedCollectionWithQueuedOperations( - SessionFactoryScope scope, - LoggingInspectionsScope loggingScope) { - final MessageKeyWatcher opMergedWatcher = loggingScope.getWatcher( "HHH000494", CollectionType.class ); - final MessageKeyWatcher opAttachedWatcher = loggingScope.getWatcher( "HHH000495", AbstractPersistentCollection.class ); - final MessageKeyWatcher opDetachedWatcher = loggingScope.getWatcher( "HHH000496", AbstractPersistentCollection.class ); - final MessageKeyWatcher opRollbackWatcher = loggingScope.getWatcher( "HHH000498", AbstractPersistentCollection.class ); - - final Parent pOriginal = scope.fromTransaction( - session -> { - Parent p = session.get( Parent.class, 1L ); - assertFalse( Hibernate.isInitialized( p.getChildren() ) ); - // initialize - Hibernate.initialize( p.getChildren() ); - assertTrue( Hibernate.isInitialized( p.getChildren() ) ); - return p; - } - ); - final Parent pAfterDetachWithQueuedOperations = scope.fromTransaction( - session -> { - Parent p = session.merge( pOriginal ); - Child c = new Child( "Zeke" ); - c.setParent( p ); - session.persist( c ); - assertFalse( Hibernate.isInitialized( p.getChildren() ) ); - p.getChildren().add( c ); - assertFalse( Hibernate.isInitialized( p.getChildren() ) ); - assertTrue( ( (AbstractPersistentCollection) p.getChildren() ).hasQueuedOperations() ); - - assertFalse( opMergedWatcher.wasTriggered() ); - assertFalse( opAttachedWatcher.wasTriggered() ); - assertFalse( opDetachedWatcher.wasTriggered() ); - assertFalse( opRollbackWatcher.wasTriggered() ); - - session.detach( p ); - assertTrue( opDetachedWatcher.wasTriggered() ); - assertEquals( - "HHH000496: Detaching an uninitialized collection with queued operations from a session: [org.hibernate.orm.test.collection.delayedOperation.DetachedBagDelayedOperationTest$Parent.children#1]", - opDetachedWatcher.getFirstTriggeredMessage() - ); - opDetachedWatcher.reset(); - - // Make sure nothing else got triggered - assertFalse( opMergedWatcher.wasTriggered() ); - assertFalse( opAttachedWatcher.wasTriggered() ); - assertFalse( opDetachedWatcher.wasTriggered() ); - assertFalse( opRollbackWatcher.wasTriggered() ); - - session.clear(); //should be unnecessary by there is a bug we need to fix! - - return p; - } - ); - - assertFalse( opMergedWatcher.wasTriggered() ); - assertFalse( opAttachedWatcher.wasTriggered() ); - assertFalse( opDetachedWatcher.wasTriggered() ); - - assertTrue( ( (AbstractPersistentCollection) pAfterDetachWithQueuedOperations.getChildren() ).hasQueuedOperations() ); - - // Save detached Parent with uninitialized collection with queued operations - scope.inTransaction( - session -> { - - assertFalse( opMergedWatcher.wasTriggered() ); - assertFalse( opAttachedWatcher.wasTriggered() ); - assertFalse( opDetachedWatcher.wasTriggered() ); - assertFalse( opRollbackWatcher.wasTriggered() ); - - assertFalse( opAttachedWatcher.wasTriggered() ); - session.saveOrUpdate( pAfterDetachWithQueuedOperations ); - assertTrue( opAttachedWatcher.wasTriggered() ); - assertEquals( - "HHH000495: Attaching an uninitialized collection with queued operations to a session: [org.hibernate.orm.test.collection.delayedOperation.DetachedBagDelayedOperationTest$Parent.children#1]", - opAttachedWatcher.getFirstTriggeredMessage() - ); - opAttachedWatcher.reset(); - - // Make sure nothing else got triggered - assertFalse( opMergedWatcher.wasTriggered() ); - assertFalse( opAttachedWatcher.wasTriggered() ); - assertFalse( opDetachedWatcher.wasTriggered() ); - assertFalse( opRollbackWatcher.wasTriggered() ); - - assertFalse( Hibernate.isInitialized( pAfterDetachWithQueuedOperations.getChildren() ) ); - assertTrue( ( (AbstractPersistentCollection) pAfterDetachWithQueuedOperations.getChildren() ).hasQueuedOperations() ); - - // Queued operations will be executed when the collection is initialized, - // After initialization, the collection will contain the Child that was added as a - // queued operation before being detached above. - Hibernate.initialize( pAfterDetachWithQueuedOperations.getChildren() ); - final Set childNames = new HashSet<>( - Arrays.asList( "Yogi", "Sherman", "Zeke" ) - ); - assertEquals( childNames.size(), pAfterDetachWithQueuedOperations.getChildren().size() ); - for ( Child child : pAfterDetachWithQueuedOperations.getChildren() ) { - childNames.remove( child.getName() ); - } - assertEquals( 0, childNames.size() ); - } - ); - - assertFalse( opMergedWatcher.wasTriggered() ); - assertFalse( opAttachedWatcher.wasTriggered() ); - assertFalse( opDetachedWatcher.wasTriggered() ); - assertFalse( opRollbackWatcher.wasTriggered() ); - } - @Test @TestForIssue(jiraKey = "HHH-11209") public void testCollectionWithQueuedOperationsOnRollback( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java index 7cd2a947ca..d3d704050f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/ListDelayedOperationTest.java @@ -84,7 +84,7 @@ public class ListDelayedOperationTest { session -> { Parent parent = session.get( Parent.class, parentId ); parent.getChildren().clear(); - session.delete( parent ); + session.remove( parent ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java index 6cbe2aff84..737d16110b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/delayedOperation/SetDelayedOperationTest.java @@ -80,7 +80,7 @@ public class SetDelayedOperationTest { session -> { Parent parent = session.get( Parent.class, parentId ); parent.getChildren().clear(); - session.delete( parent ); + session.remove( parent ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java index c84dc138a3..5cc64de00b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedCascadeDereferencedCollectionTest.java @@ -61,7 +61,7 @@ public class UnversionedCascadeDereferencedCollectionTest extends AbstractDerefe scope.inTransaction( session -> { assertNull( unversionedCascadeOne.getManies() ); - session.save( unversionedCascadeOne ); + session.persist( unversionedCascadeOne ); assertNull( unversionedCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, unversionedCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -141,7 +141,7 @@ public class UnversionedCascadeDereferencedCollectionTest extends AbstractDerefe scope.inTransaction( session -> { assertNull( unversionedCascadeOne.getManies() ); - session.save( unversionedCascadeOne ); + session.persist( unversionedCascadeOne ); assertNull( unversionedCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, unversionedCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -227,7 +227,7 @@ public class UnversionedCascadeDereferencedCollectionTest extends AbstractDerefe scope.inTransaction( session -> { assertNull( unversionedCascadeOne.getManies() ); - session.save( unversionedCascadeOne ); + session.persist( unversionedCascadeOne ); assertNull( unversionedCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, unversionedCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -324,45 +324,4 @@ public class UnversionedCascadeDereferencedCollectionTest extends AbstractDerefe ); } - @Test - public void testSaveOrUpdateNullCollection(SessionFactoryScope scope) { - UnversionedCascadeOne one = new UnversionedCascadeOne(); - scope.inTransaction( - session -> { - assertNull( one.getManies() ); - session.save( one ); - assertNull( one.getManies() ); - EntityEntry eeOne = getEntityEntry( session, one ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - session.flush(); - assertNull( one.getManies() ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - } - ); - - scope.inTransaction( - session -> { - session.saveOrUpdate( one ); - - // Ensure one.getManies() is still null. - assertNull( one.getManies() ); - - // Ensure the EntityEntry loaded state contains null for the manies collection. - EntityEntry eeOne = getEntityEntry( session, one ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - - session.flush(); - - // Ensure one.getManies() is still null. - assertNull( one.getManies() ); - - // Ensure the same EntityEntry is being used. - assertSame( eeOne, getEntityEntry( session, one ) ); - - // Ensure the EntityEntry loaded state still contains null for the manies collection. - assertNull( eeOne.getLoadedValue( "manies" ) ); - } - ); - } - } \ No newline at end of file diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java index 04976c981c..ee8568eb06 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/UnversionedNoCascadeDereferencedCollectionTest.java @@ -60,7 +60,7 @@ public class UnversionedNoCascadeDereferencedCollectionTest extends AbstractDere scope.inTransaction( session -> { assertNull( unversionedNoCascadeOne.getManies() ); - session.save( unversionedNoCascadeOne ); + session.persist( unversionedNoCascadeOne ); assertNull( unversionedNoCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, unversionedNoCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -139,7 +139,7 @@ public class UnversionedNoCascadeDereferencedCollectionTest extends AbstractDere scope.inTransaction( session -> { assertNull( unversionedNoCascadeOne.getManies() ); - session.save( unversionedNoCascadeOne ); + session.persist( unversionedNoCascadeOne ); assertNull( unversionedNoCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, unversionedNoCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -224,7 +224,7 @@ public class UnversionedNoCascadeDereferencedCollectionTest extends AbstractDere scope.inTransaction( session -> { assertNull( unversionedNoCascadeOne.getManies() ); - session.save( unversionedNoCascadeOne ); + session.persist( unversionedNoCascadeOne ); assertNull( unversionedNoCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, unversionedNoCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -320,44 +320,4 @@ public class UnversionedNoCascadeDereferencedCollectionTest extends AbstractDere ); } - @Test - public void testSaveOrUpdateNullCollection(SessionFactoryScope scope) { - UnversionedNoCascadeOne unversionedNoCascadeOne = new UnversionedNoCascadeOne(); - scope.inTransaction( - session -> { - assertNull( unversionedNoCascadeOne.getManies() ); - session.save( unversionedNoCascadeOne ); - assertNull( unversionedNoCascadeOne.getManies() ); - EntityEntry eeOne = getEntityEntry( session, unversionedNoCascadeOne ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - session.flush(); - assertNull( unversionedNoCascadeOne.getManies() ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - } - ); - - scope.inTransaction( - session -> { - session.saveOrUpdate( unversionedNoCascadeOne ); - - // Ensure one.getManies() is still null. - assertNull( unversionedNoCascadeOne.getManies() ); - - // Ensure the EntityEntry loaded state contains null for the manies collection. - EntityEntry eeOne = getEntityEntry( session, unversionedNoCascadeOne ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - - session.flush(); - - // Ensure one.getManies() is still null. - assertNull( unversionedNoCascadeOne.getManies() ); - - // Ensure the same EntityEntry is being used. - assertSame( eeOne, getEntityEntry( session, unversionedNoCascadeOne ) ); - - // Ensure the EntityEntry loaded state still contains null for the manies collection. - assertNull( eeOne.getLoadedValue( "manies" ) ); - } - ); - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java index afd7c628d4..6132540679 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedCascadeDereferencedCollectionTest.java @@ -62,7 +62,7 @@ public class VersionedCascadeDereferencedCollectionTest extends AbstractDerefere scope.inTransaction( session -> { assertNull( versionedCascadeOne.getManies() ); - session.save( versionedCascadeOne ); + session.persist( versionedCascadeOne ); assertNull( versionedCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, versionedCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -142,7 +142,7 @@ public class VersionedCascadeDereferencedCollectionTest extends AbstractDerefere scope.inTransaction( session -> { assertNull( versionedCascadeOne.getManies() ); - session.save( versionedCascadeOne ); + session.persist( versionedCascadeOne ); assertNull( versionedCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, versionedCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -224,7 +224,7 @@ public class VersionedCascadeDereferencedCollectionTest extends AbstractDerefere scope.inTransaction( session -> { assertNull( versionedCascadeOne.getManies() ); - session.save( versionedCascadeOne ); + session.persist( versionedCascadeOne ); assertNull( versionedCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, versionedCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -317,44 +317,4 @@ public class VersionedCascadeDereferencedCollectionTest extends AbstractDerefere ); } - @Test - public void testSaveOrUpdateNullCollection(SessionFactoryScope scope) { - VersionedCascadeOne one = new VersionedCascadeOne(); - scope.inTransaction( - session -> { - assertNull( one.getManies() ); - session.save( one ); - assertNull( one.getManies() ); - EntityEntry eeOne = getEntityEntry( session, one ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - session.flush(); - assertNull( one.getManies() ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - } - ); - - scope.inTransaction( - session -> { - session.saveOrUpdate( one ); - - // Ensure one.getManies() is still null. - assertNull( one.getManies() ); - - // Ensure the EntityEntry loaded state contains null for the manies collection. - EntityEntry eeOne = getEntityEntry( session, one ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - - session.flush(); - - // Ensure one.getManies() is still null. - assertNull( one.getManies() ); - - // Ensure the same EntityEntry is being used. - assertSame( eeOne, getEntityEntry( session, one ) ); - - // Ensure the EntityEntry loaded state still contains null for the manies collection. - assertNull( eeOne.getLoadedValue( "manies" ) ); - } - ); - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java index 034974ba8e..e6f7ec281a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/dereferenced/VersionedNoCascadeDereferencedCollectionTest.java @@ -61,7 +61,7 @@ public class VersionedNoCascadeDereferencedCollectionTest extends AbstractDerefe scope.inTransaction( session -> { assertNull( versionedNoCascadeOne.getManies() ); - session.save( versionedNoCascadeOne ); + session.persist( versionedNoCascadeOne ); assertNull( versionedNoCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, versionedNoCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -141,7 +141,7 @@ public class VersionedNoCascadeDereferencedCollectionTest extends AbstractDerefe scope.inTransaction( session -> { assertNull( versionedNoCascadeOne.getManies() ); - session.save( versionedNoCascadeOne ); + session.persist( versionedNoCascadeOne ); assertNull( versionedNoCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, versionedNoCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -227,7 +227,7 @@ public class VersionedNoCascadeDereferencedCollectionTest extends AbstractDerefe scope.inTransaction( session -> { assertNull( versionedNoCascadeOne.getManies() ); - session.save( versionedNoCascadeOne ); + session.persist( versionedNoCascadeOne ); assertNull( versionedNoCascadeOne.getManies() ); EntityEntry eeOne = getEntityEntry( session, versionedNoCascadeOne ); assertNull( eeOne.getLoadedValue( "manies" ) ); @@ -323,44 +323,4 @@ public class VersionedNoCascadeDereferencedCollectionTest extends AbstractDerefe ); } - @Test - public void testSaveOrUpdateNullCollection(SessionFactoryScope scope) { - VersionedNoCascadeOne versionedNoCascadeOne = new VersionedNoCascadeOne(); - scope.inTransaction( - session -> { - assertNull( versionedNoCascadeOne.getManies() ); - session.save( versionedNoCascadeOne ); - assertNull( versionedNoCascadeOne.getManies() ); - EntityEntry eeOne = getEntityEntry( session, versionedNoCascadeOne ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - session.flush(); - assertNull( versionedNoCascadeOne.getManies() ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - } - ); - - scope.inTransaction( - session -> { - session.saveOrUpdate( versionedNoCascadeOne ); - - // Ensure one.getManies() is still null. - assertNull( versionedNoCascadeOne.getManies() ); - - // Ensure the EntityEntry loaded state contains null for the manies collection. - EntityEntry eeOne = getEntityEntry( session, versionedNoCascadeOne ); - assertNull( eeOne.getLoadedValue( "manies" ) ); - - session.flush(); - - // Ensure one.getManies() is still null. - assertNull( versionedNoCascadeOne.getManies() ); - - // Ensure the same EntityEntry is being used. - assertSame( eeOne, getEntityEntry( session, versionedNoCascadeOne ) ); - - // Ensure the EntityEntry loaded state still contains null for the manies collection. - assertNull( eeOne.getLoadedValue( "manies" ) ); - } - ); - } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java index 904494488e..44dcdef254 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/IdBagElementNullBasicTest.java @@ -55,7 +55,7 @@ public class IdBagElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -84,7 +84,7 @@ public class IdBagElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -114,7 +114,7 @@ public class IdBagElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -151,7 +151,7 @@ public class IdBagElementNullBasicTest { assertEquals( 1, e.aCollection.size() ); assertEquals( 1, getCollectionElementRows( e.id, scope ).size() ); assertEquals( "ghi", e.aCollection.get( 0 ) ); - session.delete( e ); + session.remove( e ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/PersistentIdBagTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/PersistentIdBagTest.java index cb006b853c..8eda157bf2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/PersistentIdBagTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/PersistentIdBagTest.java @@ -39,7 +39,7 @@ public class PersistentIdBagTest { scope.inTransaction( session -> { - session.save( parent ); + session.persist( parent ); session.flush(); // at this point, the list on parent has now been replaced with a PersistentBag... PersistentIdentifierBag children = (PersistentIdentifierBag) parent.getChildren(); @@ -58,7 +58,7 @@ public class PersistentIdBagTest { assertFalse( children.isDirty() ); children.clear(); - session.delete( child ); + session.remove( child ); assertTrue( children.isDirty() ); session.flush(); @@ -66,7 +66,7 @@ public class PersistentIdBagTest { children.clear(); assertFalse( children.isDirty() ); - session.delete( parent ); + session.remove( parent ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/LazyAssociationNoCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/LazyAssociationNoCascadeTest.java index 1d6ee4f28d..e5848d2add 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/LazyAssociationNoCascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/LazyAssociationNoCascadeTest.java @@ -34,7 +34,7 @@ public class LazyAssociationNoCascadeTest { session -> { session.beginTransaction(); try { - session.save( parent ); + session.persist( parent ); session.getTransaction().commit(); session.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java index 7f106ff309..949cd00d9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListElementNullBasicTest.java @@ -49,7 +49,7 @@ public class ListElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -78,7 +78,7 @@ public class ListElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -108,7 +108,7 @@ public class ListElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -150,7 +150,7 @@ public class ListElementNullBasicTest { assertEquals( 2, getCollectionElementRows( e.id, scope ).size() ); assertEquals( "not null", e.aCollection.get( 0 ) ); assertEquals( "ghi", e.aCollection.get( 1 ) ); - session.delete( e ); + session.remove( e ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java index 566c35dc42..148ca55366 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/ListIndexReferenceFromListElementTest.java @@ -51,7 +51,7 @@ public class ListIndexReferenceFromListElementTest { LocalOrder localOrder = new LocalOrder(); localOrder.makeLineItem( "Shoes" ); localOrder.makeLineItem( "Socks" ); - session.save( localOrder ); + session.persist( localOrder ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java index 87876583de..10b7c9d800 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/list/PersistentListTest.java @@ -61,7 +61,7 @@ public class PersistentListTest { root.getChildren().add( child2 ); child2.setParent( root ); - session.save( root ); + session.persist( root ); } ); @@ -99,7 +99,7 @@ public class PersistentListTest { assertEquals( Integer.valueOf( 1 ), valueMap.get( "c2" ) ); } ); - session2.delete( root ); + session2.remove( root ); } ); @@ -122,7 +122,7 @@ public class PersistentListTest { order.addLineItem( "abc", 2 ); order.addLineItem( "def", 200 ); order.addLineItem( "ghi", 13 ); - session.save( order ); + session.persist( order ); } ); @@ -159,7 +159,7 @@ public class PersistentListTest { assertEquals( Integer.valueOf( 2 ), valueMap.get( "ghi" ) ); } ); - session2.delete( order ); + session2.remove( order ); } ); } @@ -174,7 +174,7 @@ public class PersistentListTest { scope.inTransaction( session -> { - session.save( parent ); + session.persist( parent ); session.flush(); // at this point, the list on parent has now been replaced with a PersistentList... PersistentList children = (PersistentList) parent.getChildren(); @@ -193,7 +193,7 @@ public class PersistentListTest { assertFalse( children.isDirty() ); children.clear(); - session.delete( child ); + session.remove( child ); assertTrue( children.isDirty() ); session.flush(); @@ -201,7 +201,7 @@ public class PersistentListTest { children.clear(); assertFalse( children.isDirty() ); - session.delete( parent ); + session.remove( parent ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java index bf6b6c11d9..1eb9f92c99 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/EmbeddableIndexTest.java @@ -45,11 +45,11 @@ public class EmbeddableIndexTest { scope.inTransaction( session -> { TheOne one = new TheOne( "1" ); - session.save( one ); + session.persist( one ); TheMapKey theMapKey = new TheMapKey( one ); TheMany theMany = new TheMany( theMapKey ); - session.save( theMany ); + session.persist( theMany ); Map map = new HashMap<>(); map.put( theMapKey, theMany ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java index f98b2225be..ccb4f580ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/MapElementNullBasicTest.java @@ -49,7 +49,7 @@ public class MapElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -78,7 +78,7 @@ public class MapElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -107,7 +107,7 @@ public class MapElementNullBasicTest { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId, scope ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -147,7 +147,7 @@ public class MapElementNullBasicTest { assertEquals( 1, e.aCollection.size() ); assertEquals( 1, getCollectionElementRows( entityId, scope ).size() ); assertEquals( "not null", e.aCollection.get( "abc" ) ); - session.delete( e ); + session.remove( e ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java index 4ddaaac54d..1d4538c5ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/PersistentMapTest.java @@ -69,7 +69,7 @@ public class PersistentMapTest { scope.inTransaction( session -> { - session.save( parent ); + session.persist( parent ); session.flush(); // at this point, the map on parent has now been replaced with a PersistentMap... PersistentMap children = (PersistentMap) parent.getChildren(); @@ -93,7 +93,7 @@ public class PersistentMapTest { assertTrue( children.isDirty() ); children.clearDirty(); - session.delete( child ); + session.remove( child ); children.clear(); assertTrue( children.isDirty() ); session.flush(); @@ -101,7 +101,7 @@ public class PersistentMapTest { children.clear(); assertFalse( children.isDirty() ); - session.delete( parent ); + session.remove( parent ); } ); } @@ -112,7 +112,7 @@ public class PersistentMapTest { Parent p = new Parent( "p1" ); scope.inTransaction( session -> { - session.save( p ); + session.persist( p ); } ); @@ -129,7 +129,7 @@ public class PersistentMapTest { assertEquals( 2, parent.getChildren().size() ); scope.inTransaction( - session -> session.delete( parent ) + session -> session.remove( parent ) ); } @@ -140,7 +140,7 @@ public class PersistentMapTest { parent.addChild( child ); scope.inTransaction( - session -> session.save( parent ) + session -> session.persist( parent ) ); // Now reload the parent and test removing the child @@ -162,8 +162,8 @@ public class PersistentMapTest { session -> { Parent p = session.get( Parent.class, parent.getName() ); assertTrue( p.getChildren().isEmpty() ); - session.delete( child2 ); - session.delete( p ); + session.remove( child2 ); + session.remove( p ); } ); } @@ -187,7 +187,7 @@ public class PersistentMapTest { List list = q.list(); assertEquals( 1, list.size() ); - session.delete( list.get( 0 ) ); + session.remove( list.get( 0 ) ); } ); } @@ -212,7 +212,7 @@ public class PersistentMapTest { user = session.get( User.class, user.id ); user.userDatas.clear(); - session.update( user ); + session.merge( user ); Query q = session.createQuery( "DELETE FROM " + UserData.class.getName() + " d WHERE d.user = :user" ); q.setParameter( "user", user ); @@ -277,7 +277,7 @@ select localizedString = multilingualString.getMap().get( "English Pig Latin" ); assertEquals( "English Pig Latin", localizedString.getLanguage() ); assertEquals( "amenay", localizedString.getText() ); - session.delete( multilingualString ); + session.remove( multilingualString ); } ); } @@ -320,8 +320,8 @@ select localizedString = m.getMap().get( "English Pig Latin" ); assertEquals( "English Pig Latin", localizedString.getLanguage() ); assertEquals( "amenay", localizedString.getText() ); - session.delete( parent ); - session.delete( m ); + session.remove( parent ); + session.remove( m ); } ); } @@ -352,7 +352,7 @@ select scope.inTransaction( session -> { User u = session.get( User.class, user.id ); - session.delete( u ); + session.remove( u ); session.createQuery( "delete from " + User.class.getName() ).executeUpdate(); } @@ -385,7 +385,7 @@ select scope.inTransaction( session -> { User user = session.get( User.class, userId ); - session.delete( user ); + session.remove( user ); session.createQuery( "delete from " + User.class.getName() ).executeUpdate(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/EntityMapTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/EntityMapTest.java index 91860fd5b0..c6916f275d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/EntityMapTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/map/hhh7557/EntityMapTest.java @@ -41,7 +41,7 @@ public class EntityMapTest { addMapEntry( session, mapHolder, "A", "1" ); addMapEntry( session, mapHolder, "B", "2" ); addMapEntry( session, mapHolder, "C", "3" ); - session.save( mapHolder ); + session.persist( mapHolder ); // Verify there are 3 entries in the map assertEquals( 3, mapHolder.getMap().size() ); } @@ -74,9 +74,9 @@ public class EntityMapTest { private void addMapEntry(Session session, MapHolder mapHolder, String key, String value) { MapValue entityValue = new MapValue( value ); - session.save( entityValue ); + session.persist( entityValue ); MapKey entityKey = new MapKey( key, entityValue ); - session.save( entityKey ); + session.persist( entityKey ); mapHolder.getMap().put( entityKey, entityValue ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java index 0587129d61..97aaa38044 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionTest.java @@ -31,20 +31,26 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; +import jakarta.persistence.LockTimeoutException; import jakarta.persistence.OneToMany; +import jakarta.persistence.OptimisticLockException; import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.collection.spi.AbstractPersistentCollection; import org.hibernate.collection.spi.PersistentCollection; +import org.hibernate.dialect.HSQLDialect; import org.hibernate.engine.spi.CollectionEntry; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.hibernate.testing.orm.junit.SkipForDialect; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; @@ -63,182 +69,6 @@ import static org.junit.jupiter.api.Assertions.fail; @SessionFactory public class MultipleSessionCollectionTest { - @Test - @TestForIssue(jiraKey = "HHH-9518") - public void testSaveOrUpdateOwnerWithCollectionInNewSessionBeforeFlush(SessionFactoryScope scope) { - Parent p = new Parent(); - Child c = new Child(); - p.children.add( c ); - - scope.inTransaction( - s1 -> { - s1.saveOrUpdate( p ); - - // try to save the same entity in a new session before flushing the first session - - scope.inSession( - s2 -> { - try { - s2.getTransaction().begin(); - s2.saveOrUpdate( p ); - s2.getTransaction().commit(); - fail( "should have thrown HibernateException" ); - } - catch (HibernateException ex) { - //expected - s2.getTransaction().rollback(); - } - } - ); - } - ); - - scope.inTransaction( - session -> { - Parent pGet = session.get( Parent.class, p.id ); - assertEquals( c.id, pGet.children.iterator().next().id ); - session.delete( pGet ); - } - ); - - } - - - @Test - @TestForIssue(jiraKey = "HHH-9518") - public void testSaveOrUpdateOwnerWithCollectionInNewSessionAfterFlush(SessionFactoryScope scope) { - Parent p = new Parent(); - Child c = new Child(); - p.children.add( c ); - - scope.inTransaction( - s1 -> { - s1.saveOrUpdate( p ); - s1.flush(); - - // try to save the same entity in a new session after flushing the first session - - scope.inSession( - s2 -> { - s2.getTransaction().begin(); - try { - s2.saveOrUpdate( p ); - s2.getTransaction().commit(); - fail( "should have thrown HibernateException" ); - } - catch (HibernateException ex) { - //expected - } - } - ); - } - ); - - scope.inTransaction( - session -> { - Parent pGet = session.get( Parent.class, p.id ); - assertEquals( c.id, pGet.children.iterator().next().id ); - session.delete( pGet ); - } - ); - } - - @Test - @TestForIssue(jiraKey = "HHH-9518") - public void testSaveOrUpdateOwnerWithUninitializedCollectionInNewSession(SessionFactoryScope scope) { - - Parent parent = new Parent(); - scope.inTransaction( - session -> { - Child c = new Child(); - parent.children.add( c ); - session.persist( parent ); - } - ); - - scope.inTransaction( - s1 -> { - Parent p = s1.get( Parent.class, parent.id ); - assertFalse( Hibernate.isInitialized( p.children ) ); - - // try to save the same entity (with an uninitialized collection) in a new session - - scope.inSession( - s2 -> { - s2.getTransaction().begin(); - try { - s2.saveOrUpdate( p ); - s2.getTransaction().commit(); - fail( "should have thrown HibernateException" ); - } - catch (HibernateException ex) { - //expected - s2.getTransaction().rollback(); - } - } - ); - - // should still be able to initialize collection, modify and commit in first session - assertFalse( Hibernate.isInitialized( p.children ) ); - Hibernate.initialize( p.children ); - p.children.add( new Child() ); - } - ); - - scope.inTransaction( - session -> { - Parent pGet = session.get( Parent.class, parent.id ); - assertEquals( 2, pGet.children.size() ); - session.delete( pGet ); - } - ); - } - - @Test - @TestForIssue(jiraKey = "HHH-9518") - public void testSaveOrUpdateOwnerWithInitializedCollectionInNewSession(SessionFactoryScope scope) { - Parent parent = new Parent(); - Child c = new Child(); - parent.children.add( c ); - - scope.inTransaction( - session -> session.persist( parent ) - ); - - scope.inTransaction( - s1 -> { - Parent p = s1.get( Parent.class, parent.id ); - Hibernate.initialize( p.children ); - - // try to save the same entity (with an initialized collection) in a new session - - scope.inSession( - s2 -> { - s2.getTransaction().begin(); - try { - s2.saveOrUpdate( p ); - s2.getTransaction().commit(); - fail( "should have thrown HibernateException" ); - } - catch (HibernateException ex) { - // expected - s2.getTransaction().rollback(); - } - } - ); - - } - ); - - scope.inTransaction( - session -> { - Parent pGet = session.get( Parent.class, parent.id ); - assertEquals( c.id, pGet.children.iterator().next().id ); - session.delete( pGet ); - } - ); - } - @Test @TestForIssue(jiraKey = "HHH-9518") public void testCopyPersistentCollectionReferenceBeforeFlush(SessionFactoryScope scope) { @@ -259,11 +89,11 @@ public class MultipleSessionCollectionTest { s2 -> { s2.getTransaction().begin(); try { - s2.saveOrUpdate( pWithSameChildren ); + s2.merge( pWithSameChildren ); s2.getTransaction().commit(); fail( "should have thrown HibernateException" ); } - catch (HibernateException ex) { + catch (OptimisticLockException ex) { // expected s2.getTransaction().rollback(); } @@ -277,13 +107,14 @@ public class MultipleSessionCollectionTest { session -> { Parent pGet = session.get( Parent.class, parent.id ); assertEquals( c.id, pGet.children.iterator().next().id ); - session.delete( pGet ); + session.remove( pGet ); } ); } @Test - @TestForIssue(jiraKey = "HHH-9518") + @JiraKey("HHH-9518") + @SkipForDialect(dialectClass = HSQLDialect.class, reason = "The select triggered by the merge just hang without any exception") public void testCopyPersistentCollectionReferenceAfterFlush(SessionFactoryScope scope) { Parent p = new Parent(); Child c = new Child(); @@ -294,7 +125,7 @@ public class MultipleSessionCollectionTest { s1.persist( p ); s1.flush(); - // Copy p.children into a different Parent after flush and try to save in new session. + // Copy p.children into a different Parent after flush and try to merge in new session. Parent pWithSameChildren = new Parent(); pWithSameChildren.children = p.children; @@ -303,11 +134,11 @@ public class MultipleSessionCollectionTest { s2 -> { s2.getTransaction().begin(); try { - s2.saveOrUpdate( pWithSameChildren ); + s2.merge( pWithSameChildren ); s2.getTransaction().commit(); fail( "should have thrown HibernateException" ); } - catch (HibernateException ex) { + catch (OptimisticLockException | LockTimeoutException ex) { // expected s2.getTransaction().rollback(); } @@ -320,7 +151,7 @@ public class MultipleSessionCollectionTest { session -> { Parent pGet = session.get( Parent.class, p.id ); assertEquals( c.id, pGet.children.iterator().next().id ); - session.delete( pGet ); + session.remove( pGet ); } ); } @@ -346,18 +177,10 @@ public class MultipleSessionCollectionTest { Parent pWithSameChildren = new Parent(); pWithSameChildren.children = p.children; - scope.inSession( + scope.inTransaction( s2 -> { - s2.getTransaction().begin(); - try { - s2.saveOrUpdate( pWithSameChildren ); - s2.getTransaction().commit(); - fail( "should have thrown HibernateException" ); - } - catch (HibernateException ex) { - // expected - s2.getTransaction().rollback(); - } + Parent merged = s2.merge( pWithSameChildren ); + assertThat( merged.children ).isNotSameAs( p.children ); } ); } @@ -367,7 +190,7 @@ public class MultipleSessionCollectionTest { session -> { Parent pGet = session.get( Parent.class, parent.id ); assertEquals( c.id, pGet.children.iterator().next().id ); - session.delete( pGet ); + session.remove( pGet ); } ); } @@ -383,39 +206,35 @@ public class MultipleSessionCollectionTest { session -> session.persist( parent ) ); - scope.inTransaction( + Parent pMerged = scope.fromTransaction( s1 -> { Parent p = s1.get( Parent.class, parent.id ); Hibernate.initialize( p.children ); // Copy p.children (initialized) into a different Parent.children and try to save in new session. - Parent pWithSameChildren = new Parent(); + pWithSameChildren.children = p.children; - scope.inSession( + return scope.fromTransaction( s2 -> { - s2.getTransaction().begin(); - try { - s2.saveOrUpdate( pWithSameChildren ); - s2.getTransaction().commit(); - fail( "should have thrown HibernateException" ); - } - catch (HibernateException ex) { - // expected - s2.getTransaction().rollback(); - } + Parent merged = s2.merge( pWithSameChildren ); + assertThat( merged.children ).isNotSameAs( p.children ); + assertThat( merged.children ).isNotSameAs( pWithSameChildren.children ); + return merged; } ); - } ); scope.inTransaction( session -> { Parent pGet = session.get( Parent.class, parent.id ); + assertThat( pGet.children.size() ).isEqualTo( 0 ); + + pGet = session.get( Parent.class, pMerged.id ); assertEquals( c.id, pGet.children.iterator().next().id ); - session.delete( pGet ); + session.remove( pGet ); } ); } @@ -431,7 +250,7 @@ public class MultipleSessionCollectionTest { session -> session.persist( parent ) ); - scope.inTransaction( + Parent mParent = scope.fromTransaction( s1 -> { Parent p = s1.get( Parent.class, parent.id ); Hibernate.initialize( p.children ); @@ -442,18 +261,14 @@ public class MultipleSessionCollectionTest { Parent pWithSameChildren = new Parent(); pWithSameChildren.oldChildren = p.children; - scope.inSession( + return scope.fromTransaction( s2 -> { - s2.getTransaction().begin(); - try { - s2.saveOrUpdate( pWithSameChildren ); - s2.getTransaction().commit(); - fail( "should have thrown HibernateException" ); - } - catch (HibernateException ex) { - // expected - s2.getTransaction().rollback(); - } + Parent merged = s2.merge( pWithSameChildren ); + assertThat( merged.oldChildren ).isNotSameAs( p.children ); + assertThat( merged.oldChildren ).isNotSameAs( pWithSameChildren.children ); + assertThat( merged.oldChildren ).isNotSameAs( p.oldChildren ); + assertThat( merged.oldChildren ).isNotSameAs( pWithSameChildren.oldChildren ); + return merged; } ); @@ -464,7 +279,12 @@ public class MultipleSessionCollectionTest { session -> { Parent pGet = session.get( Parent.class, parent.id ); assertEquals( c.id, pGet.children.iterator().next().id ); - session.delete( pGet ); + + Parent pGet1 = session.get( Parent.class, mParent.id ); + assertEquals( c.id, pGet1.oldChildren.iterator().next().id ); + + session.remove( pGet ); + session.remove( pGet1 ); } ); } @@ -478,15 +298,15 @@ public class MultipleSessionCollectionTest { scope.inTransaction( session -> { - session.save( p1 ); - session.save( p2 ); + session.persist( p1 ); + session.persist( p2 ); } ); scope.inSession( s1 -> { s1.getTransaction().begin(); - s1.delete( p1 ); + s1.remove( p1 ); s1.flush(); s1.getTransaction().commit(); @@ -508,7 +328,7 @@ public class MultipleSessionCollectionTest { p2.nickNames = p1.nickNames; scope.inTransaction( - s2 -> s2.saveOrUpdate( p2 ) + s2 -> s2.merge( p2 ) ); } ); @@ -523,15 +343,15 @@ public class MultipleSessionCollectionTest { scope.inTransaction( session -> { - session.save( p1 ); - session.save( p2 ); + session.persist( p1 ); + session.persist( p2 ); } ); scope.inSession( s1 -> { s1.getTransaction().begin(); - s1.delete( p1 ); + s1.remove( p1 ); s1.flush(); s1.getTransaction().commit(); @@ -554,7 +374,7 @@ public class MultipleSessionCollectionTest { p2.oldNickNames = p1.nickNames; scope.inTransaction( - s2 -> s2.saveOrUpdate( p2 ) + s2 -> s2.merge( p2 ) ); } ); @@ -569,31 +389,24 @@ public class MultipleSessionCollectionTest { scope.inTransaction( session -> { - session.save( p1 ); - session.save( p2 ); + session.persist( p1 ); + session.persist( p2 ); } ); scope.inTransaction( s1 -> { - s1.delete( p1 ); + s1.remove( p1 ); // Assign the deleted collection to a different entity with same collection role (p2.nickNames) // before committing delete. p2.nickNames = p1.nickNames; - scope.inSession( + scope.inTransaction( s2 -> { - s2.getTransaction().begin(); - try { - s2.saveOrUpdate( p2 ); - fail( "should have thrown HibernateException" ); - } - catch (HibernateException ex) { - // expected - s2.getTransaction().rollback(); - } + Parent merged = s2.merge( p2 ); + assertThat( merged.nickNames ).isNotSameAs( p2.nickNames ); } ); } @@ -611,30 +424,23 @@ public class MultipleSessionCollectionTest { scope.inTransaction( session -> { - session.save( p1 ); - session.save( p2 ); + session.persist( p1 ); + session.persist( p2 ); } ); scope.inTransaction( s1 -> { - s1.delete( p1 ); + s1.remove( p1 ); // Assign the deleted collection to a different entity with different collection role (p2.oldNickNames) // before committing delete. p2.oldNickNames = p1.nickNames; - scope.inSession( + scope.inTransaction( s2 -> { - s2.getTransaction().begin(); - try { - s2.saveOrUpdate( p2 ); - fail( "should have thrown HibernateException" ); - } - catch (HibernateException ex) { - // expected - s2.getTransaction().rollback(); - } + Parent merged = s2.merge( p2 ); + assertThat( merged.oldNickNames ).isNotSameAs( p2.oldNickNames ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java index 400428f679..106be4fa7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/multisession/MultipleSessionCollectionWarningTest.java @@ -33,6 +33,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; +import org.hibernate.LockMode; import org.hibernate.collection.spi.AbstractPersistentCollection; import org.hibernate.collection.spi.PersistentSet; import org.hibernate.collection.spi.PersistentCollection; @@ -81,140 +82,19 @@ import static org.junit.jupiter.api.Assertions.assertTrue; public class MultipleSessionCollectionWarningTest { private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractPersistentCollection.class ); - @Test - @TestForIssue(jiraKey = "HHH-9518") - public void testSetCurrentSessionOverwritesNonConnectedSession( - SessionFactoryScope scope, - LoggingInspectionsScope loggingScope) { - Parent p = new Parent(); - Child c = new Child(); - p.children.add( c ); - - scope.inSession( - s1 -> { - s1.getTransaction().begin(); - try { - s1.saveOrUpdate( p ); - - // Now remove the collection from the PersistenceContext without unsetting its session - // This should never be done in practice; it is done here only to test that the warning - // gets logged. s1 will not function properly so the transaction will ultimately need - // to be rolled-back. - - CollectionEntry ce = s1.getPersistenceContext() - .removeCollectionEntry( (PersistentSet) p.children ); - assertNotNull( ce ); - - // the collection session should still be s1; the collection is no longer "connected" because its - // CollectionEntry has been removed. - assertSame( s1, ( (AbstractPersistentCollection) p.children ).getSession() ); - - scope.inSession( - s2 -> { - s2.getTransaction().begin(); - try { - final MessageKeyWatcher watcher = loggingScope.getWatcher( "HHH000470", AbstractPersistentCollection.class ); - assertFalse( watcher.wasTriggered() ); - - // The following should trigger warning because we're setting a new session when the collection already - // has a non-null session (and the collection is not "connected" to that session); - // Since s1 was not flushed, the collection role will not be known (no way to test that other than inspection). - s2.saveOrUpdate( p ); - - assertTrue( watcher.wasTriggered() ); - - // collection's session should be overwritten with s2 - assertSame( s2, ( (AbstractPersistentCollection) p.children ).getSession() ); - } - finally { - s2.getTransaction().rollback(); - } - } - ); - } - finally { - s1.getTransaction().rollback(); - } - } - ); - } - - @Test - @TestForIssue(jiraKey = "HHH-9518") - public void testSetCurrentSessionOverwritesNonConnectedSessionFlushed( - SessionFactoryScope scope, - LoggingInspectionsScope loggingScope) { - Parent p = new Parent(); - Child c = new Child(); - p.children.add( c ); - - scope.inSession( - s1 -> { - s1.getTransaction().begin(); - try { - s1.saveOrUpdate( p ); - - // flush the session so that p.children will contain its role - s1.flush(); - - // Now remove the collection from the PersistenceContext without unsetting its session - // This should never be done in practice; it is done here only to test that the warning - // gets logged. s1 will not function properly so the transaction will ultimately need - // to be rolled-back. - - CollectionEntry ce = s1.getPersistenceContext() - .removeCollectionEntry( (PersistentSet) p.children ); - assertNotNull( ce ); - - // the collection session should still be s1; the collection is no longer "connected" because its - // CollectionEntry has been removed. - assertSame( s1, ( (AbstractPersistentCollection) p.children ).getSession() ); - - scope.inSession( - s2 -> { - s2.getTransaction().begin(); - try { - final MessageKeyWatcher watcher = loggingScope.getWatcher( "HHH000470", AbstractPersistentCollection.class ); - assertFalse( watcher.wasTriggered() ); - - // The following should trigger warning because we're setting a new session when the collection already - // has a non-null session (and the collection is not "connected" to that session); - // The collection role and key should be included in the message (no way to test that other than inspection). - s2.saveOrUpdate( p ); - - assertTrue( watcher.wasTriggered() ); - - // collection's session should be overwritten with s2 - assertSame( s2, ( (AbstractPersistentCollection) p.children ).getSession() ); - } - finally { - s2.getTransaction().rollback(); - } - } - ); - } - finally { - s1.getTransaction().rollback(); - } - } - - ); - } - @Test @TestForIssue(jiraKey = "HHH-9518") public void testUnsetSessionCannotOverwriteNonConnectedSession( SessionFactoryScope scope, LoggingInspectionsScope loggingScope) { - Parent p = new Parent(); - Child c = new Child(); - p.children.add( c ); - scope.inSession( s1 -> { s1.getTransaction().begin(); try { - s1.saveOrUpdate( p ); + Parent p = new Parent(); + Child c = new Child(); + p.children.add( c ); + s1.persist( p ); // Now remove the collection from the PersistenceContext without unsetting its session // This should never be done in practice; it is done here only to test that the warning @@ -266,15 +146,15 @@ public class MultipleSessionCollectionWarningTest { public void testUnsetSessionCannotOverwriteConnectedSession( SessionFactoryScope scope, LoggingInspectionsScope loggingScope) { - Parent p = new Parent(); - Child c = new Child(); - p.children.add( c ); - scope.inSession( s1 -> { s1.getTransaction().begin(); try { - s1.saveOrUpdate( p ); + Parent p = new Parent(); + Child c = new Child(); + p.children.add( c ); + + s1.persist( p ); // The collection is "connected" to s1 because it contains the CollectionEntry CollectionEntry ce = s1.getPersistenceContext() @@ -319,15 +199,14 @@ public class MultipleSessionCollectionWarningTest { public void testUnsetSessionCannotOverwriteConnectedSessionFlushed( SessionFactoryScope scope, LoggingInspectionsScope loggingScope) { - Parent p = new Parent(); - Child c = new Child(); - p.children.add( c ); - scope.inSession( s1 -> { s1.getTransaction().begin(); try { - s1.saveOrUpdate( p ); + Parent p = new Parent(); + Child c = new Child(); + p.children.add( c ); + s1.persist( p ); // flush the session so that p.children will contain its role s1.flush(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java index cc2a231e8b..be6698ed32 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/original/CollectionTest.java @@ -78,7 +78,7 @@ public class CollectionTest { assertFalse( Hibernate.isInitialized( u.getSessionAttributeNames() ) ); assertTrue( Hibernate.isInitialized( u.getSessionData() ) ); - s.delete( u ); + s.remove( u ); } ); } @@ -121,7 +121,7 @@ public class CollectionTest { scope.inTransaction( s -> { User u2 = findUser( s ); - s.delete( u2 ); + s.remove( u2 ); s.flush(); } ); @@ -151,7 +151,7 @@ public class CollectionTest { assertTrue( Hibernate.isInitialized( u2.getEmailAddresses() ) ); assertFalse( Hibernate.isInitialized( u2.getPermissions() ) ); assertEquals( 2, u2.getEmailAddresses().size() ); - s.delete( u2 ); + s.remove( u2 ); } ); } @@ -178,20 +178,20 @@ public class CollectionTest { u.getEmailAddresses().remove( 0 ); u.getEmailAddresses().remove( 2 ); - scope.inTransaction( - s -> s.update( u ) + User merged = scope.fromTransaction( + s -> s.merge( u ) ); - u.getSessionData().clear(); - u.getEmailAddresses().add( 0, new Email( "gavin@nospam.com" ) ); - u.getEmailAddresses().add( new Email( "gavin.king@jboss.com" ) ); + merged.getSessionData().clear(); + merged.getEmailAddresses().add( 0, new Email( "gavin@nospam.com" ) ); + merged.getEmailAddresses().add( new Email( "gavin.king@jboss.com" ) ); scope.inTransaction( - s -> s.update( u ) + s -> s.merge( merged ) ); scope.inTransaction( - s -> s.delete( u ) + s -> s.remove( merged ) ); } @@ -233,7 +233,7 @@ public class CollectionTest { assertEquals( 2, u2.getEmailAddresses().size() ); assertEquals( "new foo value", u2.getSessionData().get( "foo" ) ); assertEquals( "gavin@hibernate.org", ( (Email) u2.getEmailAddresses().get( 1 ) ).getAddress() ); - s.delete( u2 ); + s.remove( u2 ); } ); } @@ -257,7 +257,7 @@ public class CollectionTest { m.setMammalName3( "name3" ); m.setZoo( zoo ); zoo.getAnimals().add( m ); - s.save( zoo ); + s.persist( zoo ); } ); @@ -265,7 +265,7 @@ public class CollectionTest { s -> { Zoo found = s.get( Zoo.class, zoo.getId() ); found.getAnimals().size(); - s.delete( found ); + s.remove( found ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java index b2578a8722..d78f13593e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/PropertyRefTest.java @@ -51,7 +51,7 @@ public class PropertyRefTest { session -> { user.addMail( "test" ); user.addMail( "test" ); - session.save( user ); + session.persist( user ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java index 17b35228d8..d2d0d18106 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/ReferencedColumnNameTest.java @@ -63,7 +63,7 @@ public class ReferencedColumnNameTest { session -> { user.addMail( "test" ); user.addMail( "test" ); - session.save( user ); + session.persist( user ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java index a48e970c47..812edc72d1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/propertyref/lazy/PropertyRefTest.java @@ -51,7 +51,7 @@ public class PropertyRefTest { session -> { user.addMail( "test" ); user.addMail( "test" ); - session.save( user ); + session.persist( user ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java index d45cb8e956..7f6b3b22f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/PersistentSetTest.java @@ -59,7 +59,7 @@ public class PersistentSetTest { scope.inTransaction( session -> { - session.save( parent ); + session.persist( parent ); session.flush(); // at this point, the set on parent has now been replaced with a PersistentSet... PersistentSet children = (PersistentSet) parent.getChildren(); @@ -88,7 +88,7 @@ public class PersistentSetTest { assertTrue( children.isEmpty() ); children.clear(); - session.delete( child ); + session.remove( child ); assertTrue( children.isDirty() ); session.flush(); @@ -96,7 +96,7 @@ public class PersistentSetTest { children.clear(); assertFalse( children.isDirty() ); - session.delete( parent ); + session.remove( parent ); } ); } @@ -109,7 +109,7 @@ public class PersistentSetTest { Child child = new Child( "c1" ); p.getChildren().add( child ); child.setParent( p ); - session.save( p ); + session.persist( p ); } ); @@ -132,7 +132,7 @@ public class PersistentSetTest { session -> { Parent parent = session.get( Parent.class, "p1" ); assertEquals( 1, parent.getChildren().size() ); - session.delete( parent ); + session.remove( parent ); } ); } @@ -145,7 +145,7 @@ public class PersistentSetTest { Child child = new Child( "c1" ); parent.getChildren().add( child ); child.setParent( parent ); - session.save( parent ); + session.persist( parent ); } ); @@ -171,7 +171,7 @@ public class PersistentSetTest { scope.inTransaction( session -> { assertEquals( 1, parent.getChildren().size() ); - session.delete( parent ); + session.remove( parent ); } ); } @@ -185,7 +185,7 @@ public class PersistentSetTest { scope.inTransaction( session -> { - session.save( container ); + session.persist( container ); session.flush(); // at this point, the set on container has now been replaced with a PersistentSet... PersistentSet children = (PersistentSet) container.getContents(); @@ -221,7 +221,7 @@ public class PersistentSetTest { children.clear(); assertFalse( children.isDirty() ); - session.delete( container ); + session.remove( container ); } ); } @@ -234,7 +234,7 @@ public class PersistentSetTest { session -> { Container.Content c1 = new Container.Content( "c1" ); container.getContents().add( c1 ); - session.save( container ); + session.persist( container ); } ); @@ -260,7 +260,7 @@ public class PersistentSetTest { session -> { Container c = session.get( Container.class, container.getId() ); assertEquals( 1, container.getContents().size() ); - session.delete( container ); + session.remove( container ); } ); @@ -274,7 +274,7 @@ public class PersistentSetTest { session -> { Container.Content c1 = new Container.Content( "c1" ); c.getContents().add( c1 ); - session.save( c ); + session.persist( c ); } ); @@ -299,7 +299,7 @@ public class PersistentSetTest { session -> { Container c1 = session.get( Container.class, c.getId() ); assertEquals( 1, c1.getContents().size() ); - session.delete( c1 ); + session.remove( c1 ); } ); } @@ -317,7 +317,7 @@ public class PersistentSetTest { otherChild.setParent( p1 ); scope.inTransaction( - session -> session.save( p1 ) + session -> session.persist( p1 ) ); scope.inTransaction( @@ -372,7 +372,7 @@ public class PersistentSetTest { .uniqueResult(); assertTrue( child.getParent().getChildren().contains( child ) ); - session.delete( child.getParent() ); + session.remove( child.getParent() ); } ); } @@ -388,7 +388,7 @@ public class PersistentSetTest { otherChild.setParent( p ); scope.inTransaction( - session -> session.save( p ) + session -> session.persist( p ) ); scope.inTransaction( @@ -424,7 +424,7 @@ public class PersistentSetTest { child = (Child) session.createQuery( "from Child where name = 'c1'" ).uniqueResult(); assertTrue( child.getParent().getChildren().contains( child ) ); - session.delete( child.getParent() ); + session.remove( child.getParent() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java index 0d6474113c..8abf04c081 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collection/set/SetElementNullBasicTest.java @@ -53,7 +53,7 @@ public class SetElementNullBasicTest extends BaseCoreFunctionalTestCase { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -82,7 +82,7 @@ public class SetElementNullBasicTest extends BaseCoreFunctionalTestCase { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId ).size() ); - session.delete( e ); + session.remove( e ); } ); } @@ -113,7 +113,7 @@ public class SetElementNullBasicTest extends BaseCoreFunctionalTestCase { AnEntity e = session.get( AnEntity.class, entityId ); assertEquals( 0, e.aCollection.size() ); assertEquals( 0, getCollectionElementRows( entityId ).size() ); - session.delete( e ); + session.remove( e ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java index 140762f6ef..68272ea463 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/CollectionAliasTest.java @@ -42,7 +42,7 @@ public class CollectionAliasTest { ); aTable.getTablebs().add( tableB ); tableB.setTablea( aTable ); - session.save( aTable ); + session.persist( aTable ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java index 18d50d13a7..5449c4bb67 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/collectionalias/ReorderedMappingsCollectionAliasTest.java @@ -45,7 +45,7 @@ public class ReorderedMappingsCollectionAliasTest { ); aTable.getTablebs().add( tableB ); tableB.setTablea( aTable ); - session.save( aTable ); + session.persist( aTable ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java index ab79a0e965..8cdf313ea5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/columntransformer/ColumnTransformerTest.java @@ -49,17 +49,17 @@ public class ColumnTransformerTest { new Staff( 1, 2, 3, 4 ) ); - session.save( + session.persist( new Staff( 5, 6, 7, 8 ) ); final Staff staffWithElements = new Staff( 12 ); staffWithElements.setIntegers( asList( 1, 2, 3, 4 ) ); - session.save( staffWithElements ); + session.persist( staffWithElements ); final Staff staffWithElements2 = new Staff( 16 ); staffWithElements2.setIntegers2( asList( 5, 6, 7, 8 ) ); - session.save( staffWithElements2 ); + session.persist( staffWithElements2 ); } ); } @@ -70,7 +70,7 @@ public class ColumnTransformerTest { scope.inTransaction( session -> { final List list = session.createQuery( "from Staff", Staff.class ).list(); - list.forEach( session::delete ); + list.forEach( session::remove ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java index 9489173cc0..4a2e604c40 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/AttributeOverridingTest.java @@ -42,7 +42,7 @@ public class AttributeOverridingTest { book.setEbookPublisher( ebookPublisher ); book.setPaperBackPublisher( paperPublisher ); - session.save( book ); + session.persist( book ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentArrayTest.java index 169ba73d37..1ddce23442 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentArrayTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentArrayTest.java @@ -46,7 +46,7 @@ public class StructComponentArrayTest { book.publishers = new Publisher[] { ebookPublisher, paperPublisher }; book.labels = List.of( new Label( "kind", "Technical" ), new Label( "level", "Beginner" ) ); - session.save( book ); + session.persist( book ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToAnyTest.java index d13c2f5645..d431896b30 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToAnyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToAnyTest.java @@ -50,14 +50,14 @@ public class StructComponentManyToAnyTest { book1.title = "Hibernate 3"; book1.author = new Author( "Gavin", null ); - session.save( book1 ); + session.persist( book1 ); Book book2 = new Book(); book2.id = 2L; book2.title = "Hibernate 6"; book2.author = new Author( "Steve", book1 ); - session.save( book2 ); + session.persist( book2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyMappedByTest.java index da4e3f3118..91b86de8a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyMappedByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyMappedByTest.java @@ -50,7 +50,7 @@ public class StructComponentManyToManyMappedByTest { book1.title = "Main book"; book1.author = new Author( "Abc" ); - session.save( book1 ); + session.persist( book1 ); Book book2 = new Book(); book2.id = 2L; @@ -58,7 +58,7 @@ public class StructComponentManyToManyMappedByTest { book2.booksInSeries = Set.of( book1 ); book2.author = new Author( "Abc" ); - session.save( book2 ); + session.persist( book2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyTest.java index 0a23dada1f..8a50c691b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToManyTest.java @@ -47,14 +47,14 @@ public class StructComponentManyToManyTest { book1.title = "Main book"; book1.author = new Author( "Abc", null ); - session.save( book1 ); + session.persist( book1 ); Book book2 = new Book(); book2.id = 2L; book2.title = "Second book"; book2.author = new Author( "Abc", book1 ); - session.save( book2 ); + session.persist( book2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToOneTest.java index c267d31fde..91fb466fa1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentManyToOneTest.java @@ -46,14 +46,14 @@ public class StructComponentManyToOneTest { book1.title = "Hibernate 3"; book1.author = new Author( "Gavin", null ); - session.save( book1 ); + session.persist( book1 ); Book book2 = new Book(); book2.id = 2L; book2.title = "Hibernate 6"; book2.author = new Author( "Steve", book1 ); - session.save( book2 ); + session.persist( book2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyMappedByTest.java index 782d43d8a1..4168d337d6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyMappedByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyMappedByTest.java @@ -50,7 +50,7 @@ public class StructComponentOneToManyMappedByTest { book1.title = "Main book"; book1.author = new Author( "Abc" ); - session.save( book1 ); + session.persist( book1 ); Book book2 = new Book(); book2.id = 2L; @@ -58,7 +58,7 @@ public class StructComponentOneToManyMappedByTest { book2.mainBook = book1; book2.author = new Author( "Abc" ); - session.save( book2 ); + session.persist( book2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyTest.java index 3255736d9b..d49f192635 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToManyTest.java @@ -48,14 +48,14 @@ public class StructComponentOneToManyTest { book1.title = "Hibernate 3"; book1.author = new Author( "Gavin", null ); - session.save( book1 ); + session.persist( book1 ); Book book2 = new Book(); book2.id = 2L; book2.title = "Hibernate 6"; book2.author = new Author( "Steve", book1 ); - session.save( book2 ); + session.persist( book2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneMappedByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneMappedByTest.java index ae0c3ef8b0..c32a0dd5d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneMappedByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneMappedByTest.java @@ -48,8 +48,8 @@ public class StructComponentOneToOneMappedByTest { book.title = "Hibernate 6"; book.author = new Author( "Steve", bookDetails ); - session.save( book ); - session.save( bookDetails ); + session.persist( book ); + session.persist( bookDetails ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneTest.java index 816bfbcf42..e5d8698b41 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentOneToOneTest.java @@ -48,14 +48,14 @@ public class StructComponentOneToOneTest { book1.title = "Hibernate 3"; book1.author = new Author( "Gavin", null ); - session.save( book1 ); + session.persist( book1 ); Book book2 = new Book(); book2.id = 2L; book2.title = "Hibernate 6"; book2.author = new Author( "Steve", book1 ); - session.save( book2 ); + session.persist( book2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentTest.java index 31ef13a3e2..70020e6a78 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/StructComponentTest.java @@ -43,7 +43,7 @@ public class StructComponentTest { book.ebookPublisher = ebookPublisher; book.paperBackPublisher = paperPublisher; - session.save( book ); + session.persist( book ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java index 161060b39a..eaf822864d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic/ComponentTest.java @@ -88,7 +88,7 @@ public class ComponentTest extends BaseSessionFactoryFunctionalTest { s -> { User u = s.get(User.class, "gavin"); assertEquals( u.getPerson().getName(), "Gavin King" ); - s.delete(u); + s.remove(u); } ); @@ -123,7 +123,7 @@ public class ComponentTest extends BaseSessionFactoryFunctionalTest { assertEquals( u.getPerson().getAddress(), "Phipps Place" ); assertEquals( u.getPerson().getPreviousAddress(), "Karbarook Ave" ); assertEquals( u.getPassword(), "$ecret" ); - s.delete(u); + s.remove(u); } ); } @@ -144,7 +144,7 @@ public class ComponentTest extends BaseSessionFactoryFunctionalTest { u.getPerson().setAddress( "Cedar Park" ); s.flush(); assertEquals( intialUpdateCount + 1, sessionFactory().getStatistics().getEntityUpdateCount() ); - s.delete( u ); + s.remove( u ); } ); } @@ -158,13 +158,13 @@ public class ComponentTest extends BaseSessionFactoryFunctionalTest { emp.setPerson( new Person() ); emp.getPerson().setName( "steve" ); emp.getPerson().setDob( new Date() ); - s.save( emp ); + s.persist( emp ); s.createQuery( "from Employee e where e.person = :p and 1 = 1 and 2=2" ).setParameter( "p", emp.getPerson() ).list(); s.createQuery( "from Employee e where :p = e.person" ).setParameter( "p", emp.getPerson() ).list(); s.createQuery( "from Employee e where e.person = ('', '', current_timestamp, 0.0, 'steve', '', 0)" ).list(); - s.delete( emp ); + s.remove( emp ); } ); } @@ -184,9 +184,9 @@ public class ComponentTest extends BaseSessionFactoryFunctionalTest { emp.setPerson( new Person() ); emp.getPerson().setName( "steve" ); emp.getPerson().setDob( new Date() ); - s.save( emp ); + s.persist( emp ); s.createQuery( "from Employee e where e.person = (current_timestamp, 'steve')" ).list(); - s.delete( emp ); + s.remove( emp ); } ); } @@ -264,7 +264,7 @@ public class ComponentTest extends BaseSessionFactoryFunctionalTest { ( (Number)s.createNativeQuery("select height_centimeters from T_USER where T_USER.userName='steve'").uniqueResult() ) .doubleValue(); assertEquals(2.54d, heightViaSql, 0.01d); - s.delete(u); + s.remove(u); } ); } @@ -390,7 +390,7 @@ public class ComponentTest extends BaseSessionFactoryFunctionalTest { assertNull(dr.getOptionalComponent()); inTransaction( - s -> s.delete( emp6 ) + s -> s.remove( emp6 ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java index 3d957be78b..6ee339c91f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/basic2/ComponentJoinsTest.java @@ -61,7 +61,7 @@ public class ComponentJoinsTest extends BaseCoreFunctionalTestCase { public void dummy() { Session session = openSession(); session.beginTransaction(); - session.save( new Person( 1, "Steve", "Ebersone" ) ); + session.persist( new Person( 1, "Steve", "Ebersone" ) ); session.getTransaction().commit(); session.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/SelectBeforeUpdateEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/SelectBeforeUpdateEmbeddedTest.java index c5e855c058..ec1679b042 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/SelectBeforeUpdateEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/component/empty/SelectBeforeUpdateEmbeddedTest.java @@ -61,10 +61,10 @@ public class SelectBeforeUpdateEmbeddedTest extends BaseCoreFunctionalTestCase { private void testSelectBeforeUpdate() { TransactionUtil.doInHibernate( this::sessionFactory, session -> { final Person john = new Person( 1, "John", new Address() ); - session.save( john ); + session.persist( john ); final Person mary = new Person( 2, "Mary", null ); - session.save( mary ); + session.persist( mary ); } ); TransactionUtil.doInHibernate( this::sessionFactory, session -> { @@ -92,13 +92,13 @@ public class SelectBeforeUpdateEmbeddedTest extends BaseCoreFunctionalTestCase { TransactionUtil.doInHibernate( this::sessionFactory, session -> { i.reset(); john.setAddress( null ); - session.update( john ); + session.merge( john ); session.flush(); assertEquals( 0, i.getCalls() ); i.reset(); mary.setAddress( new Address() ); - session.update( mary ); + session.merge( mary ); session.flush(); assertEquals( 0, i.getCalls() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java index ce7ca98a9a..2e2b8b5c14 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositeelement/CompositeElementTest.java @@ -59,7 +59,7 @@ public class CompositeElementTest extends BaseNonConfigCoreFunctionalTestCase { Parent p = new Parent( "Parent" ); p.getChildren().add( c ); c.setParent( p ); - s.save( p ); + s.persist( p ); s.flush(); p.getChildren().remove( c ); @@ -86,7 +86,7 @@ public class CompositeElementTest extends BaseNonConfigCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.delete( p ); + s.remove( p ); t.commit(); s.close(); } @@ -99,7 +99,7 @@ public class CompositeElementTest extends BaseNonConfigCoreFunctionalTestCase { Parent p = new Parent( "Parent" ); p.getChildren().add( c ); c.setParent( p ); - s.save( p ); + s.persist( p ); s.flush(); // Oracle returns BigDecimaal while other dialects return Integer; @@ -136,7 +136,7 @@ public class CompositeElementTest extends BaseNonConfigCoreFunctionalTestCase { "select child_position from ParentChild c where c.name='Child One'" ) .uniqueResult() ); assertEquals( 1, sqlValue.intValue() ); - s.delete( p ); + s.remove( p ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java index 2f971e1ed6..fc93a64dc3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/EagerManyToOneEmbeddedIdFKTest.java @@ -49,8 +49,8 @@ public class EagerManyToOneEmbeddedIdFKTest { System system = new System( 1, "sub1" ); system.setUser( user ); - session.save( user ); - session.save( system ); + session.persist( user ); + session.persist( system ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java index bb1412d904..e9cf0260c3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/LazyManyToOneEmbeddedIdWithToOneFKTest.java @@ -56,9 +56,9 @@ public class LazyManyToOneEmbeddedIdWithToOneFKTest { System system = new System( 1, "sub1" ); system.setUser( user ); - session.save( subsystem ); - session.save( user ); - session.save( system ); + session.persist( subsystem ); + session.persist( user ); + session.persist( system ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java index 218c14caaf..e6e0fa9844 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithLazyToOneFKTest.java @@ -56,9 +56,9 @@ public class ManyToOneEmbeddedIdWithLazyToOneFKTest { System system = new System( 1, "sub1" ); system.setUser( user ); - session.save( subsystem ); - session.save( user ); - session.save( system ); + session.persist( subsystem ); + session.persist( user ); + session.persist( system ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java index bf0fc87957..b1b664cbb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/ManyToOneEmbeddedIdWithToOneFKTest.java @@ -197,9 +197,9 @@ public class ManyToOneEmbeddedIdWithToOneFKTest { System system = new System( 1, "QA" ); system.setDataCenterUser( user ); - session.save( dataCenter ); - session.save( user ); - session.save( system ); + session.persist( dataCenter ); + session.persist( user ); + session.persist( system ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java index 45620ae136..91223a0da3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/compositefk/OneToManyEmbeddedIdFKTest.java @@ -56,9 +56,9 @@ public class OneToManyEmbeddedIdFKTest { system.addUser( superUser ); system.addUser( user ); - session.save( superUser ); - session.save( user ); - session.save( system ); + session.persist( superUser ); + session.persist( user ); + session.persist( system ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/AggressiveReleaseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/AggressiveReleaseTest.java index 1a91c1fe20..b0bb9736dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/AggressiveReleaseTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/AggressiveReleaseTest.java @@ -79,7 +79,7 @@ public class AggressiveReleaseTest extends ConnectionManagementTestCase { try { Session s = getSessionUnderTest(); Silly silly = new Silly( "silly" ); - s.save( silly ); + s.persist( silly ); // this should cause the CM to obtain a connection, and then release it s.flush(); @@ -87,7 +87,7 @@ public class AggressiveReleaseTest extends ConnectionManagementTestCase { // We should be able to serialize the session at this point... SerializationHelper.serialize( s ); - s.delete( silly ); + s.remove( silly ); s.flush(); release( s ); @@ -103,7 +103,7 @@ public class AggressiveReleaseTest extends ConnectionManagementTestCase { Session s = getSessionUnderTest(); Silly silly = new Silly( "silly" ); - s.save( silly ); + s.persist( silly ); // this should cause the CM to obtain a connection, and then release it s.flush(); @@ -131,7 +131,7 @@ public class AggressiveReleaseTest extends ConnectionManagementTestCase { } SerializationHelper.serialize( s ); - s.delete( silly ); + s.remove( silly ); s.flush(); release( s ); @@ -143,7 +143,7 @@ public class AggressiveReleaseTest extends ConnectionManagementTestCase { prepare(); Session s = getSessionUnderTest(); Silly silly = new Silly( "silly" ); - s.save( silly ); + s.persist( silly ); s.flush(); try (ScrollableResults sr = s.createQuery( "from Silly" ).scroll()) { @@ -160,7 +160,7 @@ public class AggressiveReleaseTest extends ConnectionManagementTestCase { assertEquals( silly, sr2.get() ); } - s.delete( silly ); + s.remove( silly ); s.flush(); release( s ); @@ -175,14 +175,14 @@ public class AggressiveReleaseTest extends ConnectionManagementTestCase { Session session = sessionFactory().withOptions().connection( originalConnection ).openSession(); Silly silly = new Silly( "silly" ); - session.save( silly ); + session.persist( silly ); // this will cause the connection manager to cycle through the aggressive release logic; // it should not release the connection since we explicitly suplied it ourselves. session.flush(); assertTrue( session.isConnected() ); - session.delete( silly ); + session.remove( silly ); session.flush(); release( session ); @@ -202,7 +202,7 @@ public class AggressiveReleaseTest extends ConnectionManagementTestCase { Other other = new Other( "other-" + i ); Silly silly = new Silly( "silly-" + i, other ); entities.add( silly ); - s.save( silly ); + s.persist( silly ); } s.flush(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionManagementTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionManagementTestCase.java index 3ec70425fa..33281c55b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionManagementTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/connections/ConnectionManagementTestCase.java @@ -247,7 +247,7 @@ public abstract class ConnectionManagementTestCase extends BaseNonConfigCoreFunc Session sessionUnderTest = getSessionUnderTest(); Silly silly = new Silly( "tester" ); - sessionUnderTest.save( silly ); + sessionUnderTest.persist( silly ); sessionUnderTest.flush(); try (ScrollableResults sr = sessionUnderTest.createQuery( "from Silly" ).scroll()) { @@ -257,7 +257,7 @@ public abstract class ConnectionManagementTestCase extends BaseNonConfigCoreFunc checkSerializedState( sessionUnderTest ); reconnect( sessionUnderTest ); - sessionUnderTest.delete( silly ); + sessionUnderTest.remove( silly ); sessionUnderTest.flush(); release( sessionUnderTest ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/CompositePropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/CompositePropertyRefTest.java index 3ff166e3cc..f5a2244fe2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/CompositePropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cuk/CompositePropertyRefTest.java @@ -53,17 +53,17 @@ public class CompositePropertyRefTest { a.setCountry( "USA" ); p.setAddress( a ); a.setPerson( p ); - session.save( p ); + session.persist( p ); Person p2 = new Person(); p2.setName( "Max" ); p2.setUserId( "max" ); - session.save( p2 ); + session.persist( p2 ); Account act = new Account(); act.setType( 'c' ); act.setUser( p2 ); p2.getAccounts().add( act ); - session.save( act ); + session.persist( act ); session.flush(); session.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/DeleteTransientEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/DeleteTransientEntityTest.java index 6c5929bfd1..cd324d7848 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/DeleteTransientEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/deletetransient/DeleteTransientEntityTest.java @@ -38,7 +38,7 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { public void testTransientEntityDeletionNoCascades() { Session s = openSession(); Transaction t = s.beginTransaction(); - s.delete( new Address() ); + s.remove( new Address() ); t.commit(); s.close(); } @@ -50,7 +50,7 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); Person p = new Person(); p.getAddresses().add( new Address() ); - s.delete( p ); + s.remove( p ); t.commit(); s.close(); } @@ -64,7 +64,7 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { Person p2 = new Person(); p1.getFriends().add( p2 ); p2.getFriends().add( p1 ); - s.delete( p1 ); + s.remove( p1 ); t.commit(); s.close(); } @@ -76,7 +76,7 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); Address address = new Address(); address.setInfo( "123 Main St." ); - s.save( address ); + s.persist( address ); t.commit(); s.close(); @@ -84,7 +84,7 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { t = s.beginTransaction(); Person p = new Person(); p.getAddresses().add( address ); - s.delete( p ); + s.remove( p ); t.commit(); s.close(); @@ -103,16 +103,16 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); Address address = new Address(); address.setInfo( "123 Main St." ); - s.save( address ); + s.persist( address ); t.commit(); s.close(); s = openSession(); t = s.beginTransaction(); - address = ( Address ) s.get( Address.class, address.getId() ); + address = s.get( Address.class, address.getId() ); Person p = new Person(); p.getAddresses().add( address ); - s.delete( p ); + s.remove( p ); t.commit(); s.close(); @@ -133,7 +133,7 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { Address address = new Address(); address.setInfo( "123 Main St." ); p.getAddresses().add( address ); - s.save( p ); + s.persist( p ); t.commit(); s.close(); @@ -142,7 +142,7 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { Suite suite = new Suite(); address.getSuites().add( suite ); p.getAddresses().clear(); - s.saveOrUpdate( p ); + p = s.merge( p ); t.commit(); s.close(); @@ -154,7 +154,7 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { assertEquals( 1, count.longValue() ); count = ( Long ) s.createQuery( "select count(*) from Suite" ).list().get( 0 ); assertEquals( 0, count.longValue() ); - s.delete( p ); + s.remove( p ); t.commit(); s.close(); } @@ -168,7 +168,7 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { address.setInfo( "123 Main St." ); Suite suite = new Suite(); address.getSuites().add( suite ); - s.save( address ); + s.persist( address ); t.commit(); s.close(); @@ -179,7 +179,7 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { note.setDescription( "a description" ); suite.getNotes().add( note ); address.getSuites().clear(); - s.saveOrUpdate( address ); + address = s.merge( address ); t.commit(); s.close(); @@ -189,7 +189,7 @@ public class DeleteTransientEntityTest extends BaseCoreFunctionalTestCase { assertEquals( "all-delete-orphan not cascaded properly to cleared persistent collection entities", 0, count.longValue() ); count = ( Long ) s.createQuery( "select count(*) from Note" ).list().get( 0 ); assertEquals( 0, count.longValue() ); - s.delete( address ); + s.remove( address ); t.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java index 926fdb241a..4e15bfd8a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/HANAFunctionsTest.java @@ -41,7 +41,7 @@ public class HANAFunctionsTest extends BaseCoreFunctionalTestCase { product.setPrice( new BigDecimal( 1.298 ) ); try ( Session s = openSession() ) { Transaction tx = s.beginTransaction(); - s.save( product ); + s.persist( product ); tx.commit(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java index 13e364049b..3f1f07ed61 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/MySQLRoundFunctionTest.java @@ -41,7 +41,7 @@ public class MySQLRoundFunctionTest extends BaseCoreFunctionalTestCase { product.setPrice( new BigDecimal( 1.298 ) ); Session s=openSession(); Transaction tx=s.beginTransaction(); - s.save( product ); + s.persist( product ); tx.commit(); s.close(); s=openSession(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java index b695543c91..3f2cde7876 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/function/SybaseASEFunctionTest.java @@ -62,7 +62,7 @@ public class SybaseASEFunctionTest { Product product = new Product(); product.setPrice(new BigDecimal("0.5")); product.setDate( Calendar.getInstance().getTime() ); - session.save( product ); + session.persist( product ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java index 706a39af71..a8feea0f14 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java @@ -383,7 +383,7 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { s2.getTransaction().rollback(); s.getTransaction().begin(); - s.delete( kit ); + s.remove( kit ); s.getTransaction().commit(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/CustomDirtinessStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/CustomDirtinessStrategyTest.java index ddfbe66e74..37ef4285a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/CustomDirtinessStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dirtiness/CustomDirtinessStrategyTest.java @@ -47,7 +47,9 @@ public class CustomDirtinessStrategyTest extends BaseCoreFunctionalTestCase { public void testOnlyCustomStrategy() { Session session = openSession(); session.beginTransaction(); - Long id = (Long) session.save( new Thing( INITIAL_NAME ) ); + Thing t = new Thing( INITIAL_NAME ); + session.persist( t ); + Long id = t.getId(); session.getTransaction().commit(); session.close(); @@ -69,7 +71,7 @@ public class CustomDirtinessStrategyTest extends BaseCoreFunctionalTestCase { session.beginTransaction(); thing = session.get( Thing.class, id ); assertEquals( SUBSEQUENT_NAME, thing.getName() ); - session.delete( thing ); + session.remove( thing ); session.getTransaction().commit(); session.close(); } @@ -78,7 +80,9 @@ public class CustomDirtinessStrategyTest extends BaseCoreFunctionalTestCase { public void testCustomStrategyWithFlushInterceptor() { Session session = openSession(); session.beginTransaction(); - Long id = (Long) session.save( new Thing( INITIAL_NAME ) ); + Thing t = new Thing( INITIAL_NAME ); + session.persist( t ); + Long id = t.getId(); session.getTransaction().commit(); session.close(); @@ -101,7 +105,7 @@ public class CustomDirtinessStrategyTest extends BaseCoreFunctionalTestCase { session.beginTransaction(); thing = session.get( Thing.class, id ); assertEquals( SUBSEQUENT_NAME, thing.getName() ); - session.delete( thing ); + session.remove( thing ); session.getTransaction().commit(); session.close(); } @@ -110,7 +114,9 @@ public class CustomDirtinessStrategyTest extends BaseCoreFunctionalTestCase { public void testOnlyCustomStrategyConsultedOnNonDirty() { Session session = openSession(); session.beginTransaction(); - Long id = (Long) session.save( new Thing( INITIAL_NAME ) ); + Thing t = new Thing( INITIAL_NAME ); + session.persist( t ); + Long id = t.getId(); session.getTransaction().commit(); session.close(); 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 dfbde11baa..91ccc5bdd9 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.delete( session.load( Client.class, 1 ) ); + session.remove( session.load( 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 6094ea9374..bfae73a148 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 @@ -63,8 +63,8 @@ public class EmbeddedCompositeIdTest { scope.inTransaction( session -> { - session.delete( c ); - session.delete( uc ); + session.remove( c ); + session.remove( uc ); } ); } @@ -93,7 +93,7 @@ public class EmbeddedCompositeIdTest { Course cid = new Course( "EN-101", "BA", null ); Course c = session.get( Course.class, cid ); assertEquals( newDesc, c.getDescription(), "description not merged" ); - session.delete( c ); + session.remove( c ); } ); } @@ -158,14 +158,14 @@ public class EmbeddedCompositeIdTest { scope.inTransaction( session -> { - session.saveOrUpdate( courses.get( 0 ) ); - session.saveOrUpdate( courses.get( 1 ) ); + session.merge( courses.get( 0 ) ); + session.merge( courses.get( 1 ) ); } ); scope.inTransaction( session -> - courses.forEach( course -> session.delete( c ) ) + courses.forEach( course -> session.remove( c ) ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java index 04fcc05aa1..d19aee6153 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphFunctionalTests.java @@ -82,9 +82,9 @@ public class EntityGraphFunctionalTests { final User buttercup = new User( "Buttercup", "wishee" ); final User humperdink = new User( "Humperdink", "buffoon" ); - session.save( wesley ); - session.save( buttercup ); - session.save( humperdink ); + session.persist( wesley ); + session.persist( buttercup ); + session.persist( humperdink ); final Issue flameSpurt = new Issue( 1, "Flame Spurt", wesley ); final Issue lightningSand = new Issue( 2, "Lightning Sand", buttercup ); @@ -94,9 +94,9 @@ public class EntityGraphFunctionalTests { lightningSand.setAssignee( wesley ); rous.setAssignee( wesley ); - session.save( flameSpurt ); - session.save( lightningSand ); - session.save( rous ); + session.persist( flameSpurt ); + session.persist( lightningSand ); + session.persist( rous ); flameSpurt.addComment( "There is a popping sound preceding each", wesley ); rous.addComment( "I don't think they exist", wesley ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java index 15768ef053..097677d039 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/FetchWithRootGraphTest.java @@ -36,8 +36,8 @@ public class FetchWithRootGraphTest { for ( long i = 0; i < 10; ++i ) { SimpleEntity sim = new SimpleEntity( i, "Entity #" + i ); EntityWithReference ref = new EntityWithReference( i, sim ); - session.save( sim ); - session.save( ref ); + session.persist( sim ); + session.persist( ref ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java index 4c25e34b46..b0d09d27db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java @@ -62,7 +62,7 @@ public class DynamicClassTest extends BaseCoreFunctionalTestCase { cars.put("models", models); models.add(hsv); models.add(monaro); - s.save("ProductLine", cars); + s.persist("ProductLine", cars); t.commit(); s.close(); @@ -91,7 +91,7 @@ public class DynamicClassTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); cars = (Map) s.createQuery("from ProductLine pl order by pl.description").uniqueResult(); - s.delete(cars); + s.remove(cars); t.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java index e6d2276339..d88c0771bd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/compositeId/CompositeIdTest.java @@ -34,7 +34,7 @@ public class CompositeIdTest { id.put( "id2", "2" ); id.put( "name", "Fab" ); - session.save( "CompId", id ); + session.persist( "CompId", id ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/EntityNameFromSubClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/EntityNameFromSubClassTest.java index dede59fc01..5372a70110 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/EntityNameFromSubClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/entityname/EntityNameFromSubClassTest.java @@ -37,7 +37,7 @@ public class EntityNameFromSubClassTest extends BaseCoreFunctionalTestCase { Car golf = new Car(); golf.setOwner("stliu"); stliu.getCars().add(golf); - s.save(stliu); + s.persist(stliu); s.getTransaction().commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java index ac39c9d1e9..bf2a0225c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoBidirectionalTest.java @@ -61,7 +61,7 @@ public class PreInsertEventListenerVetoBidirectionalTest extends BaseCoreFunctio Child child = new Child(); parent.setChild( child ); - session.save( parent ); + session.persist( parent ); } ); fail( "Should have thrown EntityActionVetoException!" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java index 37a23f3be2..7c38c9b582 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/PreInsertEventListenerVetoUnidirectionalTest.java @@ -58,7 +58,7 @@ public class PreInsertEventListenerVetoUnidirectionalTest extends BaseCoreFuncti Child child = new Child(); child.setParent( parent ); - session.save( child ); + session.persist( child ); } ); fail( "Should have thrown EntityActionVetoException!" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java index 727a3ee347..4fce431a55 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/AbstractCollectionEventTest.java @@ -66,10 +66,10 @@ public abstract class AbstractCollectionEventTest extends BaseCoreFunctionalTest for ( Iterator it = parents.iterator(); it.hasNext(); ) { ParentWithCollection parent = ( ParentWithCollection ) it.next(); parent.clearChildren(); - s.delete( parent ); + s.remove( parent ); } for ( Iterator it = children.iterator(); it.hasNext(); ) { - s.delete( it.next() ); + s.remove( it.next() ); } } ); @@ -501,7 +501,7 @@ public abstract class AbstractCollectionEventTest extends BaseCoreFunctionalTest Session s = openSession(); Transaction tx = s.beginTransaction(); parent = ( ParentWithCollection ) s.get( parent.getClass(), parent.getId() ); - s.delete( parent ); + s.remove( parent ); tx.commit(); s.close(); int index = 0; @@ -520,7 +520,7 @@ public abstract class AbstractCollectionEventTest extends BaseCoreFunctionalTest Session s = openSession(); Transaction tx = s.beginTransaction(); parent = ( ParentWithCollection ) s.get( parent.getClass(), parent.getId() ); - s.delete( parent ); + s.remove( parent ); tx.commit(); s.close(); int index = 0; @@ -545,9 +545,9 @@ public abstract class AbstractCollectionEventTest extends BaseCoreFunctionalTest } parent.removeChild( child ); if ( child instanceof Entity ) { - s.delete( child ); + s.remove( child ); } - s.delete( parent ); + s.remove( parent ); tx.commit(); s.close(); int index = 0; @@ -761,7 +761,7 @@ public abstract class AbstractCollectionEventTest extends BaseCoreFunctionalTest Session s = openSession(); Transaction tx = s.beginTransaction(); ParentWithCollection parent = createParent( parentName ); - s.save( parent ); + s.persist( parent ); tx.commit(); s.close(); return parent; @@ -772,7 +772,7 @@ public abstract class AbstractCollectionEventTest extends BaseCoreFunctionalTest Transaction tx = s.beginTransaction(); ParentWithCollection parent = createParent( parentName ); parent.newChildren( createCollection() ); - s.save( parent ); + s.persist( parent ); tx.commit(); s.close(); return parent; @@ -784,7 +784,7 @@ public abstract class AbstractCollectionEventTest extends BaseCoreFunctionalTest ParentWithCollection parent = createParent( parentName ); parent.newChildren( createCollection() ); parent.addChild( ChildName ); - s.save( parent ); + s.persist( parent ); tx.commit(); s.close(); return parent; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java index 45de3f184e..688325b81a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/BrokenCollectionEventTest.java @@ -73,10 +73,10 @@ public class BrokenCollectionEventTest extends BaseCoreFunctionalTestCase { for ( Iterator it = parents.iterator(); it.hasNext(); ) { ParentWithCollection parent = ( ParentWithCollection ) it.next(); parent.clearChildren(); - s.delete( parent ); + s.remove( parent ); } for ( Iterator it = children.iterator(); it.hasNext(); ) { - s.delete( it.next() ); + s.remove( it.next() ); } } ); @@ -101,7 +101,7 @@ public class BrokenCollectionEventTest extends BaseCoreFunctionalTestCase { Transaction tx = s.beginTransaction(); Collection oldCollection = parent.getChildren(); parent.newChildren( null ); - s.update( parent ); + s.merge( parent ); tx.commit(); s.close(); int index = 0; @@ -271,7 +271,7 @@ public class BrokenCollectionEventTest extends BaseCoreFunctionalTestCase { Session s = openSession(); Transaction tx = s.beginTransaction(); ParentWithCollection parent = createParent( parentName ); - s.save( parent ); + s.persist( parent ); tx.commit(); s.close(); return parent; @@ -282,7 +282,7 @@ public class BrokenCollectionEventTest extends BaseCoreFunctionalTestCase { Transaction tx = s.beginTransaction(); ParentWithCollection parent = createParent( parentName ); parent.setChildren( createCollection() ); - s.save( parent ); + s.persist( parent ); tx.commit(); s.close(); return parent; @@ -294,7 +294,7 @@ public class BrokenCollectionEventTest extends BaseCoreFunctionalTestCase { ParentWithCollection parent = createParent( parentName ); parent.setChildren( createCollection() ); parent.addChild( ChildName ); - s.save( parent ); + s.persist( parent ); tx.commit(); s.close(); return parent; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/AbstractAssociationCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/AbstractAssociationCollectionEventTest.java index 80f4c32e44..ecbb7b7c2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/AbstractAssociationCollectionEventTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/association/AbstractAssociationCollectionEventTest.java @@ -34,7 +34,7 @@ public abstract class AbstractAssociationCollectionEventTest extends AbstractCol parent = ( ParentWithCollection ) s.get( parent.getClass(), parent.getId() ); child = ( ChildEntity ) s.get( child.getClass(), child.getId() ); parent.removeChild( child ); - s.delete( parent ); + s.remove( parent ); tx.commit(); s.close(); int index = 0; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java index 8e887d449b..49ef8c09ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/DetachedMultipleCollectionChangeTest.java @@ -74,7 +74,7 @@ public class DetachedMultipleCollectionChangeTest extends BaseCoreFunctionalTest MultipleCollectionEntity mce = new MultipleCollectionEntity(); mce.setText("MultipleCollectionEntity-1"); - s.save(mce); + s.persist(mce); s.getTransaction().commit(); checkListener(listeners, listeners.getPreCollectionRecreateListener(), diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java index 08378e5830..4efa825bca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/collection/detached/MergeCollectionEventTest.java @@ -92,7 +92,7 @@ public class MergeCollectionEventTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); Character paul = new Character( 1, "Paul Atreides" ); - s.save( paul ); + s.persist( paul ); s.getTransaction().commit(); s.close(); @@ -105,7 +105,7 @@ public class MergeCollectionEventTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); Character paulo = new Character( 2, "Paulo Atreides" ); - s.save( paulo ); + s.persist( paulo ); s.getTransaction().commit(); s.close(); @@ -118,7 +118,7 @@ public class MergeCollectionEventTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); Alias alias1 = new Alias( 1, "Paul Muad'Dib" ); - s.save( alias1 ); + s.persist( alias1 ); s.getTransaction().commit(); s.close(); @@ -131,7 +131,7 @@ public class MergeCollectionEventTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); Alias alias2 = new Alias( 2, "Usul" ); - s.save( alias2 ); + s.persist( alias2 ); s.getTransaction().commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java index 71f5182194..1d5b79e8e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistTest.java @@ -63,7 +63,7 @@ public class MergeListPreAndPostPersistTest extends BaseCoreFunctionalTestCase { s = openSession(); s.getTransaction().begin(); - s.delete( order ); + s.remove( order ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java index 19f2f0e725..d50e02e174 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/event/entity/MergeListPreAndPostPersistWithIdentityTest.java @@ -71,7 +71,7 @@ public class MergeListPreAndPostPersistWithIdentityTest extends BaseCoreFunction s = openSession(); s.getTransaction().begin(); - s.delete( order ); + s.remove( order ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java index ec32a3e52b..fa0578f4fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java @@ -26,12 +26,13 @@ import org.hibernate.service.spi.SessionFactoryServiceRegistry; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; /** * Test to ensure that the existing post commit behavior when using plain PostXEventListeners fire on both success and failure. - * + * * @author ShawnClowater */ public class LegacyPostCommitListenerTest extends BaseCoreFunctionalTestCase { @@ -41,9 +42,9 @@ public class LegacyPostCommitListenerTest extends BaseCoreFunctionalTestCase { @Override protected void prepareTest() throws Exception { - ((LegacyPostCommitInsertEventListener) postCommitInsertEventListener).fired = 0; - ((LegacyPostCommitDeleteEventListener) postCommitDeleteEventListener).fired = 0; - ((LegacyPostCommitUpdateEventListener) postCommitUpdateEventListener).fired = 0; + ( (LegacyPostCommitInsertEventListener) postCommitInsertEventListener ).fired = 0; + ( (LegacyPostCommitDeleteEventListener) postCommitDeleteEventListener ).fired = 0; + ( (LegacyPostCommitUpdateEventListener) postCommitUpdateEventListener ).fired = 0; } @Override @@ -80,7 +81,7 @@ public class LegacyPostCommitListenerTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey("HHH-1582") public void testPostCommitInsertListenerSuccess() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -88,16 +89,16 @@ public class LegacyPostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.commit(); session.close(); - Assert.assertEquals( 1, ((LegacyPostCommitInsertEventListener) postCommitInsertEventListener).fired ); + Assert.assertEquals( 1, ( (LegacyPostCommitInsertEventListener) postCommitInsertEventListener ).fired ); } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey("HHH-1582") public void testPostCommitInsertListenerRollback() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -105,17 +106,17 @@ public class LegacyPostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.rollback(); session.close(); //the legacy implementation fires the listener on failure as well - Assert.assertEquals( 1, ((LegacyPostCommitInsertEventListener) postCommitInsertEventListener).fired ); + Assert.assertEquals( 1, ( (LegacyPostCommitInsertEventListener) postCommitInsertEventListener ).fired ); } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey("HHH-1582") public void testPostCommitUpdateListenerSuccess() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -123,24 +124,24 @@ public class LegacyPostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.commit(); session = openSession(); transaction = session.beginTransaction(); irrelevantEntity.setName( "Irrelevant 2" ); - session.update( irrelevantEntity ); + session.merge( irrelevantEntity ); session.flush(); transaction.commit(); session.close(); - Assert.assertEquals( 1, ((LegacyPostCommitUpdateEventListener) postCommitUpdateEventListener).fired ); + Assert.assertEquals( 1, ( (LegacyPostCommitUpdateEventListener) postCommitUpdateEventListener ).fired ); } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey("HHH-1582") public void testPostCommitUpdateListenerRollback() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -148,7 +149,7 @@ public class LegacyPostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.commit(); session.close(); @@ -156,18 +157,18 @@ public class LegacyPostCommitListenerTest extends BaseCoreFunctionalTestCase { session = openSession(); transaction = session.beginTransaction(); irrelevantEntity.setName( "Irrelevant 2" ); - session.update( irrelevantEntity ); + session.merge( irrelevantEntity ); session.flush(); transaction.rollback(); session.close(); //the legacy implementation fires the listener on failure as well - Assert.assertEquals( 1, ((LegacyPostCommitUpdateEventListener) postCommitUpdateEventListener).fired ); + Assert.assertEquals( 1, ( (LegacyPostCommitUpdateEventListener) postCommitUpdateEventListener ).fired ); } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey("HHH-1582") public void testPostCommitDeleteListenerSuccess() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -175,24 +176,24 @@ public class LegacyPostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.commit(); session.close(); session = openSession(); transaction = session.beginTransaction(); - session.delete( irrelevantEntity ); + session.remove( irrelevantEntity ); session.flush(); transaction.commit(); session.close(); - Assert.assertEquals( 1, ((LegacyPostCommitDeleteEventListener) postCommitDeleteEventListener).fired ); + Assert.assertEquals( 1, ( (LegacyPostCommitDeleteEventListener) postCommitDeleteEventListener ).fired ); } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey("HHH-1582") public void testPostCommitDeleteListenerRollback() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -200,21 +201,21 @@ public class LegacyPostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.commit(); session.close(); session = openSession(); transaction = session.beginTransaction(); - session.delete( irrelevantEntity ); + session.remove( irrelevantEntity ); session.flush(); transaction.rollback(); session.close(); //the legacy implementation fires the listener on failure as well - Assert.assertEquals( 1, ((LegacyPostCommitDeleteEventListener) postCommitDeleteEventListener).fired ); + Assert.assertEquals( 1, ( (LegacyPostCommitDeleteEventListener) postCommitDeleteEventListener ).fired ); } private class LegacyPostCommitDeleteEventListener implements PostDeleteEventListener { @@ -261,6 +262,6 @@ public class LegacyPostCommitListenerTest extends BaseCoreFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { - return new Class[] {IrrelevantEntity.class}; + return new Class[] { IrrelevantEntity.class }; } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java index b1d7e0ef82..53f0358e79 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java @@ -29,6 +29,7 @@ import org.hibernate.service.spi.SessionFactoryServiceRegistry; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Assert; import org.junit.Test; @@ -86,7 +87,7 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey( "HHH-1582") public void testPostCommitInsertListenerSuccess() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -94,7 +95,7 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.commit(); session.close(); @@ -104,7 +105,7 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey( "HHH-1582") public void testPostCommitInsertListenerRollback() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -112,7 +113,7 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.rollback(); session.close(); @@ -122,7 +123,7 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey( "HHH-1582") public void testPostCommitUpdateListenerSuccess() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -130,14 +131,14 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.commit(); session = openSession(); transaction = session.beginTransaction(); irrelevantEntity.setName( "Irrelevant 2" ); - session.update( irrelevantEntity ); + session.merge( irrelevantEntity ); session.flush(); transaction.commit(); @@ -148,7 +149,7 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey( "HHH-1582") public void testPostCommitUpdateListenerRollback() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -156,7 +157,7 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.commit(); session.close(); @@ -164,7 +165,7 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { session = openSession(); transaction = session.beginTransaction(); irrelevantEntity.setName( "Irrelevant 2" ); - session.update( irrelevantEntity ); + session.merge( irrelevantEntity ); session.flush(); transaction.rollback(); @@ -175,7 +176,7 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey( "HHH-1582") public void testPostCommitDeleteListenerSuccess() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -183,14 +184,14 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.commit(); session.close(); session = openSession(); transaction = session.beginTransaction(); - session.delete( irrelevantEntity ); + session.remove( irrelevantEntity ); session.flush(); transaction.commit(); @@ -201,7 +202,7 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { } @Test - @TestForIssue(jiraKey = "HHH-1582") + @JiraKey( "HHH-1582") public void testPostCommitDeleteListenerRollback() { Session session = openSession(); Transaction transaction = session.beginTransaction(); @@ -209,14 +210,14 @@ public class PostCommitListenerTest extends BaseCoreFunctionalTestCase { IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); irrelevantEntity.setName( "Irrelevant" ); - session.save( irrelevantEntity ); + session.persist( irrelevantEntity ); session.flush(); transaction.commit(); session.close(); session = openSession(); transaction = session.beginTransaction(); - session.delete( irrelevantEntity ); + session.remove( irrelevantEntity ); session.flush(); transaction.rollback(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java index 358bfa1866..3ee1d22b62 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/eviction/EvictionTest.java @@ -30,7 +30,7 @@ public class EvictionTest extends BaseCoreFunctionalTestCase { public void testNormalUsage() { Session session = openSession(); session.beginTransaction(); - session.save( new IsolatedEvictableEntity( 1 ) ); + session.persist( new IsolatedEvictableEntity( 1 ) ); session.getTransaction().commit(); session.close(); @@ -45,7 +45,7 @@ public class EvictionTest extends BaseCoreFunctionalTestCase { session = openSession(); session.beginTransaction(); - session.delete( entity ); + session.remove( entity ); session.getTransaction().commit(); session.close(); } @@ -80,7 +80,7 @@ public class EvictionTest extends BaseCoreFunctionalTestCase { public void testEvictingDetachedEntity() { Session session = openSession(); session.beginTransaction(); - session.save( new IsolatedEvictableEntity( 1 ) ); + session.persist( new IsolatedEvictableEntity( 1 ) ); session.getTransaction().commit(); session.close(); @@ -99,7 +99,7 @@ public class EvictionTest extends BaseCoreFunctionalTestCase { session = openSession(); session.beginTransaction(); - session.delete( entity ); + session.remove( entity ); session.getTransaction().commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java index f3c64bc700..ef4832f961 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exception/SQLExceptionConversionTest.java @@ -116,7 +116,7 @@ public class SQLExceptionConversionTest extends BaseCoreFunctionalTestCase { final User user = new User(); user.setUsername( "Lukasz" ); - session.save( user ); + session.persist( user ); session.flush(); session.doWork( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java index 131940191e..2f94ace61f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/ConstraintViolationExceptionHandlingTest.java @@ -51,31 +51,7 @@ public class ConstraintViolationExceptionHandlingTest extends BaseExceptionHandl try { AInfo anotherAInfo = new AInfo(); anotherAInfo.uniqueString = "unique"; - s.save( anotherAInfo ); - fail( "should have thrown an exception" ); - } - catch (RuntimeException expected) { - exceptionExpectations.onConstraintViolationOnSaveAndSaveOrUpdate( expected ); - } - finally { - tx.rollback(); - s.close(); - } - } - - @Test - public void testConstraintViolationOnSaveOrUpdate() { - Session s = openSession(); - Transaction tx = s.beginTransaction(); - AInfo aInfo = new AInfo(); - aInfo.uniqueString = "unique"; - s.persist( aInfo ); - s.flush(); - s.clear(); - try { - AInfo anotherAInfo = new AInfo(); - anotherAInfo.uniqueString = "unique"; - s.saveOrUpdate( anotherAInfo ); + s.persist( anotherAInfo ); fail( "should have thrown an exception" ); } catch (RuntimeException expected) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectStateExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectStateExceptionHandlingTest.java index c430b9a666..36329d4f91 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectStateExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/StaleObjectStateExceptionHandlingTest.java @@ -6,20 +6,21 @@ */ package org.hibernate.orm.test.exceptionhandling; -import static org.junit.Assert.fail; +import org.hibernate.Session; +import org.hibernate.dialect.H2Dialect; + +import org.hibernate.testing.RequiresDialect; +import org.hibernate.testing.orm.junit.JiraKey; +import org.junit.Test; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Version; -import org.hibernate.Session; -import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.RequiresDialect; -import org.hibernate.testing.TestForIssue; -import org.junit.Test; +import static org.junit.Assert.fail; -@TestForIssue(jiraKey = "HHH-12666") +@JiraKey("HHH-12666") @RequiresDialect(H2Dialect.class) public class StaleObjectStateExceptionHandlingTest extends BaseExceptionHandlingTest { @@ -92,7 +93,7 @@ public class StaleObjectStateExceptionHandlingTest extends BaseExceptionHandling s = openSession(); s.beginTransaction(); try { - s.update( a ); + s.merge( a ); s.flush(); fail( "should have thrown an exception" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java index 7a702d8309..b03d199187 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransactionExceptionHandlingTest.java @@ -102,32 +102,7 @@ public class TransactionExceptionHandlingTest extends BaseExceptionHandlingTest t.begin(); Thread.sleep( 1000 ); try { - s.save( new A() ); - fail( "should have thrown an exception" ); - } - catch (RuntimeException expected){ - exceptionExpectations.onTransactionExceptionOnSaveAndSaveOrUpdate( expected ); - } - finally { - t.rollback(); - s.close(); - } - } - - @Test - public void testSaveOrUpdateWithGeneratedValue() throws Exception { - Session s = openSession(); - // Get the transaction and set the timeout BEFORE calling begin() - Transaction t = s.getTransaction(); - t.setTimeout( 1 ); - assertEquals( - -1, - ( (SessionImplementor) s ).getJdbcCoordinator().determineRemainingTransactionTimeOutPeriod() - ); - t.begin(); - Thread.sleep( 1000 ); - try { - s.saveOrUpdate( new A() ); + s.persist( new A() ); fail( "should have thrown an exception" ); } catch (RuntimeException expected){ diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java index e0406384c1..20ff927458 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/exceptionhandling/TransientObjectExceptionHandlingTest.java @@ -37,46 +37,6 @@ public class TransientObjectExceptionHandlingTest extends BaseExceptionHandlingT }; } - @Test - public void testSave() { - Session s = openSession(); - Transaction tx = s.beginTransaction(); - A a = new A(); - a.id = 1; - a.aInfo = new AInfo(); - try { - s.save( a ); - fail( "should have thrown an exception" ); - } - catch (RuntimeException expected) { - exceptionExpectations.onTransientObjectOnSaveAndSaveOrUpdate( expected ); - } - finally { - tx.rollback(); - s.close(); - } - } - - @Test - public void testSaveOrUpdate() { - Session s = openSession(); - Transaction tx = s.beginTransaction(); - A a = new A(); - a.id = 1; - a.aInfo = new AInfo(); - try { - s.saveOrUpdate( a ); - fail( "should have thrown an exception" ); - } - catch (RuntimeException expected) { - exceptionExpectations.onTransientObjectOnSaveAndSaveOrUpdate( expected ); - } - finally { - tx.rollback(); - s.close(); - } - } - @Test public void testPersist() { Session s = openSession(); @@ -118,14 +78,14 @@ public class TransientObjectExceptionHandlingTest extends BaseExceptionHandlingT } @Test - public void testUpdateFlush() { + public void testMergeFlush() { Session s = openSession(); Transaction tx = s.beginTransaction(); A a = new A(); a.id = 1; a.aInfo = new AInfo(); try { - s.update( a ); + s.merge( a ); s.flush(); fail( "should have thrown an exception" ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/ExtraLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/ExtraLazyTest.java index 2ab7153622..dbe254f057 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/ExtraLazyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/extralazy/ExtraLazyTest.java @@ -92,7 +92,7 @@ public class ExtraLazyTest { assertNull( session.get( Document.class, "HiA2" ) ); gavin.getDocuments().clear(); assertTrue( Hibernate.isInitialized( gavin.getDocuments() ) ); - session.delete( gavin ); + session.remove( gavin ); } ); } @@ -125,9 +125,9 @@ public class ExtraLazyTest { assertNull( turin.getSession().get( "foo" ) ); assertFalse( Hibernate.isInitialized( gavin.getSession() ) ); assertFalse( Hibernate.isInitialized( turin.getSession() ) ); - session.delete( gavin ); - session.delete( turin ); - session.delete( g ); + session.remove( gavin ); + session.remove( turin ); + session.remove( g ); } ); } @@ -168,9 +168,9 @@ public class ExtraLazyTest { User gavin = session.get( User.class, "gavin" ); assertFalse( gavin.getSession().containsKey( "foo" ) ); assertFalse( Hibernate.isInitialized( gavin.getSession() ) ); - session.delete( gavin ); - session.delete( turin ); - session.delete( g ); + session.remove( gavin ); + session.remove( turin ); + session.remove( g ); } ); } @@ -208,7 +208,7 @@ public class ExtraLazyTest { Map smap = ( (User) g.getUsers().get( "gavin" ) ).getSession(); assertThat( smap.size(), is( 1 ) ); User gavin = (User) g.getUsers().put( "gavin", user2 ); - session.delete( gavin ); + session.remove( gavin ); assertThat( session.createQuery( "select count(*) from SessionAttribute" ).uniqueResult(), is( 0L ) @@ -224,8 +224,8 @@ public class ExtraLazyTest { Map smap = turin.getSession(); assertThat( smap.size(), is( 0 ) ); assertThat( session.createQuery( "select count(*) from User" ).uniqueResult(), is( 1L ) ); - session.delete( g ); - session.delete( turin ); + session.remove( g ); + session.remove( turin ); assertThat( session.createQuery( "select count(*) from User" ).uniqueResult(), is( 0L ) ); } ); @@ -312,7 +312,7 @@ public class ExtraLazyTest { child.setFirstName( "Ben" ); parent.getChildren().put( child.getFirstName(), child ); child.setParent( parent ); - session.save( parent ); + session.persist( parent ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java index b207bab989..2dfb209746 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetch/runtime/managed/RuntimeFetchFromManagedTest.java @@ -128,10 +128,10 @@ public class RuntimeFetchFromManagedTest extends BaseNonConfigCoreFunctionalTest inTransaction( session -> { final ChildEntity child = new ChildEntity( 1, "child" ); - session.save( child ); + session.persist( child ); final RootEntity root = new RootEntity( 2, "root", child ); - session.save( root ); + session.persist( root ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java index 3a3f1b0c6f..d9060b5a9d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithJoinFetchModeTests.java @@ -59,13 +59,13 @@ public class EagerToOneWithJoinFetchModeTests { scope.inTransaction( session -> { SimpleEntity manyToOneSimpleEntity = new SimpleEntity( 1, "manyToOne" ); SimpleEntity oneToOneSimpleEntity = new SimpleEntity( 2, "oneToOne" ); - session.save( manyToOneSimpleEntity ); - session.save( oneToOneSimpleEntity ); + session.persist( manyToOneSimpleEntity ); + session.persist( oneToOneSimpleEntity ); RootEntity rootEntity = new RootEntity( 1, "root" ); rootEntity.manyToOneSimpleEntity = manyToOneSimpleEntity; rootEntity.oneToOneSimpleEntity = oneToOneSimpleEntity; - session.save( rootEntity ); + session.persist( rootEntity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java index db8e80b878..11a4dc5668 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/EagerToOneWithSelectFetchModeTests.java @@ -56,13 +56,13 @@ public class EagerToOneWithSelectFetchModeTests { scope.inTransaction( session -> { SimpleEntity manyToOneSimpleEntity = new SimpleEntity( 1, "manyToOne" ); SimpleEntity oneToOneSimpleEntity = new SimpleEntity( 2, "oneToOne" ); - session.save( manyToOneSimpleEntity ); - session.save( oneToOneSimpleEntity ); + session.persist( manyToOneSimpleEntity ); + session.persist( oneToOneSimpleEntity ); RootEntity rootEntity = new RootEntity( 1, "root" ); rootEntity.manyToOneSimpleEntity = manyToOneSimpleEntity; rootEntity.oneToOneSimpleEntity = oneToOneSimpleEntity; - session.save( rootEntity ); + session.persist( rootEntity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java index 7833bc29ac..fb803b54d6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithJoinFetchModeTests.java @@ -57,13 +57,13 @@ public class LazyToOneWithJoinFetchModeTests { scope.inTransaction( session -> { SimpleEntity manyToOneSimpleEntity = new SimpleEntity( 1, "manyToOne" ); SimpleEntity oneToOneSimpleEntity = new SimpleEntity( 2, "oneToOne" ); - session.save( manyToOneSimpleEntity ); - session.save( oneToOneSimpleEntity ); + session.persist( manyToOneSimpleEntity ); + session.persist( oneToOneSimpleEntity ); RootEntity rootEntity = new RootEntity( 1, "root" ); rootEntity.manyToOneSimpleEntity = manyToOneSimpleEntity; rootEntity.oneToOneSimpleEntity = oneToOneSimpleEntity; - session.save( rootEntity ); + session.persist( rootEntity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java index bea6ab56db..3cad2916c5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchmode/toone/LazyToOneWithSelectFetchModeTests.java @@ -57,13 +57,13 @@ public class LazyToOneWithSelectFetchModeTests { scope.inTransaction( session -> { SimpleEntity manyToOneSimpleEntity = new SimpleEntity( 1, "manyToOne" ); SimpleEntity oneToOneSimpleEntity = new SimpleEntity( 2, "oneToOne" ); - session.save( manyToOneSimpleEntity ); - session.save( oneToOneSimpleEntity ); + session.persist( manyToOneSimpleEntity ); + session.persist( oneToOneSimpleEntity ); RootEntity rootEntity = new RootEntity( 1, "root" ); rootEntity.manyToOneSimpleEntity = manyToOneSimpleEntity; rootEntity.oneToOneSimpleEntity = oneToOneSimpleEntity; - session.save( rootEntity ); + session.persist( rootEntity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java index 9562ce790a..b58fb1fa07 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/fetchprofiles/join/JoinFetchProfileTest.java @@ -76,12 +76,12 @@ public class JoinFetchProfileTest extends BaseCoreFunctionalTestCase { final Enrollment enrollment = new Enrollment( section, me ); inTransaction( session -> { - session.save( literatureDepartment ); - session.save( lit101 ); - session.save( section ); - session.save( me ); + session.persist( literatureDepartment ); + session.persist( lit101 ); + session.persist( section ); + session.persist( me ); section.getEnrollments().add( enrollment ); - session.save( enrollment ); + session.persist( enrollment ); } ); @@ -113,11 +113,11 @@ public class JoinFetchProfileTest extends BaseCoreFunctionalTestCase { inTransaction( session -> { - session.delete( enrollment ); - session.delete( me ); - session.delete( enrollment.getOffering() ); - session.delete( enrollment.getOffering().getCourse() ); - session.delete( enrollment.getOffering().getCourse().getCode().getDepartment() ); + session.remove( enrollment ); + session.remove( me ); + session.remove( enrollment.getOffering() ); + session.remove( enrollment.getOffering().getCourse() ); + session.remove( enrollment.getOffering().getCourse().getCode().getDepartment() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java index 6f652207ab..09c68aacde 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/CriteriaQueryWithAppliedFilterTest.java @@ -62,7 +62,7 @@ public class CriteriaQueryWithAppliedFilterTest extends AbstractStatefulStateles student.setStatus( "active" ); student.setAge( 21 ); student.setAddress( new Address( "London", "Lollard St" ) ); - session.save( student ); + session.persist( student ); final Student student2 = new Student(); student2.setId( new Identifier( 4, new Identifier2( 4, 6L ) ) ); @@ -70,7 +70,7 @@ public class CriteriaQueryWithAppliedFilterTest extends AbstractStatefulStateles student2.setStatus( "active" ); student2.setAge( 27 ); student2.setAddress( new Address( "London", "Oxford St" ) ); - session.save( student2 ); + session.persist( student2 ); }); } 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 4b5dcaf753..6a946696c0 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 @@ -705,7 +705,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { session.enableFilter( "region" ).setParameter( "region", "NA" ); int count = session.createQuery( "delete from Salesperson" ).executeUpdate(); assertEquals( 1, count ); - session.delete( sp2 ); + session.remove( sp2 ); } ); } @@ -730,7 +730,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { session.enableFilter( "region" ).setParameter( "region", "NA" ); int count = session.createQuery( "delete from Salesperson" ).executeUpdate(); assertEquals( 1, count ); - session.delete( sp2 ); + session.remove( sp2 ); } ); } @@ -1019,7 +1019,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { Department dept = new Department(); dept.setName( "Sales" ); - session.save( dept ); + session.persist( dept ); deptId = dept.getId(); entitiesToCleanUp.add( dept ); @@ -1039,8 +1039,8 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { max.setDepartment( dept ); dept.getSalespersons().add( max ); - session.save( steve ); - session.save( max ); + session.persist( steve ); + session.persist( max ); entitiesToCleanUp.add( steve ); entitiesToCleanUp.add( max ); @@ -1059,7 +1059,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { product1.addCategory( cat1 ); product1.addCategory( cat2 ); - session.save( product1 ); + session.persist( product1 ); entitiesToCleanUp.add( product1 ); prod1Id = product1.getId(); @@ -1071,7 +1071,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { order1.setSalesperson( steve ); order1.addLineItem( product1, 500 ); - session.save( order1 ); + session.persist( order1 ); entitiesToCleanUp.add( order1 ); Product product2 = new Product(); @@ -1084,13 +1084,13 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { Category cat3 = new Category( "test cat 2", sixMonthsAgo.getTime(), new Date() ); product2.addCategory( cat3 ); - session.save( product2 ); + session.persist( product2 ); entitiesToCleanUp.add( product2 ); // An uncategorized product Product product3 = new Product(); product3.setName( "Uncategorized product" ); - session.save( product3 ); + session.persist( product3 ); entitiesToCleanUp.add( product3 ); Order order2 = new Order(); @@ -1100,7 +1100,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { order2.setSalesperson( steve ); order2.addLineItem( product2, -1 ); - session.save( order2 ); + session.persist( order2 ); entitiesToCleanUp.add( order2 ); } ); @@ -1110,7 +1110,7 @@ public class DynamicFilterTest extends BaseNonConfigCoreFunctionalTestCase { inTransaction( session -> { for ( Object o : entitiesToCleanUp ) { - session.delete( o ); + session.remove( o ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java index de9d1c8909..b0e23992f1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/ManyToManyWithDynamicFilterTest.java @@ -52,11 +52,11 @@ public class ManyToManyWithDynamicFilterTest { scope.inTransaction( session -> { final Role r1 = new Role( 1, "R1", false ); final Role r2 = new Role( 2, "R2", false ); - session.save( r1 ); - session.save( r2 ); + session.persist( r1 ); + session.persist( r2 ); final User user = new User( 1, "A", true, r1, r2 ); - session.save( user ); + session.persist( user ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java index 6b2b840a67..9c35aa704d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/OneToManyWithDynamicFilterTest.java @@ -68,7 +68,7 @@ public class OneToManyWithDynamicFilterTest extends AbstractStatefulStatelessFil revision.addArticleTradings( articleTrading ); revision.setDeletionTimestamp( Timestamp.valueOf( "9999-12-31 00:00:00" ) ); revision.setDeleted( true ); - session.save( revision ); + session.persist( revision ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java index 7bee1bba09..5f1bd9f9ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/BasicFilteredBulkManipulationTest.java @@ -45,9 +45,9 @@ public class BasicFilteredBulkManipulationTest extends AbstractStatefulStateless void testBasicFilteredHqlDelete( BiConsumer> inTransaction) { scope.inTransaction( session -> { - session.save( new Person( "Steve", 'M' ) ); - session.save( new Person( "Emmanuel", 'M' ) ); - session.save( new Person( "Gail", 'F' ) ); + session.persist( new Person( "Steve", 'M' ) ); + session.persist( new Person( "Emmanuel", 'M' ) ); + session.persist( new Person( "Gail", 'F' ) ); } ); inTransaction.accept(scope, session -> { session.enableFilter( "sex" ).setParameter( "sexCode", 'M' ); @@ -60,8 +60,8 @@ public class BasicFilteredBulkManipulationTest extends AbstractStatefulStateless @MethodSource("transactionKind") void testBasicFilteredHqlUpdate(BiConsumer> inTransaction) { scope.inTransaction( session -> { - session.save( new Person( "Shawn", 'M' ) ); - session.save( new Person( "Sally", 'F' ) ); + session.persist( new Person( "Shawn", 'M' ) ); + session.persist( new Person( "Sally", 'F' ) ); } ); inTransaction.accept(scope, session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java index 4790b372fa..41b5b5c5dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/hql/JoinedFilteredBulkManipulationTest.java @@ -52,10 +52,10 @@ public class JoinedFilteredBulkManipulationTest extends AbstractStatefulStateles @BeforeEach void setUp() { scope.inTransaction( session -> { - session.save( new Employee( "John", 'M', "john", new Date() ) ); - session.save( new Employee( "Jane", 'F', "jane", new Date() ) ); - session.save( new Customer( "Charlie", 'M', "charlie", "Acme" ) ); - session.save( new Customer( "Wanda", 'F', "wanda", "ABC" ) ); + session.persist( new Employee( "John", 'M', "john", new Date() ) ); + session.persist( new Employee( "Jane", 'F', "jane", new Date() ) ); + session.persist( new Customer( "Charlie", 'M', "charlie", "Acme" ) ); + session.persist( new Customer( "Wanda", 'F', "wanda", "ABC" ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java index a5a7d0640e..f9d1d61422 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NativeCriteriaSyncTest.java @@ -39,7 +39,7 @@ public class NativeCriteriaSyncTest extends BaseCoreFunctionalTestCase { e1.getManyToManyAssociatedEntities().add( e2 ); doInHibernate( this::sessionFactory, session -> { - session.save( e1 ); + session.persist( e1 ); CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder(); CriteriaQuery criteria = criteriaBuilder.createQuery( SimpleEntityWithAssociation.class ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java index 92cebbe272..601ed06917 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java @@ -55,7 +55,7 @@ public class NonTransactionalDataAccessTest extends BaseCoreFunctionalTestCase { final MyEntity entity = new MyEntity( "entity" ); inTransaction( session -> { - session.save( entity ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java index 9a86d5c87a..02d017ee8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestAutoFlushBeforeQueryExecution.java @@ -46,7 +46,7 @@ public class TestAutoFlushBeforeQueryExecution extends BaseCoreFunctionalTestCas Transaction txn = s.beginTransaction(); Publisher publisher = new Publisher(); publisher.setName( "name" ); - s.save( publisher ); + s.persist( publisher ); assertTrue( "autoflush entity create", s.createQuery( "from Publisher p" ).list().size() == 1 ); publisher.setName( "name" ); assertTrue( "autoflush entity update", s.createQuery( "from Publisher p where p.name='name'" ).list().size() == 1 ); @@ -82,7 +82,7 @@ public class TestAutoFlushBeforeQueryExecution extends BaseCoreFunctionalTestCas assertEquals( 0, actionQueue.numberOfCollectionRemovals() ); author1.setPublisher( null ); - s.delete( author1 ); + s.remove( author1 ); publisher.getAuthors().clear(); assertEquals( 0, actionQueue.numberOfCollectionRemovals() ); assertTrue( "autoflush collection update", @@ -110,7 +110,7 @@ public class TestAutoFlushBeforeQueryExecution extends BaseCoreFunctionalTestCas assertTrue( persistenceContext.getCollectionsByKey().values().contains( author2.getBooks() ) ); assertEquals( 0, actionQueue.numberOfCollectionRemovals() ); - s.delete(publisher); + s.remove(publisher); assertTrue( "autoflush delete", s.createQuery( "from Publisher p" ).list().size()==0 ); txn.commit(); s.close(); @@ -122,12 +122,12 @@ public class TestAutoFlushBeforeQueryExecution extends BaseCoreFunctionalTestCas Transaction txn = s.beginTransaction(); Publisher publisher = new Publisher(); publisher.setName( "name" ); - s.save( publisher ); + s.persist( publisher ); assertTrue( "autoflush entity create", s.createQuery( "from Publisher p" ).list().size() == 1 ); publisher.setName( "name" ); assertTrue( "autoflush entity update", s.createQuery( "from Publisher p where p.name='name'" ).list().size() == 1 ); UnrelatedEntity unrelatedEntity = new UnrelatedEntity( ); - s.save( unrelatedEntity ); + s.persist( unrelatedEntity ); txn.commit(); s.close(); @@ -157,7 +157,7 @@ public class TestAutoFlushBeforeQueryExecution extends BaseCoreFunctionalTestCas assertEquals( 0, actionQueue.numberOfCollectionRemovals() ); author1.setPublisher( null ); - s.delete( author1 ); + s.remove( author1 ); publisher.getAuthors().clear(); assertEquals( 0, actionQueue.numberOfCollectionRemovals() ); assertTrue( s.createQuery( "from UnrelatedEntity" ).list().size() == 1 ); @@ -194,9 +194,9 @@ public class TestAutoFlushBeforeQueryExecution extends BaseCoreFunctionalTestCas assertTrue( persistenceContext.getCollectionsByKey().values().contains( author2.getBooks() ) ); assertEquals( 0, actionQueue.numberOfCollectionRemovals() ); - s.delete(publisher); + s.remove(publisher); assertTrue( "autoflush delete", s.createQuery( "from UnrelatedEntity" ).list().size()==1 ); - s.delete( unrelatedEntity ); + s.remove( unrelatedEntity ); txn.commit(); s.close(); } 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 bd3544cf3d..5e772d9676 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 @@ -38,21 +38,21 @@ public class TestClearBatchFetchQueueAfterFlush extends BaseCoreFunctionalTestCa author1.getBooks().add( new Book( "A Man of Parts", author1 ) ); author1.getBooks().add( new Book( "Thinks...", author1 ) ); author1.getBooks().add( new Book( "Therapy", author1 ) ); - s.save( author1 ); + s.persist( author1 ); Iterator bookIterator = author1.getBooks().iterator(); BookStore bookStore1 = new BookStore( "Passages" ); bookStore1.getBooks().add( bookIterator.next() ); - s.save( bookStore1 ); + s.persist( bookStore1 ); BookStore bookStore2 = new BookStore( "Librairie du Tramway" ); bookStore2.getBooks().add( bookIterator.next() ); - s.save( bookStore2 ); + s.persist( bookStore2 ); BookStore bookStore3 = new BookStore( "Le Bal des Ardents" ); bookStore3.getBooks().add( bookIterator.next() ); - s.save( bookStore3 ); + s.persist( bookStore3 ); s.flush(); s.getTransaction().commit(); @@ -63,7 +63,7 @@ public class TestClearBatchFetchQueueAfterFlush extends BaseCoreFunctionalTestCa bookStore3 = s.load( BookStore.class, bookStore3.getId() ); s.beginTransaction(); - s.delete( bookStore2 ); + s.remove( bookStore2 ); s.getTransaction().commit(); bookStore1.getBooks().size(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java index ca2aaa47af..497e9771eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/TestCollectionInitializingDuringFlush.java @@ -42,7 +42,7 @@ public class TestCollectionInitializingDuringFlush extends BaseCoreFunctionalTes author.setPublisher( publisher ); publisher.getAuthors().add( author ); author.getBooks().add( new Book( "Reflections on a Wimpy Kid", author ) ); - s.save( author ); + s.persist( author ); s.getTransaction().commit(); s.clear(); @@ -56,7 +56,7 @@ public class TestCollectionInitializingDuringFlush extends BaseCoreFunctionalTes s = openSession(); s.beginTransaction(); - s.delete( author ); + s.remove( author ); s.getTransaction().commit(); s.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java index 111086d289..cc3018a798 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/generatedkeys/identity/IdentityGeneratedKeysTest.java @@ -51,10 +51,9 @@ public class IdentityGeneratedKeysTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); MyEntity myEntity = new MyEntity( "test" ); - Long id = ( Long ) s.save( myEntity ); - assertNotNull( "identity column did not force immediate insert", id ); - assertEquals( id, myEntity.getId() ); - s.delete( myEntity ); + s.persist(myEntity); + assertNotNull( "identity column did not force immediate insert", myEntity.getId() ); + s.remove( myEntity ); s.getTransaction().commit(); s.close(); } @@ -63,13 +62,6 @@ public class IdentityGeneratedKeysTest extends BaseCoreFunctionalTestCase { public void testPersistOutsideTransaction() { Session s = openSession(); try { - // first test save() which should force an immediate insert... - MyEntity myEntity1 = new MyEntity( "test-save" ); - Long id = (Long) s.save( myEntity1 ); - assertNotNull( "identity column did not force immediate insert", id ); - assertEquals( id, myEntity1.getId() ); - - // next test persist() which should cause a delayed insert... long initialInsertCount = sessionFactory().getStatistics().getEntityInsertCount(); MyEntity myEntity2 = new MyEntity( "test-persist" ); s.persist( myEntity2 ); 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 9cbe4e8357..1140540d0c 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 @@ -116,79 +116,79 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { inTransaction( (session) -> { session.createQuery( "from Animal" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from User" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Zoo" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from StateProvince" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Joiner" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Foo" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from One" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Many" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from SimpleAssociatedEntity" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from SimpleEntityWithAssociation" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from HeresAnotherCrazyIdFieldName" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from MoreCrazyIdFieldNameStuffEntity" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Image" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from ComponentContainer" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from VariousKeywordPropertyEntity" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Constructor" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from ProductLine" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Model" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from LineItem" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Product" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Order" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Customer" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from PropertySet" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Commento" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); session.createQuery( "from Marelo" ).list().forEach( - (animal) -> session.delete( animal ) + (animal) -> session.remove( animal ) ); } ); @@ -268,7 +268,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Address address = new Address(); Zoo zoo = new Zoo( "ZOO 1", address ); address.setCity( "City 1" ); - session.save( zoo ); + session.persist( zoo ); } ); @@ -289,7 +289,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { final Constructor created = fromTransaction( (session) -> { final Constructor constructor = new Constructor(); - session.save( constructor ); + session.persist( constructor ); return constructor; } ); @@ -363,7 +363,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { new ComponentContainer.Address.Zip( 12345, 6789 ) ) ); - s.save( root ); + s.persist( root ); } ); @@ -398,9 +398,9 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { address.setCity( "City 1" ); StateProvince stateProvince = new StateProvince(); stateProvince.setName( "Illinois" ); - session.save( stateProvince ); + session.persist( stateProvince ); address.setStateProvince( stateProvince ); - session.save( zoo ); + session.persist( zoo ); } ); @@ -469,8 +469,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { me.setName( new Name( "Joe", null, "Ebersole" ) ); me.setFamily( new HashMap() ); me.getFamily().put( "son", joe ); - s.save( me ); - s.save( joe ); + s.persist( me ); + s.persist( joe ); s.getTransaction().commit(); s.close(); @@ -522,8 +522,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( me ); - s.delete( joe ); + s.remove( me ); + s.remove( joe ); s.getTransaction().commit(); s.close(); } @@ -539,8 +539,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { me.setName( new Name( "Joe", null, "Ebersole" ) ); me.setFamily( new HashMap() ); me.getFamily().put( "son", joe ); - s.save( me ); - s.save( joe ); + s.persist( me ); + s.persist( joe ); s.getTransaction().commit(); s.close(); @@ -580,8 +580,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( me ); - s.delete( joe ); + s.remove( me ); + s.remove( joe ); s.getTransaction().commit(); s.close(); } @@ -597,8 +597,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { me.setName( new Name( "Joe", null, "Ebersole" ) ); me.setFamily( new HashMap() ); me.getFamily().put( "son", joe ); - s.save( me ); - s.save( joe ); + s.persist( me ); + s.persist( joe ); s.getTransaction().commit(); s.close(); @@ -654,8 +654,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( me ); - s.delete( joe ); + s.remove( me ); + s.remove( joe ); s.getTransaction().commit(); s.close(); } @@ -667,7 +667,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); Human h = new Human(); h.setName( new Name( "Steve", null, "Ebersole" ) ); - s.save( h ); + s.persist( h ); s.getTransaction().commit(); s.close(); @@ -680,7 +680,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( h ); + s.remove( h ); s.getTransaction().commit(); s.close(); } @@ -694,7 +694,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Human human = new Human(); human.setName( new Name( "Lukasz", null, "Antoniak" ) ); human.setNickName( "NONE" ); - session.save( human ); + session.persist( human ); session.getTransaction().commit(); session.close(); @@ -707,7 +707,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { session = openSession(); session.beginTransaction(); - session.delete( human ); + session.remove( human ); session.getTransaction().commit(); session.close(); } @@ -720,7 +720,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Human human = new Human(); human.setName( new Name( "Lukasz", null, "Antoniak" ) ); human.setNickName( "NONE" ); - session.save( human ); + session.persist( human ); session.getTransaction().commit(); session.close(); @@ -735,7 +735,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { session = openSession(); session.beginTransaction(); - session.delete( human ); + session.remove( human ); session.getTransaction().commit(); session.close(); } @@ -747,20 +747,20 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); Human h = new Human(); h.setName( new Name( "Johnny", 'B', "Goode" ) ); - s.save( h ); + s.persist( h ); h = new Human(); h.setName( new Name( "Steve", null, "Ebersole" ) ); - s.save( h ); + s.persist( h ); h = new Human(); h.setName( new Name( "Bono", null, null ) ); - s.save( h ); + s.persist( h ); h = new Human(); h.setName( new Name( "Steve", 'Z', "Johnny" ) ); h.setIntValue( 1 ); - s.save( h ); + s.persist( h ); h = new Human(); h.setName( new Name( null, null, null ) ); - s.save( h ); + s.persist( h ); s.getTransaction().commit(); s.close(); @@ -826,16 +826,16 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); Human h = new Human(); h.setName( new Name( "Johnny", 'B', "Goode" ) ); - s.save( h ); + s.persist( h ); h = new Human(); h.setName( new Name( "Steve", null, "Ebersole" ) ); - s.save( h ); + s.persist( h ); h = new Human(); h.setName( new Name( "Bono", null, null ) ); - s.save( h ); + s.persist( h ); h = new Human(); h.setName( new Name( null, null, null ) ); - s.save( h ); + s.persist( h ); s.getTransaction().commit(); s.close(); @@ -1080,9 +1080,9 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { MoreCrazyIdFieldNameStuffEntity other = new MoreCrazyIdFieldNameStuffEntity( "other" ); Session s = openSession(); s.beginTransaction(); - s.save( next ); - s.save( top ); - s.save( other ); + s.persist( next ); + s.persist( top ); + s.persist( other ); s.flush(); List results = s.createQuery( "select e.heresAnotherCrazyIdFieldName from MoreCrazyIdFieldNameStuffEntity e where e.heresAnotherCrazyIdFieldName is not null" ).list(); @@ -1100,9 +1100,9 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { results = s.createQuery( "select e.heresAnotherCrazyIdFieldName from MoreCrazyIdFieldNameStuffEntity e" ).list(); assertEquals( 1, results.size() ); - s.delete( top ); - s.delete( next ); - s.delete( other ); + s.remove( top ); + s.remove( next ); + s.remove( other ); s.getTransaction().commit(); s.close(); } @@ -1121,9 +1121,9 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { SimpleEntityWithAssociation owner = new SimpleEntityWithAssociation( "owner" ); SimpleAssociatedEntity e1 = new SimpleAssociatedEntity( "thing one", owner ); SimpleAssociatedEntity e2 = new SimpleAssociatedEntity( "thing two" ); - s.save( e1 ); - s.save( e2 ); - s.save( owner ); + s.persist( e1 ); + s.persist( e2 ); + s.persist( owner ); s.getTransaction().commit(); s.close(); @@ -1141,9 +1141,9 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( e1 ); - s.delete( e2 ); - s.delete( owner ); + s.remove( e1 ); + s.remove( e2 ); + s.remove( owner ); s.getTransaction().commit(); s.close(); } @@ -1157,28 +1157,28 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { product.setNumberAvailable( 10 ); product.setPrice( new BigDecimal( 123 ) ); product.setProductId( "4321" ); - s.save( product ); + s.persist( product ); Customer customer = new Customer(); customer.setCustomerId( "123456789" ); customer.setName( "My customer" ); customer.setAddress( "somewhere" ); - s.save( customer ); + s.persist( customer ); Order order = customer.generateNewOrder( new BigDecimal( 1234 ) ); - s.save( order ); + s.persist( order ); LineItem li = order.generateLineItem( product, 5 ); - s.save( li ); + s.persist( li ); product = new Product(); product.setDescription( "My Product" ); product.setNumberAvailable( 10 ); product.setPrice( new BigDecimal( 123 ) ); product.setProductId( "1234" ); - s.save( product ); + s.persist( product ); li = order.generateLineItem( product, 10 ); - s.save( li ); + s.persist( li ); s.flush(); Query query = s.createQuery( "from LineItem l where l.id in (:idList)" ); @@ -1218,9 +1218,9 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { SimpleEntityWithAssociation owner = new SimpleEntityWithAssociation( "owner" ); SimpleAssociatedEntity e1 = new SimpleAssociatedEntity( "thing one", owner ); SimpleAssociatedEntity e2 = new SimpleAssociatedEntity( "thing two" ); - s.save( e1 ); - s.save( e2 ); - s.save( owner ); + s.persist( e1 ); + s.persist( e2 ); + s.persist( owner ); s.getTransaction().commit(); s.close(); @@ -1234,9 +1234,9 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( e1 ); - s.delete( e2 ); - s.delete( owner ); + s.remove( e1 ); + s.remove( e2 ); + s.remove( owner ); s.getTransaction().commit(); s.close(); } @@ -1276,11 +1276,11 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); Human h = new Human(); h.setName( new Name( "Gail", null, "Badner" ) ); - s.save( h ); + s.persist( h ); User u = new User(); u.setUserName( "gbadner" ); u.setHuman( h ); - s.save( u ); + s.persist( u ); s.getTransaction().commit(); s.close(); @@ -1331,11 +1331,11 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s.getTransaction().begin(); Department department = (Department) s.createQuery( "select e.department from Employee e inner join e.department" ).uniqueResult(); assertEquals( employee1.getDepartment().getDeptName(), department.getDeptName() ); - s.delete( employee1 ); - s.delete( title1 ); - s.delete( department ); - s.delete( employee2 ); - s.delete( title2 ); + s.remove( employee1 ); + s.remove( title1 ); + s.remove( department ); + s.remove( employee2 ); + s.remove( title2 ); s.getTransaction().commit(); s.close(); } @@ -1381,11 +1381,11 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertNull( list.get( 1 ) ); } assertEquals( dept1.getDeptName(), dept.getDeptName() ); - s.delete( employee1 ); - s.delete( title1 ); - s.delete( dept ); - s.delete( employee2 ); - s.delete( title2 ); + s.remove( employee1 ); + s.remove( title1 ); + s.remove( dept ); + s.remove( employee2 ); + s.remove( title2 ); s.getTransaction().commit(); s.close(); } @@ -1427,11 +1427,11 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals( employee1.getLastName(), result[1] ); assertEquals( employee1.getTitle().getDescription(), result[2] ); assertEquals( employee1.getDepartment().getDeptName(), ( (Department) result[3] ).getDeptName() ); - s.delete( employee1 ); - s.delete( title1 ); - s.delete( result[3] ); - s.delete( employee2 ); - s.delete( title2 ); + s.remove( employee1 ); + s.remove( title1 ); + s.remove( result[3] ); + s.remove( employee2 ); + s.remove( title2 ); s.getTransaction().commit(); s.close(); } @@ -1641,7 +1641,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { ps.getGeneralProperties().put( "the loneliest number", loneliestNumberValue ); ps.getGeneralProperties().put( "i like", new StringPropertyValue( "pina coladas" ) ); ps.getGeneralProperties().put( "i also like", new StringPropertyValue( "getting caught in the rain" ) ); - s.save( ps ); + s.persist( ps ); s.getTransaction().commit(); id = ps.getId(); @@ -1657,7 +1657,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s.createQuery( "from PropertySet p join p.generalProperties gp where gp.id is not null" ).list(); - s.delete( s.load( PropertySet.class, id ) ); + s.remove( s.load( PropertySet.class, id ) ); s.getTransaction().commit(); s.close(); @@ -1899,9 +1899,9 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( tiger ); - s.delete( mother ); - s.delete( zoo ); + s.remove( tiger ); + s.remove( mother ); + s.remove( zoo ); s.getTransaction().commit(); s.close(); } @@ -2072,7 +2072,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals(result4, 4); assertEquals(result5, 2); assertEquals(result6, 4); - s.delete(zoo); + s.remove(zoo); t.commit(); s.close(); } @@ -2112,8 +2112,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s.createQuery("select (select max(z.id) from a.zoo z where z.name=:name) from Animal a") .setParameter("name", "Melbourne Zoo").list(); - s.delete( plat ); - s.delete(zoo); + s.remove( plat ); + s.remove(zoo); t.commit(); s.close(); } @@ -2133,7 +2133,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Object plat2 = s.createQuery("from Animal a").uniqueResult(); assertSame( plat, plat2 ); assertTrue( Hibernate.isInitialized( plat ) ); - s.delete( plat ); + s.remove( plat ); t.commit(); s.close(); } @@ -2167,8 +2167,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals( zoo.getMammals().size(), 1 ); assertEquals( zoo.getAnimals().size(), 1 ); s.clear(); - s.delete(plat); - s.delete(zoo); + s.remove(plat); + s.remove(zoo); t.commit(); s.close(); } @@ -2242,11 +2242,11 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals( 1, zoos.get( 1 ).getMammals().size() ); assertEquals( 1, zoos.get( 1 ).getAnimals().size() ); s.clear(); - s.delete(plat); - s.delete( zebra ); - s.delete( elephant ); - s.delete(zoo); - s.delete( otherZoo ); + s.remove(plat); + s.remove( zebra ); + s.remove( elephant ); + s.remove(zoo); + s.remove( otherZoo ); t.commit(); s.close(); } @@ -2306,11 +2306,11 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals( 1, zoos.get( 1 ).getMammals().size() ); assertEquals( 1, zoos.get( 1 ).getAnimals().size() ); s.clear(); - s.delete(plat); - s.delete( zebra ); - s.delete( elephant ); - s.delete(zoo); - s.delete( otherZoo ); + s.remove(plat); + s.remove( zebra ); + s.remove( elephant ); + s.remove(zoo); + s.remove( otherZoo ); t.commit(); s.close(); } @@ -2344,8 +2344,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals( zoo.getMammals().size(), 1 ); assertEquals( zoo.getAnimals().size(), 1 ); s.clear(); - s.delete(plat); - s.delete(zoo); + s.remove(plat); + s.remove(zoo); t.commit(); s.close(); } @@ -2355,8 +2355,12 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Session s = openSession(); Transaction t = s.beginTransaction(); - Long id1 = ( Long ) s.save( genSimpleHuman( "John", "Jacob" ) ); - Long id2 = ( Long ) s.save( genSimpleHuman( "Jingleheimer", "Schmidt" ) ); + Human human1 = genSimpleHuman( "John", "Jacob" ); + s.persist( human1 ); + Long id1 = human1.getId(); + Human human2 = genSimpleHuman( "Jingleheimer", "Schmidt" ); + s.persist( human2 ); + Long id2 = human2.getId(); s.flush(); @@ -2370,8 +2374,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals( "Incorrect ordering", id2, h1.getId() ); assertEquals( "Incorrect ordering", id1, h2.getId() ); - s.delete( h1 ); - s.delete( h2 ); + s.remove( h1 ); + s.remove( h2 ); t.commit(); s.close(); @@ -2383,10 +2387,10 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); SimpleEntityWithAssociation first = new SimpleEntityWithAssociation(); first.setNegatedNumber( 1 ); - s.save( first ); + s.persist( first ); SimpleEntityWithAssociation second = new SimpleEntityWithAssociation(); second.setNegatedNumber(2); - s.save( second ); + s.persist( second ); s.flush(); // Check order via SQL. Numbers are negated in the DB, so second comes first. @@ -2401,8 +2405,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals(first.getId(), ((SimpleEntityWithAssociation)listViaHql.get(0)).getId()); assertEquals(second.getId(), ((SimpleEntityWithAssociation)listViaHql.get(1)).getId()); - s.delete( first ); - s.delete( second ); + s.remove( first ); + s.remove( second ); t.commit(); s.close(); } @@ -2414,15 +2418,15 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { SimpleEntityWithAssociation first = new SimpleEntityWithAssociation(); first.setNegatedNumber(5); first.setName( "simple" ); - s.save(first); + s.persist(first); SimpleEntityWithAssociation second = new SimpleEntityWithAssociation(); second.setNegatedNumber( 10 ); second.setName("simple"); - s.save(second); + s.persist(second); SimpleEntityWithAssociation third = new SimpleEntityWithAssociation(); third.setNegatedNumber( 20 ); third.setName( "complex" ); - s.save( third ); + s.persist( third ); s.flush(); // Check order via HQL. Now first comes first b/c the read negates the DB negation. @@ -2430,9 +2434,9 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { "group by name having sum(negatedNumber) < 20").uniqueResult(); assertEquals(r.intValue(), 15); - s.delete(first); - s.delete(second); - s.delete(third); + s.remove(first); + s.remove(second); + s.remove(third); t.commit(); s.close(); @@ -2463,13 +2467,13 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { final double NEW_SIZE_IN_KB = 2048d; final double NEW_SIZE_IN_MB = NEW_SIZE_IN_KB / 1024d; image.setSizeKb( NEW_SIZE_IN_KB ); - s.update( image ); + Image merged = s.merge( image ); s.flush(); sizeViaSql = ( (Number)s.createNativeQuery("select size_mb from image").uniqueResult() ).doubleValue(); assertEquals(NEW_SIZE_IN_MB, sizeViaSql, 0.01d); - s.delete(image); + s.remove( merged ); t.commit(); s.close(); } @@ -2500,7 +2504,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Object literal = s.createQuery("select cast(10000000 as big_integer) from Animal").uniqueResult(); assertTrue( BigInteger.class.isInstance( literal ) ); assertEquals( BigInteger.valueOf( 10000000 ), literal ); - s.delete(a); + s.remove(a); t.commit(); s.close(); } @@ -2607,7 +2611,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertTrue( "int * BigDecimal", BigDecimal.class.isInstance( result ) ); assertEquals( BigDecimal.valueOf( 1 ), result ); - s.delete(a); + s.remove(a); t.commit(); s.close(); } @@ -2644,7 +2648,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertThat( selections.get( 1 ).getSelectableNode(), instanceOf( SqmFunction.class ) ); assertThat( ( (SqmFunction) selections.get( 1 ).getSelectableNode() ).getFunctionName(), is( "avg" ) ); - s.delete(a); + s.remove(a); t.commit(); s.close(); } @@ -2727,7 +2731,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals(avg.doubleValue(), 120.5, 0.01); Long id = (Long) s.createQuery("select max(a.id) from Animal a").uniqueResult(); assertNotNull( id ); - s.delete( h ); + s.remove( h ); s.getTransaction().commit(); s.close(); @@ -2755,8 +2759,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { // avg() should return a double assertTrue( Double.class.isInstance( results[3] ) ); assertEquals( 1.5D, results[3] ); - s.delete(h); - s.delete(h2); + s.remove(h); + s.remove(h2); s.getTransaction().commit(); s.close(); } @@ -2776,7 +2780,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals(name, "gavin"); String result = (String) s.createQuery("select case when bodyWeight > 100 then 'fat' else 'skinny' end from Human").uniqueResult(); assertEquals(result, "skinny"); - s.delete(h); + s.remove(h); t.commit(); s.close(); } @@ -2792,12 +2796,12 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { product.setNumberAvailable( 10 ); product.setPrice( new BigDecimal( 123 ) ); product.setProductId( "4321" ); - s.save( product ); + s.persist( product ); List list = s.createQuery("from java.lang.Object").list(); assertEquals( list.size(), 1 ); - s.delete(product); + s.remove(product); list = s.createQuery("from java.lang.Object").list(); assertEquals( list.size(), 0 ); @@ -2841,7 +2845,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { } assertEquals( dp1[i], dp2[i] ); } - session.delete(an); + session.remove(an); txn.commit(); session.close(); } @@ -2903,7 +2907,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { results = session.createQuery("select lower(upper('foo')) from Animal").list(); results = session.createQuery("select lower(upper('foo') || upper('bar')) from Animal").list(); results = session.createQuery("select sum(abs(bodyWeight - 1.0) * abs(length('ffobar')-3)) from Animal").list(); - session.delete(h); + session.remove(h); txn.commit(); session.close(); destroyTestBaseData(); @@ -2917,14 +2921,14 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { m1.setBodyWeight( 11f ); m1.setDescription( "Mammal #1" ); - session.save( m1 ); + session.persist( m1 ); Mammal m2 = new Mammal(); m2.setBodyWeight( 9f ); m2.setDescription( "Mammal #2" ); m2.setMother( m1 ); - session.save( m2 ); + session.persist( m2 ); txn.commit(); session.close(); @@ -2939,7 +2943,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { for ( Long createdAnimalId : createdAnimalIds ) { Animal animal = session.load( Animal.class, createdAnimalId ); - session.delete( animal ); + session.remove( animal ); } txn.commit(); @@ -2967,9 +2971,9 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals( list.size(), 2 ); list = session.createQuery("from Animal a where a.mother.bodyWeight > 2.0 and a.mother.bodyWeight > 9.0").list(); assertEquals( list.size(), 2 ); - session.delete(b); - session.delete(a); - session.delete(mother); + session.remove(b); + session.remove(a); + session.remove(mother); t.commit(); session.close(); } @@ -3103,8 +3107,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Session session = openSession(); Transaction txn = session.beginTransaction(); - session.save( mammal ); - session.save( zoo ); + session.persist( mammal ); + session.persist( zoo ); txn.commit(); session.close(); @@ -3118,8 +3122,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertTrue( Hibernate.isInitialized( zooRead.getMammals() ) ); Mammal mammalRead = ( Mammal ) zooRead.getMammals().get( "zebra" ); assertEquals( mammal, mammalRead ); - session.delete( mammalRead ); - session.delete( zooRead ); + session.remove( mammalRead ); + session.remove( zooRead ); txn.commit(); session.close(); } @@ -3136,8 +3140,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Session session = openSession(); Transaction txn = session.beginTransaction(); - session.save( mammal ); - session.save( zoo ); + session.persist( mammal ); + session.persist( zoo ); txn.commit(); session.close(); @@ -3151,8 +3155,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Mammal mammalRead = ( Mammal ) resultObjects[ 1 ]; assertEquals( zoo, zooRead ); assertEquals( mammal, mammalRead ); - session.delete( mammalRead ); - session.delete( zooRead ); + session.remove( mammalRead ); + session.remove( zooRead ); txn.commit(); session.close(); } @@ -3169,8 +3173,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Session session = openSession(); Transaction txn = session.beginTransaction(); - session.save( mammal ); - session.save( zoo ); + session.persist( mammal ); + session.persist( zoo ); txn.commit(); session.close(); @@ -3184,8 +3188,8 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Mammal mammalRead = ( Mammal ) resultObjects[ 1 ]; assertEquals( zoo, zooRead ); assertEquals( mammal, mammalRead ); - session.delete( mammalRead ); - session.delete( zooRead ); + session.remove( mammalRead ); + session.remove( zooRead ); txn.commit(); session.close(); } @@ -3226,7 +3230,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertNotNull( result[0] ); assertNotNull( result[1] ); assertNotNull( result[2] ); - session.delete(p); + session.remove(p); t.commit(); session.close(); } @@ -3404,11 +3408,11 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { s = openSession(); s.getTransaction().begin(); - s.delete( employee1 ); - s.delete( title1 ); - s.delete( dept1 ); - s.delete( employee2 ); - s.delete( title2 ); + s.remove( employee1 ); + s.remove( title1 ); + s.remove( dept1 ); + s.remove( employee2 ); + s.remove( title2 ); s.getTransaction().commit(); s.close(); } @@ -3436,10 +3440,10 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Session s = openSession(); Transaction t = s.beginTransaction(); - s.save( mother ); - s.save( a ); - s.save( offspring1 ); - s.save( offspring2 ); + s.persist( mother ); + s.persist( a ); + s.persist( offspring1 ); + s.persist( offspring2 ); t.commit(); s.close(); @@ -3459,7 +3463,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals( 2, sessionFactory().getStatistics().getQueryCachePutCount() ); list = s.createQuery( "from Animal" ).list(); for(Object obj : list){ - s.delete( obj ); + s.remove( obj ); } t.commit(); s.close(); @@ -3488,10 +3492,10 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { Session s = openSession(); Transaction t = s.beginTransaction(); - s.save( mother ); - s.save( a ); - s.save( offspring1 ); - s.save( offspring2 ); + s.persist( mother ); + s.persist( a ); + s.persist( offspring1 ); + s.persist( offspring2 ); t.commit(); s.close(); @@ -3508,7 +3512,7 @@ public class ASTParserLoadingTest extends BaseCoreFunctionalTestCase { assertEquals( 2, sessionFactory().getStatistics().getQueryCachePutCount() ); list = s.createQuery( "from Animal" ).list(); for ( Object obj : list ) { - s.delete( obj ); + s.remove( obj ); } t.commit(); s.close(); 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 b06110b49c..6575e99adc 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 @@ -149,7 +149,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { Truck truck = new Truck(); truck.setVin( "123t" ); truck.setOwner( "Steve" ); - s.save( truck ); + s.persist( truck ); // manually flush the session to ensure the insert happens s.flush(); @@ -596,7 +596,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { Session s = openSession(); Transaction t = s.beginTransaction(); - s.save( zoo ); + s.persist( zoo ); t.commit(); s.close(); @@ -633,7 +633,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); IntegerVersioned entity = new IntegerVersioned( "int-vers" ); - s.save( entity ); + s.persist( entity ); s.createQuery( "select id, name, version from IntegerVersioned" ).list(); t.commit(); s.close(); @@ -676,7 +676,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); TimestampVersioned entity = new TimestampVersioned( "int-vers" ); - s.save( entity ); + s.persist( entity ); s.createQuery( "select id, name, version from TimestampVersioned" ).list(); t.commit(); s.close(); @@ -772,12 +772,12 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); Human joe = new Human(); joe.setName( new Name( "Joe", 'Q', "Public" ) ); - s.save( joe ); + s.persist( joe ); Human doll = new Human(); doll.setName( new Name( "Kyu", 'P', "Doll" ) ); doll.setFriends( new ArrayList() ); doll.getFriends().add( joe ); - s.save( doll ); + s.persist( doll ); t.commit(); s.close(); @@ -792,8 +792,8 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { ")"; int count = s.createQuery( updateQryString ).executeUpdate(); assertEquals( 1, count ); - s.delete( doll ); - s.delete( joe ); + s.remove( doll ); + s.remove( joe ); t.commit(); s.close(); @@ -806,7 +806,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { other.setName( "many-to-many-association" ); entity.getManyToManyAssociatedEntities().add( other ); entity.addAssociation( "one-to-many-association" ); - s.save( entity ); + s.persist( entity ); t.commit(); s.close(); @@ -834,8 +834,8 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { count = s.createQuery( updateQryString ).executeUpdate(); assertEquals( 1, count ); } - s.delete( entity.getManyToManyAssociatedEntities().iterator().next() ); - s.delete( entity ); + s.remove( entity.getManyToManyAssociatedEntities().iterator().next() ); + s.remove( entity ); t.commit(); s.close(); } @@ -846,7 +846,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); IntegerVersioned entity = new IntegerVersioned( "int-vers" ); - s.save( entity ); + s.persist( entity ); t.commit(); s.close(); @@ -862,7 +862,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { entity = (IntegerVersioned) s.load( IntegerVersioned.class, entity.getId() ); assertEquals( "version not incremented", initialVersion + 1, entity.getVersion() ); - s.delete( entity ); + s.remove( entity ); t.commit(); s.close(); } @@ -873,7 +873,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); TimestampVersioned entity = new TimestampVersioned( "ts-vers" ); - s.save( entity ); + s.persist( entity ); t.commit(); s.close(); @@ -897,7 +897,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { entity = (TimestampVersioned) s.load( TimestampVersioned.class, entity.getId() ); assertTrue( "version not incremented", entity.getVersion().after( initialVersion ) ); - s.delete( entity ); + s.remove( entity ); t.commit(); s.close(); } @@ -910,7 +910,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { Human human = new Human(); human.setName( new Name( "Stevee", 'X', "Ebersole" ) ); - s.save( human ); + s.persist( human ); s.flush(); t.commit(); @@ -1172,15 +1172,15 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { owner.addAssociation( "assoc-1" ); owner.addAssociation( "assoc-2" ); owner.addAssociation( "assoc-3" ); - s.save( owner ); + s.persist( owner ); SimpleEntityWithAssociation owner2 = new SimpleEntityWithAssociation( "myEntity-2" ); owner2.addAssociation( "assoc-1" ); owner2.addAssociation( "assoc-2" ); owner2.addAssociation( "assoc-3" ); owner2.addAssociation( "assoc-4" ); - s.save( owner2 ); + s.persist( owner2 ); SimpleEntityWithAssociation owner3 = new SimpleEntityWithAssociation( "myEntity-3" ); - s.save( owner3 ); + s.persist( owner3 ); s.getTransaction().commit(); s.close(); @@ -1422,13 +1422,13 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { crop.setName( "crop1" ); farm1.setCrops( new ArrayList() ); farm1.getCrops().add( crop ); - s.save( farm1 ); + s.persist( farm1 ); Farm farm2 = new Farm(); farm2.setName( "farm2" ); farm2.setCrops( new ArrayList() ); farm2.getCrops().add( crop ); - s.save( farm2 ); + s.persist( farm2 ); s.flush(); @@ -1455,13 +1455,13 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { Human friend = new Human(); friend.setName( new Name( "Bob", 'B', "Bobbert" ) ); - s.save( friend ); + s.persist( friend ); Human brett = new Human(); brett.setName( new Name( "Brett", 'E', "Meyer" ) ); brett.setFriends( new ArrayList() ); brett.getFriends().add( friend ); - s.save( brett ); + s.persist( brett ); s.flush(); @@ -1489,7 +1489,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { farm.setAccreditations( new HashSet<>() ); farm.getAccreditations().add( Farm.Accreditation.ORGANIC ); farm.getAccreditations().add( Farm.Accreditation.SUSTAINABLE ); - s.save( farm ); + s.persist( farm ); } ); @@ -1539,7 +1539,7 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { Human human = new Human(); human.setNickNames( new TreeSet() ); human.getNickNames().add( "Johnny" ); - s.save( human ); + s.persist( human ); } ); @@ -1612,20 +1612,20 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { catepillar.setMother( butterfly ); butterfly.addOffspring( catepillar ); - s.save( frog ); - s.save( polliwog ); - s.save( butterfly ); - s.save( catepillar ); + s.persist( frog ); + s.persist( polliwog ); + s.persist( butterfly ); + s.persist( catepillar ); Dog dog = new Dog(); dog.setBodyWeight( 200 ); dog.setDescription( "dog" ); - s.save( dog ); + s.persist( dog ); Cat cat = new Cat(); cat.setBodyWeight( 100 ); cat.setDescription( "cat" ); - s.save( cat ); + s.persist( cat ); zoo = new Zoo(); zoo.setName( "Zoo" ); @@ -1645,36 +1645,36 @@ public class BulkManipulationTest extends BaseCoreFunctionalTestCase { addr.setPostalCode( "2000" ); pettingZoo.setAddress( addr ); - s.save( zoo ); - s.save( pettingZoo ); + s.persist( zoo ); + s.persist( pettingZoo ); Joiner joiner = new Joiner(); joiner.setJoinedName( "joined-name" ); joiner.setName( "name" ); - s.save( joiner ); + s.persist( joiner ); Car car = new Car(); car.setVin( "123c" ); car.setOwner( "Kirsten" ); - s.save( car ); + s.persist( car ); Truck truck = new Truck(); truck.setVin( "123t" ); truck.setOwner( "Steve" ); - s.save( truck ); + s.persist( truck ); SUV suv = new SUV(); suv.setVin( "123s" ); suv.setOwner( "Joe" ); - s.save( suv ); + s.persist( suv ); Pickup pickup = new Pickup(); pickup.setVin( "123p" ); pickup.setOwner( "Cecelia" ); - s.save( pickup ); + s.persist( pickup ); BooleanLiteralEntity bool = new BooleanLiteralEntity(); - s.save( bool ); + s.persist( bool ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java index a384c346f4..c5170892ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/CollectionMapWithComponentValueTest.java @@ -6,6 +6,22 @@ */ package org.hibernate.orm.test.hql; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.hibernate.query.Query; + +import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + import jakarta.persistence.Column; import jakarta.persistence.ElementCollection; import jakarta.persistence.Embeddable; @@ -16,108 +32,94 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.hibernate.query.Query; - -import org.hibernate.testing.TestForIssue; -import org.junit.Test; - -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; - -import static org.hamcrest.MatcherAssert.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Fail.fail; import static org.hamcrest.core.Is.is; -import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping; -import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.hibernate.testing.orm.junit.ExtraAssertions.assertTyping; /** * @author Andrea Boriero * @author Christian Beikov */ -public class CollectionMapWithComponentValueTest extends BaseCoreFunctionalTestCase { + +@DomainModel( + annotatedClasses = { + CollectionMapWithComponentValueTest.BaseTestEntity.class, + CollectionMapWithComponentValueTest.TestEntity.class, + CollectionMapWithComponentValueTest.KeyValue.class + } +) +@SessionFactory +public class CollectionMapWithComponentValueTest { private final KeyValue keyValue = new KeyValue( "key1" ); private final EmbeddableValue embeddableValue = new EmbeddableValue( 3 ); - @Override - protected Class[] getAnnotatedClasses() { - return new Class[] { - BaseTestEntity.class, - TestEntity.class, - KeyValue.class - }; - } - @Override - protected void prepareTest() throws Exception { - doInHibernate( this::sessionFactory, s -> { + @BeforeAll + protected void prepareTest(SessionFactoryScope scope) { + scope.inTransaction( s -> { keyValue.base = null; - s.save( keyValue ); + s.persist( keyValue ); BaseTestEntity baseTestEntity1 = new BaseTestEntity(); TestEntity testEntity = new TestEntity(); Map map = new HashMap<>(); map.put( keyValue, embeddableValue ); testEntity.values = map; - s.save( testEntity ); - baseTestEntity1.entities = new HashSet(); + s.persist( testEntity ); + baseTestEntity1.entities = new HashSet<>(); baseTestEntity1.entities.add( testEntity ); - s.save( baseTestEntity1 ); + s.persist( baseTestEntity1 ); keyValue.base = baseTestEntity1; KeyValue keyValue2 = new KeyValue( "key2" ); - s.save( keyValue2 ); + s.persist( keyValue2 ); BaseTestEntity baseTestEntity2 = new BaseTestEntity(); - s.save( baseTestEntity2 ); + s.persist( baseTestEntity2 ); TestEntity testEntity2 = new TestEntity(); Map map2 = new HashMap<>(); map2.put( keyValue2, embeddableValue ); testEntity2.values = map2; - s.save( testEntity2 ); + s.persist( testEntity2 ); } ); } @Test - public void testMapKeyExpressionInWhere() { - doInHibernate( this::sessionFactory, s -> { + public void testMapKeyExpressionInWhere(SessionFactoryScope scope) { + scope.inTransaction( s -> { // JPA form Query query = s.createQuery( "select te from TestEntity te join te.values v where ?1 in (key(v)) " ); query.setParameter( 1, keyValue ); - assertThat( query.list().size(), is( 1 ) ); + assertThat( query.list().size() ).isEqualTo( 1 ); // Hibernate additional form query = s.createQuery( "select te from TestEntity te where ?1 in (key(te.values))" ); query.setParameter( 1, keyValue ); - assertThat( query.list().size(), is( 1 ) ); + assertThat( query.list().size() ).isEqualTo( 1 ); // Test key property dereference query = s.createQuery( "select te from TestEntity te join te.values v where key(v).name in :names" ); query.setParameterList( "names", Arrays.asList( keyValue.name ) ); - assertThat( query.list().size(), is( 1 ) ); + assertThat( query.list().size() ).isEqualTo( 1 ); } ); } @Test @TestForIssue(jiraKey = "HHH-10577") - public void testMapValueExpressionInWhere() { - doInHibernate( this::sessionFactory, s -> { + public void testMapValueExpressionInWhere(SessionFactoryScope scope) { + scope.inTransaction( s -> { // JPA form try { Query query = s.createQuery( "select te from TestEntity te join te.values v where ? in (value(v))" ); query.setParameter( 0, new EmbeddableValue( 3 ) ); - assertThat( query.list().size(), is( 2 ) ); + assertThat( query.list().size() ).isEqualTo( 2 ); fail( "HibernateException expected - Could not determine type for EmbeddableValue" ); } - catch ( Exception e ) { + catch (Exception e) { assertTyping( IllegalArgumentException.class, e ); } @@ -125,129 +127,136 @@ public class CollectionMapWithComponentValueTest extends BaseCoreFunctionalTestC try { Query query = s.createQuery( "select te from TestEntity te where ? in (value(te.values))" ); query.setParameter( 0, new EmbeddableValue( 3 ) ); - assertThat( query.list().size(), is( 2 ) ); + assertThat( query.list().size() ).isEqualTo( 2 ); fail( "HibernateException expected - Could not determine type for EmbeddableValue" ); } - catch ( Exception e ) { + catch (Exception e) { assertTyping( IllegalArgumentException.class, e ); } // Test value property dereference Query query = s.createQuery( "select te from TestEntity te join te.values v where value(v).value in :values" ); query.setParameterList( "values", Arrays.asList( 3 ) ); - assertThat( query.list().size(), is( 2 ) ); + assertThat( query.list().size() ).isEqualTo( 2 ); } ); } @Test - public void testMapKeyExpressionInSelect() { - doInHibernate( this::sessionFactory, s -> { + public void testMapKeyExpressionInSelect(SessionFactoryScope scope) { + scope.inTransaction( s -> { // JPA form List results = s.createQuery( "select key(v) from TestEntity te join te.values v" ).list(); - assertEquals( 2, results.size() ); + assertThat( results.size() ).isEqualTo( 2 ); assertTyping( KeyValue.class, results.get( 0 ) ); // Hibernate additional form results = s.createQuery( "select key(te.values) from TestEntity te" ).list(); - assertEquals( 2, results.size() ); + assertThat( results.size() ).isEqualTo( 2 ); assertTyping( KeyValue.class, results.get( 0 ) ); } ); } @Test - public void testMapValueExpressionInSelect() { - doInHibernate( this::sessionFactory, s -> { + public void testMapValueExpressionInSelect(SessionFactoryScope scope) { + scope.inTransaction( s -> { List addresses = s.createQuery( "select value(v) from TestEntity te join te.values v" ).list(); - assertEquals( 2, addresses.size() ); + assertThat( addresses.size() ).isEqualTo( 2 ); assertTyping( EmbeddableValue.class, addresses.get( 0 ) ); addresses = s.createQuery( "select value(te.values) from TestEntity te" ).list(); - assertEquals( 2, addresses.size() ); + assertThat( addresses.size() ).isEqualTo( 2 ); assertTyping( EmbeddableValue.class, addresses.get( 0 ) ); } ); } @Test - public void testMapEntryExpressionInSelect() { - doInHibernate( this::sessionFactory, s -> { + public void testMapEntryExpressionInSelect(SessionFactoryScope scope) { + scope.inTransaction( s -> { List addresses = s.createQuery( "select entry(v) from TestEntity te join te.values v" ).list(); - assertEquals( 2, addresses.size() ); + assertThat( addresses.size() ).isEqualTo( 2 ); assertTyping( Map.Entry.class, addresses.get( 0 ) ); addresses = s.createQuery( "select entry(te.values) from TestEntity te" ).list(); - assertEquals( 2, addresses.size() ); + assertThat( addresses.size() ).isEqualTo( 2 ); assertTyping( Map.Entry.class, addresses.get( 0 ) ); } ); } @Test @TestForIssue(jiraKey = "HHH-10577") - public void testMapKeyExpressionDereferenceInSelect() { - doInHibernate( this::sessionFactory, s -> { - List keyValueNames = s.createQuery( "select key(v).name as name from TestEntity te join te.values v order by name", String.class ).getResultList(); - assertEquals( 2, keyValueNames.size() ); - assertEquals( "key1", keyValueNames.get( 0 ) ); - assertEquals( "key2", keyValueNames.get( 1 ) ); + public void testMapKeyExpressionDereferenceInSelect(SessionFactoryScope scope) { + scope.inTransaction( s -> { + List keyValueNames = s.createQuery( + "select key(v).name as name from TestEntity te join te.values v order by name", + String.class + ).getResultList(); + assertThat( keyValueNames.size() ).isEqualTo( 2 ); + assertThat( keyValueNames.get( 0 ) ).isEqualTo( "key1" ); + assertThat( keyValueNames.get( 1 ) ).isEqualTo( "key2" ); } ); } @Test @TestForIssue(jiraKey = "HHH-10537") - public void testLeftJoinMapAndUseKeyExpression() { - doInHibernate( this::sessionFactory, s -> { + public void testLeftJoinMapAndUseKeyExpression(SessionFactoryScope scope) { + scope.inTransaction( s -> { // Assert that a left join is used for joining the map key entity table - List keyValues= s.createQuery( "select key(v) from BaseTestEntity bte left join bte.entities te left join te.values v" ).list(); + List keyValues = s.createQuery( + "select key(v) from BaseTestEntity bte left join bte.entities te left join te.values v" ).list(); System.out.println( keyValues ); - assertEquals( 2, keyValues.size() ); + assertThat( keyValues.size() ).isEqualTo( 2 ); } ); } @Test @TestForIssue(jiraKey = "HHH-11433") - public void testJoinMapValue() { - doInHibernate( this::sessionFactory, s -> { + public void testJoinMapValue(SessionFactoryScope scope) { + scope.inTransaction( s -> { // Assert that a left join is used for joining the map key entity table - List keyValues= s.createQuery( "select v from BaseTestEntity bte left join bte.entities te left join te.values v" ).list(); + List keyValues = s.createQuery( + "select v from BaseTestEntity bte left join bte.entities te left join te.values v" ).list(); System.out.println( keyValues ); - assertEquals( 2, keyValues.size() ); + assertThat( keyValues.size() ).isEqualTo( 2 ); } ); } @Test @TestForIssue(jiraKey = "HHH-11433") - public void testJoinMapKey() { - doInHibernate( this::sessionFactory, s -> { + public void testJoinMapKey(SessionFactoryScope scope) { + scope.inTransaction( s -> { // Assert that a left join is used for joining the map key entity table - List keyValues= s.createQuery( "select k from BaseTestEntity bte left join bte.entities te left join te.values v left join key(v) k" ).list(); + List keyValues = s.createQuery( + "select k from BaseTestEntity bte left join bte.entities te left join te.values v left join key(v) k" ) + .list(); System.out.println( keyValues ); - assertEquals( 2, keyValues.size() ); + assertThat( keyValues.size() ).isEqualTo( 2 ); } ); } @Test @TestForIssue(jiraKey = "HHH-11433") - public void testJoinMapKeyAssociation() { - doInHibernate( this::sessionFactory, s -> { - List keyValues= s.createQuery( "select b from BaseTestEntity bte left join bte.entities te left join te.values v left join key(v) k join k.base b" ).list(); + public void testJoinMapKeyAssociation(SessionFactoryScope scope) { + scope.inTransaction( s -> { + List keyValues = s.createQuery( + "select b from BaseTestEntity bte left join bte.entities te left join te.values v left join key(v) k join k.base b" ) + .list(); System.out.println( keyValues ); - assertEquals( 1, keyValues.size() ); + assertThat( keyValues.size() ).isEqualTo( 1 ); } ); } @Test @TestForIssue(jiraKey = "HHH-11433") - public void testJoinMapKeyAssociationImplicit() { - doInHibernate( this::sessionFactory, s -> { - List keyValues= s.createQuery( "select b from BaseTestEntity bte left join bte.entities te left join te.values v join key(v).base b" ).list(); + public void testJoinMapKeyAssociationImplicit(SessionFactoryScope scope) { + scope.inTransaction( s -> { + List keyValues = s.createQuery( + "select b from BaseTestEntity bte left join bte.entities te left join te.values v join key(v).base b" ) + .list(); System.out.println( keyValues ); - assertEquals( 1, keyValues.size() ); + assertThat( keyValues.size() ).isEqualTo( 1 ); } ); } - @Override - protected boolean isCleanupTestDataRequired() { - return true; - } @Entity(name = "BaseTestEntity") @Table(name = "BASE_TEST_ENTITY") diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/FunctionNameAsColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/FunctionNameAsColumnTest.java index a981beb261..ca94a323ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/FunctionNameAsColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/FunctionNameAsColumnTest.java @@ -118,7 +118,7 @@ public class FunctionNameAsColumnTest extends BaseCoreFunctionalTestCase { EntityWithFunctionAsColumnHolder holder2 = new EntityWithFunctionAsColumnHolder(); holder2.getEntityWithArgFunctionAsColumns().add( e2 ); holder1.setNextHolder( holder2 ); - s.save( holder1 ); + s.persist( holder1 ); } ); @@ -161,7 +161,7 @@ public class FunctionNameAsColumnTest extends BaseCoreFunctionalTestCase { EntityWithFunctionAsColumnHolder holder2 = new EntityWithFunctionAsColumnHolder(); holder2.getEntityWithArgFunctionAsColumns().add( e2 ); holder1.setNextHolder( holder2 ); - s.save( holder1 ); + s.persist( holder1 ); } ); @@ -219,7 +219,7 @@ public class FunctionNameAsColumnTest extends BaseCoreFunctionalTestCase { EntityWithFunctionAsColumnHolder holder2 = new EntityWithFunctionAsColumnHolder(); holder2.getEntityWithNoArgFunctionAsColumns().add( e2 ); holder1.setNextHolder( holder2 ); - s.save( holder1 ); + s.persist( holder1 ); } ); @@ -274,7 +274,7 @@ public class FunctionNameAsColumnTest extends BaseCoreFunctionalTestCase { holder1.getEntityWithNoArgFunctionAsColumns().add( e1 ); holder2.getEntityWithNoArgFunctionAsColumns().add( e2 ); holder1.setNextHolder( holder2 ); - s.save( holder1 ); + s.persist( holder1 ); } ); @@ -333,7 +333,7 @@ public class FunctionNameAsColumnTest extends BaseCoreFunctionalTestCase { EntityWithFunctionAsColumnHolder holder2 = new EntityWithFunctionAsColumnHolder(); holder2.getEntityWithNoArgFunctionAsColumns().add( e2 ); holder1.setNextHolder( holder2 ); - s.save( holder1 ); + s.persist( holder1 ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java index 1d62862a0d..e1e015f5b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/IndicesTest.java @@ -36,12 +36,12 @@ public class IndicesTest extends BaseNonConfigCoreFunctionalTestCase { Project project = new Project(1); Role role = new Role(1); - session.save( project ); - session.save( role ); + session.persist( project ); + session.persist( role ); Person person = new Person(1, project, role); - session.save( person ); + session.persist( person ); }); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapFunctionExpressionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapFunctionExpressionsTest.java index 9fb63458ef..0eebb8b489 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapFunctionExpressionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/MapFunctionExpressionsTest.java @@ -57,10 +57,10 @@ public class MapFunctionExpressionsTest extends BaseNonConfigCoreFunctionalTestC Session s = openSession(); s.getTransaction().begin(); - s.delete( s.get( Contact.class, 1 ) ); + s.remove( s.get( Contact.class, 1 ) ); - s.delete( s.get( Address.class, 1 ) ); - s.delete( s.get( AddressType.class, 1 ) ); + s.remove( s.get( Address.class, 1 ) ); + s.remove( s.get( AddressType.class, 1 ) ); s.getTransaction().commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java index 4463a3a9a6..75dbc2019f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ParameterCollectionTest.java @@ -42,7 +42,7 @@ public class ParameterCollectionTest extends BaseCoreFunctionalTestCase { try { for ( int i = 0; i < 20; i++ ) { Person p1 = new Person( i, "p" + i ); - session.save( p1 ); + session.persist( p1 ); } session.getTransaction().commit(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java index fcd2fe142f..c98bb90eb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/ScrollableCollectionFetchingTest.java @@ -179,8 +179,8 @@ public class ScrollableCollectionFetchingTest { daughter.setMother( mother ); mother.addOffspring( daughter ); - session.save( mother ); - session.save( daughter ); + session.persist( mother ); + session.persist( daughter ); } ); @@ -433,12 +433,12 @@ public class ScrollableCollectionFetchingTest { grandDaughter.setMother( daughter ); daughter.addOffspring( grandDaughter ); - session.save( mother ); - session.save( another ); - session.save( son ); - session.save( daughter ); - session.save( grandson ); - session.save( grandDaughter ); + session.persist( mother ); + session.persist( another ); + session.persist( son ); + session.persist( daughter ); + session.persist( grandson ); + session.persist( grandDaughter ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java index cd870d89ca..94ed9bbe65 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/TreatKeywordTest.java @@ -79,10 +79,10 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { // clean up test data s = openSession(); s.getTransaction().begin(); - s.delete( petCat ); - s.delete( petDog ); - s.delete( wildDog ); - s.delete( owner ); + s.remove( petCat ); + s.remove( petDog ); + s.remove( wildDog ); + s.remove( owner ); s.getTransaction().commit(); s.close(); } 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 0d727b98cd..da9ea96cab 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 @@ -259,12 +259,12 @@ public class WithClauseTest { father.getFriends().add( friend ); father.getFriends().add( friend2 ); - session.save( mother ); - session.save( father ); - session.save( child1 ); - session.save( child2 ); - session.save( friend ); - session.save( friend2 ); + session.persist( mother ); + session.persist( father ); + session.persist( child1 ); + session.persist( child2 ); + session.persist( friend ); + session.persist( friend2 ); father.setFamily( new HashMap() ); father.getFamily().put( "son1", child1 ); @@ -282,12 +282,12 @@ public class WithClauseTest { father.getFamily().clear(); session.flush(); } - session.delete( session.createQuery( "from Human where description = 'friend2'" ).uniqueResult() ); - session.delete( session.createQuery( "from Human where description = 'friend'" ).uniqueResult() ); - session.delete( session.createQuery( "from Human where description = 'child1'" ).uniqueResult() ); - session.delete( session.createQuery( "from Human where description = 'child2'" ).uniqueResult() ); - session.delete( session.createQuery( "from Human where description = 'mother'" ).uniqueResult() ); - session.delete( father ); + session.remove( session.createQuery( "from Human where description = 'friend2'" ).uniqueResult() ); + session.remove( session.createQuery( "from Human where description = 'friend'" ).uniqueResult() ); + session.remove( session.createQuery( "from Human where description = 'child1'" ).uniqueResult() ); + session.remove( session.createQuery( "from Human where description = 'child2'" ).uniqueResult() ); + session.remove( session.createQuery( "from Human where description = 'mother'" ).uniqueResult() ); + session.remove( father ); session.createQuery( "delete Animal" ).executeUpdate(); session.createQuery( "delete SimpleAssociatedEntity" ).executeUpdate(); session.createQuery( "delete SimpleEntityWithAssociation" ).executeUpdate(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java index 0605966cc4..1cec69ab51 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/hqlfetchscroll/HQLScrollFetchTest.java @@ -297,7 +297,7 @@ public class HQLScrollFetchTest { scope.inTransaction( session -> { Parent p0 = new Parent( "parent0" ); - session.save( p0 ); + session.persist( p0 ); } ); @@ -329,7 +329,7 @@ public class HQLScrollFetchTest { scope.inTransaction( session -> { Parent p0 = new Parent( "parent0" ); - session.save( p0 ); + session.persist( p0 ); } ); @@ -376,12 +376,12 @@ public class HQLScrollFetchTest { Child child_2_2 = new Child( "cchild2-2" ); Child child_2_3 = new Child( "zchild2-3" ); - session.save( child_1_1 ); - session.save( child_2_1 ); - session.save( child_1_2 ); - session.save( child_2_2 ); - session.save( child_1_3 ); - session.save( child_2_3 ); + session.persist( child_1_1 ); + session.persist( child_2_1 ); + session.persist( child_1_2 ); + session.persist( child_2_2 ); + session.persist( child_1_3 ); + session.persist( child_2_3 ); session.flush(); @@ -389,13 +389,13 @@ public class HQLScrollFetchTest { p1.addChild( child_1_1 ); p1.addChild( child_1_2 ); p1.addChild( child_1_3 ); - session.save( p1 ); + session.persist( p1 ); Parent p2 = new Parent( "parent2" ); p2.addChild( child_2_1 ); p2.addChild( child_2_2 ); p2.addChild( child_2_3 ); - session.save( p2 ); + session.persist( p2 ); } ); } @@ -406,7 +406,7 @@ public class HQLScrollFetchTest { session -> { List list = session.createQuery( "from Parent" ).list(); for ( Iterator i = list.iterator(); i.hasNext(); ) { - session.delete( i.next() ); + session.remove( i.next() ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java index 83c5a3406d..4ad57f2de5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/CreateDeleteTest.java @@ -35,7 +35,7 @@ public class CreateDeleteTest { session.setHibernateFlushMode( FlushMode.COMMIT ); RootEntity entity = new RootEntity(); session.persist( entity ); - session.delete( entity ); + session.remove( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java index a296e5f967..8c86b0177b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/ByteArrayIdTest.java @@ -80,8 +80,8 @@ public class ByteArrayIdTest { session -> { Query query = session.createQuery( "SELECT s FROM ByteArrayIdTest$DemoEntity s" ); List results = query.list(); - session.delete( results.get( 0 ) ); - session.delete( results.get( 1 ) ); + session.remove( results.get( 0 ) ); + session.remove( results.get( 1 ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java index 446158ae9c..dc0247efe6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/CharacterArrayIdTest.java @@ -75,8 +75,8 @@ public class CharacterArrayIdTest { session -> { Query query = session.createQuery( "SELECT s FROM CharacterArrayIdTest$DemoEntity s" ); List results = query.list(); - session.delete( results.get( 0 ) ); - session.delete( results.get( 1 ) ); + session.remove( results.get( 0 ) ); + session.remove( results.get( 1 ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java index fdc58d6266..e25001b056 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveByteArrayIdTest.java @@ -78,8 +78,8 @@ public class PrimitiveByteArrayIdTest { session -> { Query query = session.createQuery( "SELECT s FROM PrimitiveByteArrayIdTest$DemoEntity s" ); List results = query.list(); - session.delete( results.get( 0 ) ); - session.delete( results.get( 1 ) ); + session.remove( results.get( 0 ) ); + session.remove( results.get( 1 ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java index fbec5b3313..59561e4da0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/array/PrimitiveCharacterArrayIdTest.java @@ -73,8 +73,8 @@ public class PrimitiveCharacterArrayIdTest { session -> { Query query = session.createQuery( "SELECT s FROM PrimitiveCharacterArrayIdTest$DemoEntity s" ); List results = query.list(); - session.delete( results.get( 0 ) ); - session.delete( results.get( 1 ) ); + session.remove( results.get( 0 ) ); + session.remove( results.get( 1 ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java index a06d6434d9..3cb21415d3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/OptimizerTest.java @@ -38,7 +38,7 @@ public class OptimizerTest { session -> { for ( int i = 0; i < 100; i++ ) { TheEntity entity = new TheEntity( Integer.toString( i ) ); - session.save( entity ); + session.persist( entity ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java index 4df3bf9202..71cb09d7e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeComparableIdTest.java @@ -60,8 +60,8 @@ public class UserTypeComparableIdTest { scope.inTransaction( session -> { - session.delete( session.get( SomeEntity.class, e1.getCustomId() ) ); - session.delete( session.get( SomeEntity.class, e2.getCustomId() ) ); + session.remove( session.get( SomeEntity.class, e1.getCustomId() ) ); + session.remove( session.get( SomeEntity.class, e2.getCustomId() ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java index 69742e37bf..7b25f5c466 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/UserTypeNonComparableIdTest.java @@ -53,8 +53,8 @@ public class UserTypeNonComparableIdTest { scope.inTransaction( session -> { - session.delete( session.get( SomeEntity.class, e1.getCustomId() ) ); - session.delete( session.get( SomeEntity.class, e2.getCustomId() ) ); + session.remove( session.get( SomeEntity.class, e1.getCustomId() ) ); + session.remove( session.get( SomeEntity.class, e2.getCustomId() ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java index ff74b6dbf3..99c64cb1ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/GeneratedValueTest.java @@ -72,7 +72,7 @@ public class GeneratedValueTest { Session s = sf.openSession(); s.beginTransaction(); try { - s.save( theEntity ); + s.persist( theEntity ); s.getTransaction().commit(); s.close(); @@ -81,7 +81,7 @@ public class GeneratedValueTest { s = sf.openSession(); s.beginTransaction(); - s.delete( theEntity ); + s.remove( theEntity ); s.getTransaction().commit(); } catch (Exception e) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java index e59b38b77e..d563a19749 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlbinary/UUIDBinaryTest.java @@ -60,11 +60,11 @@ public class UUIDBinaryTest { final UUIDPair uuidPair = scope.fromTransaction( session -> { final Node root = new Node( "root" ); - session.save( root ); + session.persist( root ); assertThat( root.id, notNullValue()); final Node child = new Node( "child", root ); - session.save( child ); + session.persist( child ); assertThat( child.id, notNullValue() ); return new UUIDPair(root.id, child.id); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharAnnotationTest.java index 1308e9832d..dc4af182fa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharAnnotationTest.java @@ -57,11 +57,11 @@ public class UuidAsCharAnnotationTest { final UUIDPair uuidPair = scope.fromTransaction( session -> { final Node root = new Node( "root" ); - session.save( root ); + session.persist( root ); assertThat( root.id, notNullValue()); final Node child = new Node( "child", root ); - session.save( child ); + session.persist( child ); assertThat( child.id, notNullValue() ); return new UUIDPair( root.id, child.id ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharSettingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharSettingTest.java index 82b1fb35fb..9cd672dc41 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharSettingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/sqlrep/sqlchar/UuidAsCharSettingTest.java @@ -73,11 +73,11 @@ public class UuidAsCharSettingTest { final UUIDPair uuidPair = scope.fromTransaction( session -> { final Node root = new Node( "root" ); - session.save( root ); + session.persist( root ); assertThat( root.id, notNullValue()); final Node child = new Node( "child", root ); - session.save( child ); + session.persist( child ); assertThat( child.id, notNullValue() ); return new UUIDPair( root.id, child.id ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java index 8fa0746c44..8afbda2ead 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/strategy/CustomStrategyTest.java @@ -42,7 +42,7 @@ public class CustomStrategyTest { public void testUsage(SessionFactoryScope scope) { scope.inTransaction( session -> { Node node = new Node(); - session.save( node ); + session.persist( node ); assertThat(node.id, notNullValue()); assertThat(node.id.variant(), is(2)); assertThat(node.id.version(), is(1)); 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 7c006b492d..69c9fe7881 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 @@ -63,11 +63,11 @@ public class IdBagTest { gavin.getGroups().remove( plebs ); //gavin.getGroups().add(banned); - s.delete( plebs ); - s.delete( banned ); - s.delete( s.load( Group.class, "moderators" ) ); - s.delete( admins ); - s.delete( gavin ); + s.remove( plebs ); + s.remove( banned ); + s.remove( s.load( Group.class, "moderators" ) ); + s.remove( admins ); + s.remove( gavin ); } ); } @@ -95,9 +95,9 @@ public class IdBagTest { assertEquals( 2, gavin.getGroups().size() ); assertEquals( "admins", ( (Group) gavin.getGroups().get( 0 ) ).getName() ); - session.delete( gavin.getGroups().get( 0 ) ); - session.delete( gavin.getGroups().get( 1 ) ); - session.delete( gavin ); + session.remove( gavin.getGroups().get( 0 ) ); + session.remove( gavin.getGroups().get( 1 ) ); + session.remove( gavin ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java index df226c2417..722785d3e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassTest.java @@ -40,7 +40,7 @@ public class IdClassTest { SystemUser systemUser = new SystemUser(); systemUser.setId( pk ); systemUser.setName( "Andrea" ); - session.save( systemUser ); + session.persist( systemUser ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java index e5186085c7..6ee2548112 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithEagerManyToOneTest.java @@ -44,8 +44,8 @@ public class IdClassWithEagerManyToOneTest { session -> { Subsystem subsystem = new Subsystem( "1", "Linux" ); SystemUser systemUser = new SystemUser( subsystem, "admin", "Andrea" ); - session.save( subsystem ); - session.save( systemUser ); + session.persist( subsystem ); + session.persist( systemUser ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java index a53fd1c509..71cdef28b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithLazyManyToOneTest.java @@ -46,8 +46,8 @@ public class IdClassWithLazyManyToOneTest { session -> { Subsystem subsystem = new Subsystem( "1", "Linux" ); SystemUser systemUser = new SystemUser( subsystem, "admin", "Andrea" ); - session.save( subsystem ); - session.save( systemUser ); + session.persist( subsystem ); + session.persist( systemUser ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java index 2628c43e8d..dd7af0a8de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneAttributeTest.java @@ -31,7 +31,7 @@ public class IdClassWithOneAttributeTest { SystemUser systemUser = new SystemUser(); systemUser.setId( pk ); systemUser.setName( "Andrea" ); - session.save( systemUser ); + session.persist( systemUser ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java index 75c5e05471..564baa394e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idclass/IdClassWithOneToOneTest.java @@ -36,7 +36,7 @@ public class IdClassWithOneToOneTest { scope.inTransaction( session -> { Task task = new Task(new TaskText("en", "Localized in en")); - session.save( task ); + session.persist( task ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java index 9d16aa2ffe..0b76ac4b52 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/increment/BigIntegerIncrementGeneratorTest.java @@ -30,9 +30,9 @@ public class BigIntegerIncrementGeneratorTest { scope.inTransaction( (session) -> { Entity entity = new Entity( "BigInteger + increment #1" ); - session.save( entity ); + session.persist( entity ); Entity entity2 = new Entity( "BigInteger + increment #2" ); - session.save( entity2 ); + session.persist( entity2 ); session.flush(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java index 00a2290ae8..83aa73d8b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/biginteger/sequence/BigIntegerSequenceGeneratorTest.java @@ -30,9 +30,9 @@ public class BigIntegerSequenceGeneratorTest { scope.inTransaction( (session) -> { Entity entity = new Entity( "BigInteger + sequence #1" ); - session.save( entity ); + session.persist( entity ); Entity entity2 = new Entity( "BigInteger + sequence #2" ); - session.save( entity2 ); + session.persist( entity2 ); // previously these checks were commented out due to the comment... diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java index c01beb152c..10be7c3d81 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/HiloOptimizerConcurrencyTest.java @@ -69,7 +69,7 @@ public class HiloOptimizerConcurrencyTest extends BaseNonConfigCoreFunctionalTes try { session1.beginTransaction(); HibPerson p = new HibPerson(); - session1.save( p ); + session1.persist( p ); } finally { session1.getTransaction().commit(); @@ -82,7 +82,7 @@ public class HiloOptimizerConcurrencyTest extends BaseNonConfigCoreFunctionalTes try { session2.beginTransaction(); HibPerson p = new HibPerson(); - session2.save( p ); + session2.persist( p ); } finally { session2.getTransaction().commit(); @@ -99,7 +99,7 @@ public class HiloOptimizerConcurrencyTest extends BaseNonConfigCoreFunctionalTes try { session1.beginTransaction(); HibPerson p = new HibPerson(); - session1.save( p ); + session1.persist( p ); } finally { session1.getTransaction().commit(); @@ -110,7 +110,7 @@ public class HiloOptimizerConcurrencyTest extends BaseNonConfigCoreFunctionalTes try { session1.beginTransaction(); HibPerson p = new HibPerson(); - session1.save( p ); + session1.persist( p ); } finally { session1.getTransaction().commit(); @@ -130,7 +130,7 @@ public class HiloOptimizerConcurrencyTest extends BaseNonConfigCoreFunctionalTes try { session2.beginTransaction(); HibPerson p = new HibPerson(); - session2.save( p ); + session2.persist( p ); } finally { session2.getTransaction().commit(); @@ -180,7 +180,7 @@ public class HiloOptimizerConcurrencyTest extends BaseNonConfigCoreFunctionalTes try { session1.beginTransaction(); HibPerson p = new HibPerson(); - session1.save( p ); + session1.persist( p ); } finally { session1.getTransaction().commit(); @@ -193,7 +193,7 @@ public class HiloOptimizerConcurrencyTest extends BaseNonConfigCoreFunctionalTes session2.beginTransaction(); try { HibPerson p = new HibPerson(); - session2.save( p ); + session2.persist( p ); } finally { session2.getTransaction().commit(); @@ -203,7 +203,7 @@ public class HiloOptimizerConcurrencyTest extends BaseNonConfigCoreFunctionalTes session1.beginTransaction(); try { HibPerson p = new HibPerson(); - session1.save( p ); + session1.persist( p ); } finally { session1.getTransaction().commit(); @@ -212,7 +212,7 @@ public class HiloOptimizerConcurrencyTest extends BaseNonConfigCoreFunctionalTes session2.beginTransaction(); try { HibPerson p = new HibPerson(); - session2.save( p ); + session2.persist( p ); } finally { session2.getTransaction().commit(); @@ -220,7 +220,7 @@ public class HiloOptimizerConcurrencyTest extends BaseNonConfigCoreFunctionalTes session1.beginTransaction(); try { HibPerson p = new HibPerson(); - session1.save( p ); + session1.persist( p ); } finally { session1.getTransaction().commit(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java index 032a092295..36233cf03e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/BasicForcedTableSequenceTest.java @@ -48,7 +48,7 @@ public class BasicForcedTableSequenceTest { for ( int i = 0; i < count; i++ ) { final Entity entity = new Entity( "" + ( i + 1 ) ); - session.save( entity ); + session.persist( entity ); long expectedId = i + 1; assertEquals( expectedId, entity.getId().longValue() ); assertEquals( expectedId, generator.getDatabaseStructure().getTimesAccessed() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java index 4f4506bb0a..cdbbac8812 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/HiLoForcedTableSequenceTest.java @@ -46,7 +46,7 @@ public class HiLoForcedTableSequenceTest { (s) -> { for ( int i = 0; i < increment; i++ ) { final Entity entity = new Entity( "" + ( i + 1 ) ); - s.save( entity ); + s.persist( entity ); long expectedId = i + 1; assertThat( entity.getId().longValue(), is( expectedId ) ); @@ -57,7 +57,7 @@ public class HiLoForcedTableSequenceTest { // now force a "clock over" final Entity entity = new Entity( "" + increment ); - s.save( entity ); + s.persist( entity ); long expectedId = optimizer.getIncrementSize() + 1; assertThat( entity.getId().longValue(), is( expectedId ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java index f4433b7e33..8c1a9c69f5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/forcedtable/PooledForcedTableSequenceTest.java @@ -49,7 +49,7 @@ public class PooledForcedTableSequenceTest { // The value that we get from the callback is the high value (PooledOptimizer by default) // When first increment is initialValue, we can only generate one id from it -> id 1 Entity entity = new Entity( "" + INITIAL_VALUE ); - s.save( entity ); + s.persist( entity ); long expectedId = INITIAL_VALUE; assertEquals( expectedId, entity.getId().longValue() ); @@ -62,7 +62,7 @@ public class PooledForcedTableSequenceTest { // id : 2,3,4...,11 for ( int i = 1; i <= increment; i++ ) { entity = new Entity( "" + ( i + INITIAL_VALUE ) ); - s.save( entity ); + s.persist( entity ); expectedId = i + INITIAL_VALUE; assertEquals( expectedId, entity.getId().longValue() ); @@ -75,7 +75,7 @@ public class PooledForcedTableSequenceTest { // now force a "clock over" expectedId++; entity = new Entity( "" + expectedId ); - s.save( entity ); + s.persist( entity ); assertEquals( expectedId, entity.getId().longValue() ); assertEquals( 3, generator.getDatabaseStructure().getTimesAccessed() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java index 632997f7e9..04f3cdea8a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/BasicSequenceTest.java @@ -50,7 +50,7 @@ public class BasicSequenceTest { (s) -> { for ( int i = 0; i < count; i++ ) { final Entity entity = new Entity( "" + ( i + 1 ) ); - s.save( entity ); + s.persist( entity ); long expectedId = i + 1; @@ -80,9 +80,9 @@ public class BasicSequenceTest { scope.inTransaction( (s) -> { Entity entity1 = new Entity( "1" ); - s.save( overriddenEntityName, entity1 ); + s.persist( overriddenEntityName, entity1 ); Entity entity2 = new Entity( "2" ); - s.save( overriddenEntityName, entity2 ); + s.persist( overriddenEntityName, entity2 ); assertEquals( 1, entity1.getId().intValue() ); assertEquals( 2, entity2.getId().intValue() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceTest.java index 73d3004692..1d01bffada 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/HiLoSequenceTest.java @@ -47,7 +47,7 @@ public class HiLoSequenceTest { (s) -> { for ( int i = 0; i < increment; i++ ) { final Entity entity = new Entity( "" + ( i + 1 ) ); - s.save( entity ); + s.persist( entity ); // initialization assertEquals( 1, generator.getDatabaseStructure().getTimesAccessed() ); @@ -59,7 +59,7 @@ public class HiLoSequenceTest { // now force a "clock over" final Entity entity = new Entity( "" + increment ); - s.save( entity ); + s.persist( entity ); assertEquals( 2, generator.getDatabaseStructure().getTimesAccessed() ); // initialization assertEquals( 2, ( (BasicHolder) optimizer.getLastSourceValue() ).getActualLongValue() ); // initialization assertEquals( increment + 1, ( (BasicHolder) optimizer.getLastValue() ).getActualLongValue() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/PooledSequenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/PooledSequenceTest.java index 5a2c0bac05..6b5beecbfe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/PooledSequenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/sequence/PooledSequenceTest.java @@ -48,7 +48,7 @@ public class PooledSequenceTest { // The value that we get from the callback is the high value (PooledOptimizer by default) // When first increment is initialValue, we can only generate one id from it -> id 1 Entity entity = new Entity( "" + INITIAL_VALUE ); - session.save( entity ); + session.persist( entity ); long expectedId = INITIAL_VALUE; assertEquals( expectedId, entity.getId().longValue() ); @@ -61,7 +61,7 @@ public class PooledSequenceTest { // id : 2,3,4...,11 for ( int i = 1; i <= increment; i++ ) { entity = new Entity( "" + ( i + INITIAL_VALUE ) ); - session.save( entity ); + session.persist( entity ); expectedId = i + INITIAL_VALUE; assertEquals( expectedId, entity.getId().longValue() ); @@ -74,7 +74,7 @@ public class PooledSequenceTest { // now force a "clock over" expectedId++; entity = new Entity( "" + expectedId ); - session.save( entity ); + session.persist( entity ); assertEquals( expectedId, entity.getId().longValue() ); assertEquals( 3, generator.getDatabaseStructure().getTimesAccessed() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/BasicTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/BasicTableTest.java index 000bd2e631..a7890a0f5d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/BasicTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/BasicTableTest.java @@ -38,7 +38,7 @@ public class BasicTableTest { int count = 5; for ( int i = 0; i < count; i++ ) { final Entity entity = new Entity( "" + ( i + 1 ) ); - s.save( entity ); + s.persist( entity ); long expectedId = i + 1; assertEquals( expectedId, entity.getId().longValue() ); assertEquals( expectedId, generator.getTableAccessCount() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/HiLoTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/HiLoTableTest.java index c9834ec28d..98249a9f9f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/HiLoTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/HiLoTableTest.java @@ -41,7 +41,7 @@ public class HiLoTableTest { (s) -> { for ( int i = 0; i < increment; i++ ) { final Entity entity = new Entity( "" + ( i + 1 ) ); - s.save( entity ); + s.persist( entity ); assertEquals( 1, generator.getTableAccessCount() ); // initialization assertEquals( 1, ( (BasicHolder) optimizer.getLastSourceValue() ).getActualLongValue() ); // initialization assertEquals( i + 1, ( (BasicHolder) optimizer.getLastValue() ).getActualLongValue() ); @@ -50,7 +50,7 @@ public class HiLoTableTest { // now force a "clock over" final Entity entity = new Entity( "" + increment ); - s.save( entity ); + s.persist( entity ); assertEquals( 2, generator.getTableAccessCount() ); // initialization assertEquals( 2, ( (BasicHolder) optimizer.getLastSourceValue() ).getActualLongValue() ); // initialization assertEquals( increment + 1, ( (BasicHolder) optimizer.getLastValue() ).getActualLongValue() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/PooledTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/PooledTableTest.java index d5f7464ceb..98340063c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/PooledTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/enhanced/table/PooledTableTest.java @@ -45,7 +45,7 @@ public class PooledTableTest { // The value that we get from the callback is the high value (PooledOptimizer by default) // When first increment is initialValue, we can only generate one id from it -> id 1 Entity entity = new Entity( "" + INITIAL_VALUE ); - s.save( entity ); + s.persist( entity ); long expectedId = INITIAL_VALUE; assertEquals( expectedId, entity.getId().longValue() ); @@ -58,7 +58,7 @@ public class PooledTableTest { // id : 2,3,4...,11 for ( int i = 1; i <= increment; i++ ) { entity = new Entity( "" + ( i + INITIAL_VALUE ) ); - s.save( entity ); + s.persist( entity ); expectedId = i + INITIAL_VALUE; assertEquals( expectedId, entity.getId().longValue() ); @@ -71,7 +71,7 @@ public class PooledTableTest { // now force a "clock over" expectedId++; entity = new Entity( "" + expectedId ); - s.save( entity ); + s.persist( entity ); assertEquals( expectedId, entity.getId().longValue() ); assertEquals( 3, generator.getTableAccessCount() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java index 25e57d52a4..21e94f2e3b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/hhh9983/SaveEntityTest.java @@ -37,7 +37,7 @@ public class SaveEntityTest { public void testSave(SessionFactoryScope scope) { scope.inTransaction( (s) -> { - s.save( new Company() ); + s.persist( new Company() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/JoinedSubclassHierarchyWithIdentityGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/JoinedSubclassHierarchyWithIdentityGenerationTest.java index e08ea7b28d..9a90668471 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/JoinedSubclassHierarchyWithIdentityGenerationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idgen/identity/joinedSubClass/JoinedSubclassHierarchyWithIdentityGenerationTest.java @@ -27,7 +27,7 @@ public class JoinedSubclassHierarchyWithIdentityGenerationTest { public void shouldPersistDebtorAccountWhenParentServiceAgreementPersisted(SessionFactoryScope scope) { scope.inTransaction( (s) -> { - s.save( new Sub() ); + s.persist( new Sub() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java index 8eec58f37f..74edbb5e1f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/idprops/IdentifierPropertyReferencesTest.java @@ -42,10 +42,10 @@ public class IdentifierPropertyReferencesTest { Order o = new Order( new Long( 1 ), p ); scope.inTransaction( s -> { - s.save( p ); + s.persist( p ); LineItem l = new LineItem( o, "my-product", 2 ); l.setId( "456" ); - s.save( o ); + s.persist( o ); } ); @@ -84,8 +84,8 @@ public class IdentifierPropertyReferencesTest { count = extractCount( s, "select count(*) from LineItem l where l.pk.order.orderee.pk = 1" ); assertEquals( 1, count ); - s.delete( o ); - s.delete( p ); + s.remove( o ); + s.remove( p ); } ); } 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 2836e9cd12..d9c9a44166 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 @@ -126,7 +126,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { inTransaction( s -> { - s.delete( contract ); + s.remove( contract ); assertAllContractAndVariationsAreDeleted( s ); } @@ -192,7 +192,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { inTransaction( s -> { - s.delete( contract ); + s.remove( contract ); assertAllContractAndVariationsAreDeleted( s ); } @@ -238,7 +238,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "more expensive", cv2.getText() ); assertTrue( s.isReadOnly( cv1 ) ); assertTrue( s.isReadOnly( cv2 ) ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -285,7 +285,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "more expensive", cv2.getText() ); assertTrue( s.isReadOnly( cv1 ) ); assertTrue( s.isReadOnly( cv2 ) ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -307,7 +307,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { inTransaction( s -> { - s.save( contract ); + s.persist( contract ); assertTrue( s.isReadOnly( contract ) ); assertTrue( s.isReadOnly( contractVariation1 ) ); assertTrue( s.isReadOnly( contractVariation2 ) ); @@ -331,53 +331,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "more expensive", cv2.getText() ); assertTrue( s.isReadOnly( cv1 ) ); assertTrue( s.isReadOnly( cv2 ) ); - s.delete( c ); - - assertAllContractAndVariationsAreDeleted( s ); - } - ); - - assertUpdateCount( 0 ); - assertDeleteCount( 3 ); - } - - @Test - public void testSaveOrUpdateImmutable() { - Contract contract = new Contract( null, "gavin", "phone" ); - ContractVariation contractVariation1 = new ContractVariation( 1, contract ); - contractVariation1.setText( "expensive" ); - ContractVariation contractVariation2 = new ContractVariation( 2, contract ); - contractVariation2.setText( "more expensive" ); - - clearCounts(); - - inTransaction( - s -> { - s.saveOrUpdate( contract ); - assertTrue( s.isReadOnly( contract ) ); - assertTrue( s.isReadOnly( contractVariation1 ) ); - assertTrue( s.isReadOnly( contractVariation2 ) ); - } - ); - - assertInsertCount( 3 ); - assertUpdateCount( 0 ); - clearCounts(); - - inTransaction( - s -> { - Contract c = getContract( s ); - assertTrue( s.isReadOnly( c ) ); - assertEquals( "gavin", c.getCustomerName() ); - assertEquals( 2, c.getVariations().size() ); - Iterator it = c.getVariations().iterator(); - ContractVariation cv1 = it.next(); - assertEquals( "expensive", cv1.getText() ); - ContractVariation cv2 = it.next(); - assertEquals( "more expensive", cv2.getText() ); - assertTrue( s.isReadOnly( cv1 ) ); - assertTrue( s.isReadOnly( cv2 ) ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -399,7 +353,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { inTransaction( s -> { - s.saveOrUpdate( contract ); + s.persist( contract ); assertTrue( s.isReadOnly( contract ) ); assertTrue( s.isReadOnly( contractVariation1 ) ); assertTrue( s.isReadOnly( contractVariation2 ) ); @@ -456,7 +410,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { inTransaction( s -> { - s.delete( contract ); + s.remove( contract ); assertAllContractAndVariationsAreDeleted( s ); } @@ -532,7 +486,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "more expensive", cv2.getText() ); assertTrue( s.isReadOnly( cv1 ) ); assertTrue( s.isReadOnly( cv2 ) ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -608,7 +562,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "more expensive", cv2.getText() ); assertTrue( s.isReadOnly( cv1 ) ); assertTrue( s.isReadOnly( cv2 ) ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); @@ -649,7 +603,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertTrue( s.isReadOnly( cv1 ) ); assertTrue( s.isReadOnly( cv2 ) ); c.setCustomerName( "Sherman" ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -689,7 +643,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertTrue( s.isReadOnly( cv1 ) ); assertTrue( s.isReadOnly( cv2 ) ); c.setCustomerName( "Sherman" ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); @@ -718,7 +672,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { inTransaction( s -> { - s.delete( contract ); + s.remove( contract ); Contract c = getContract( s ); assertNull( c ); } @@ -747,7 +701,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { inTransaction( s -> { contract.setCustomerName( "sherman" ); - s.delete( contract ); + s.remove( contract ); } ); @@ -777,14 +731,14 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { try { s.beginTransaction(); contract.setCustomerName( "foo bar" ); - s.update( contract ); - assertTrue( s.isReadOnly( contract ) ); - for ( Iterator it = contract.getVariations().iterator(); it.hasNext(); ) { + Contract merged = s.merge( contract ); + assertTrue( s.isReadOnly( merged ) ); + for ( Iterator it = merged.getVariations().iterator(); it.hasNext(); ) { assertTrue( s.contains( it.next() ) ); } s.getTransaction().commit(); - assertTrue( s.isReadOnly( contract ) ); - for ( Iterator it = contract.getVariations().iterator(); it.hasNext(); ) { + assertTrue( s.isReadOnly( merged ) ); + for ( Iterator it = merged.getVariations().iterator(); it.hasNext(); ) { ContractVariation cv = it.next(); assertTrue( s.contains( cv ) ); assertTrue( s.isReadOnly( cv ) ); @@ -811,7 +765,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "expensive", cv1.getText() ); ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -843,14 +797,13 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { s.beginTransaction(); ContractVariation cv1 = contract.getVariations().iterator().next(); cv1.setText( "blah blah" ); - s.update( contract ); - assertTrue( s.isReadOnly( contract ) ); - assertTrue( s.contains( cv1 ) ); - assertTrue( s.contains( contractVariation2 ) ); + Contract merged = s.merge( contract ); + assertTrue( s.isReadOnly( merged ) ); + assertEquals( 2, merged.getVariations().size() ); s.getTransaction().commit(); - assertTrue( s.isReadOnly( contract ) ); - assertTrue( s.isReadOnly( cv1 ) ); - assertTrue( s.isReadOnly( contractVariation2 ) ); + assertTrue( s.isReadOnly( merged ) ); + assertTrue( s.isReadOnly( merged.getVariations().get( 0 ) ) ); + assertTrue( s.isReadOnly( merged.getVariations().get( 1 ) ) ); } catch (Exception e) { if ( s.getTransaction().isActive() ) { @@ -873,7 +826,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "expensive", cv1.getText() ); ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -902,8 +855,8 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { s -> { s.beginTransaction(); contract.getVariations().add( new ContractVariation( 3, contract ) ); - s.update( contract ); try { + s.merge( contract ); s.getTransaction().commit(); fail( "should have failed because reassociated object has a dirty collection" ); } @@ -931,7 +884,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "expensive", cv1.getText() ); ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); @@ -984,7 +937,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "expensive", cv1.getText() ); ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } ); @@ -1035,7 +988,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "expensive", cv1.getText() ); ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -1088,7 +1041,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "expensive", cv1.getText() ); ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } ); @@ -1140,7 +1093,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "expensive", cv1.getText() ); ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -1150,53 +1103,6 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertDeleteCount( 3 ); } - @Test - public void testNewEntityViaImmutableEntityWithImmutableCollectionUsingSaveOrUpdate() { - Contract contract = new Contract( null, "gavin", "phone" ); - ContractVariation contractVariation1 = new ContractVariation( 1, contract ); - contractVariation1.setText( "expensive" ); - ContractVariation contractVariation2 = new ContractVariation( 2, contract ); - contractVariation2.setText( "more expensive" ); - - clearCounts(); - - inTransaction( s -> s.persist( contract ) ); - - assertInsertCount( 3 ); - assertUpdateCount( 0 ); - clearCounts(); - - inTransaction( - s -> { - contractVariation1.getInfos().add( new Info( "cv1 info" ) ); - s.saveOrUpdate( contract ); - } - ); - - assertInsertCount( 1 ); - assertUpdateCount( 0 ); - - inTransaction( - s -> { - Contract c = getContract( s ); - assertEquals( "gavin", c.getCustomerName() ); - assertEquals( 2, c.getVariations().size() ); - Iterator it = c.getVariations().iterator(); - ContractVariation cv1 = it.next(); - assertEquals( "expensive", cv1.getText() ); - assertEquals( 1, cv1.getInfos().size() ); - assertEquals( "cv1 info", ( (Info) cv1.getInfos().iterator().next() ).getText() ); - ContractVariation cv2 = it.next(); - assertEquals( "more expensive", cv2.getText() ); - s.delete( c ); - assertAllContractAndVariationsAreDeleted( s ); - } - ); - - assertUpdateCount( 0 ); - assertDeleteCount( 4 ); - } - @Test public void testNewEntityViaImmutableEntityWithImmutableCollectionUsingMerge() { Contract contract = new Contract( null, "gavin", "phone" ); @@ -1235,61 +1141,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "cv1 info", ( (Info) cv1.getInfos().iterator().next() ).getText() ); ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); - s.delete( c ); - assertAllContractAndVariationsAreDeleted( s ); - - } - ); - - assertUpdateCount( 0 ); - assertDeleteCount( 4 ); - } - - @Test - public void testUpdatedEntityViaImmutableEntityWithImmutableCollectionUsingSaveOrUpdate() { - clearCounts(); - - Contract contract = new Contract( null, "gavin", "phone" ); - ContractVariation contractVariation1 = new ContractVariation( 1, contract ); - contractVariation1.setText( "expensive" ); - Info cv1Info = new Info( "cv1 info" ); - contractVariation1.getInfos().add( cv1Info ); - ContractVariation contractVariation2 = new ContractVariation( 2, contract ); - contractVariation2.setText( "more expensive" ); - - inTransaction( s -> s.persist( contract ) ); - - - assertInsertCount( 4 ); - assertUpdateCount( 0 ); - clearCounts(); - - inTransaction( - s -> { - cv1Info.setText( "new cv1 info" ); - s.saveOrUpdate( contract ); - } - ); - - - assertInsertCount( 0 ); - assertUpdateCount( 1 ); - clearCounts(); - - inTransaction( - s -> { - Contract c = getContract( s ); - assertEquals( "gavin", c.getCustomerName() ); - assertEquals( c.getVariations().size(), 2 ); - Iterator it = c.getVariations().iterator(); - ContractVariation cv1 = it.next(); - assertEquals( "expensive", cv1.getText() ); - assertEquals( 1, cv1.getInfos().size() ); - assertEquals( "new cv1 info", ( (Info) cv1.getInfos().iterator().next() ).getText() ); - ContractVariation cv2 = it.next(); - assertEquals( "more expensive", cv2.getText() ); - s.delete( c ); - + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -1340,7 +1192,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertEquals( "new cv1 info", ( (Info) cv1.getInfos().iterator().next() ).getText() ); ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } ); @@ -1371,10 +1223,10 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { assertUpdateCount( 0 ); clearCounts(); - inTransaction( + Contract merged = fromTransaction( s -> { contract.addParty( new Party( "a new party" ) ); - s.update( contract ); + return s.merge( contract ); } ); @@ -1384,8 +1236,8 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { inTransaction( s -> { - contract.addParty( party ); - s.update( contract ); + merged.addParty( party ); + s.merge( merged ); } ); @@ -1400,7 +1252,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); //assertEquals( 2, c.getParties().size() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -1431,7 +1283,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { party = (Party) contract.getParties().iterator().next(); contract.removeParty( party ); - inTransaction( s -> s.update( contract ) ); + inTransaction( s -> s.merge( contract ) ); assertUpdateCount( 0 ); clearCounts(); @@ -1447,7 +1299,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); //assertEquals( 0, c.getParties().size() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } @@ -1482,7 +1334,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { s -> { try { s.beginTransaction(); - s.delete( party ); + s.remove( party ); s.getTransaction().commit(); } catch (Exception e) { @@ -1510,7 +1362,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { ContractVariation cv2 = it.next(); assertEquals( "more expensive", cv2.getText() ); assertEquals( 0, c.getParties().size() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } ); @@ -1543,7 +1395,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { inSession( s -> { try { s.beginTransaction(); - s.update( p ); + s.merge( p ); s.getTransaction().commit(); } catch (Exception e) { @@ -1578,7 +1430,7 @@ public class ImmutableTest extends BaseSessionFactoryFunctionalTest { Party p1 = (Party) c.getParties().iterator().next(); assertEquals( "party1", p1.getName() ); assertSame( c, p1.getContract() ); - s.delete( c ); + s.remove( c ); assertAllContractAndVariationsAreDeleted( s ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java index 1a4ca307fa..64d32b90d8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithManyToManyTest.java @@ -7,22 +7,26 @@ package org.hibernate.orm.test.immutable.entitywithmutablecollection; import java.util.Iterator; -import jakarta.persistence.PersistenceException; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Root; +import org.hibernate.LockMode; import org.hibernate.StaleObjectStateException; import org.hibernate.StaleStateException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.metamodel.MappingMetamodel; +import org.hibernate.testing.orm.junit.FailureExpected; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; + import static org.hibernate.testing.orm.junit.ExtraAssertions.assertTyping; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -101,7 +105,7 @@ public abstract class AbstractEntityWithManyToManyTest { assertEquals( 1, c.getPlans().size() ); assertSame( p, c.getPlans().iterator().next() ); } - s.delete( p ); + s.remove( p ); assertAllPlansAndContractsAreDeleted( s ); } @@ -139,7 +143,7 @@ public abstract class AbstractEntityWithManyToManyTest { assertEquals( 1, c.getPlans().size() ); assertSame( p, c.getPlans().iterator().next() ); } - s.delete( p ); + s.remove( p ); assertAllPlansAndContractsAreDeleted( s ); } @@ -166,9 +170,10 @@ public abstract class AbstractEntityWithManyToManyTest { scope.inTransaction( s -> { + s.lock( c, LockMode.NONE ); Plan p = new Plan( "plan" ); p.addContract( c ); - s.save( p ); + s.persist( p ); } ); @@ -186,7 +191,7 @@ public abstract class AbstractEntityWithManyToManyTest { assertEquals( 1, c1.getPlans().size() ); assertSame( p1, c1.getPlans().iterator().next() ); } - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -234,7 +239,7 @@ public abstract class AbstractEntityWithManyToManyTest { assertEquals( 1, c.getPlans().size() ); assertSame( p1, c.getPlans().iterator().next() ); } - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -287,7 +292,7 @@ public abstract class AbstractEntityWithManyToManyTest { if ( isPlanContractsBidirectional ) { assertSame( p1, c1.getPlans().iterator().next() ); } - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -318,7 +323,7 @@ public abstract class AbstractEntityWithManyToManyTest { p.addContract( c ); scope.inTransaction( - s -> s.update( p ) + s -> s.merge( p ) ); assertInsertCount( 0, sessionFactory ); @@ -334,7 +339,7 @@ public abstract class AbstractEntityWithManyToManyTest { if ( isPlanContractsBidirectional ) { assertSame( p1, c1.getPlans().iterator().next() ); } - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -344,6 +349,7 @@ public abstract class AbstractEntityWithManyToManyTest { } @Test + @Disabled("HHH-18419") public void testCreateWithNonEmptyManyToManyCollectionUpdateWithNewElement(SessionFactoryScope scope) { SessionFactoryImplementor sessionFactory = scope.getSessionFactory(); @@ -364,7 +370,7 @@ public abstract class AbstractEntityWithManyToManyTest { p.addContract( newC ); scope.inTransaction( - s -> s.update( p ) + s -> s.merge( p ) ); assertInsertCount( 1, sessionFactory ); @@ -380,17 +386,14 @@ public abstract class AbstractEntityWithManyToManyTest { if ( aContract.getId() == c.getId() ) { assertEquals( "gail", aContract.getCustomerName() ); } - else if ( aContract.getId() == newC.getId() ) { - assertEquals( "sherman", aContract.getCustomerName() ); - } else { - fail( "unknown contract" ); + assertEquals( "sherman", aContract.getCustomerName() ); } if ( isPlanContractsBidirectional ) { assertSame( p1, aContract.getPlans().iterator().next() ); } } - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -438,7 +441,7 @@ public abstract class AbstractEntityWithManyToManyTest { if ( isPlanContractsBidirectional ) { assertSame( p1, c1.getPlans().iterator().next() ); } - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -491,7 +494,7 @@ public abstract class AbstractEntityWithManyToManyTest { assertSame( p1, aContract.getPlans().iterator().next() ); } } - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -524,7 +527,7 @@ public abstract class AbstractEntityWithManyToManyTest { assertEquals( 0, c.getPlans().size() ); } scope.inTransaction( - s -> s.update( p ) + s -> s.merge( p ) ); assertUpdateCount( isContractVersioned ? 1 : 0, sessionFactory ); @@ -546,9 +549,9 @@ public abstract class AbstractEntityWithManyToManyTest { if ( isPlanContractsBidirectional ) { assertEquals( 0, c1.getPlans().size() ); } - s.delete( c1 ); + s.remove( c1 ); } - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -582,8 +585,8 @@ public abstract class AbstractEntityWithManyToManyTest { } scope.inTransaction( s -> { - s.update( p ); - s.update( c ); + s.merge( p ); + s.merge( c ); } ); @@ -599,8 +602,8 @@ public abstract class AbstractEntityWithManyToManyTest { if ( isPlanContractsBidirectional ) { assertEquals( 0, c1.getPlans().size() ); } - s.delete( c1 ); - s.delete( p1 ); + s.remove( c1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -656,9 +659,9 @@ public abstract class AbstractEntityWithManyToManyTest { if ( isPlanContractsBidirectional ) { assertEquals( 0, c1.getPlans().size() ); } - s.delete( c1 ); + s.remove( c1 ); } - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -710,8 +713,8 @@ public abstract class AbstractEntityWithManyToManyTest { if ( isPlanContractsBidirectional ) { assertEquals( 0, c1.getPlans().size() ); } - s.delete( c1 ); - s.delete( p1 ); + s.remove( c1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -740,9 +743,10 @@ public abstract class AbstractEntityWithManyToManyTest { scope.inTransaction( s -> { - s.update( p ); - p.removeContract( c ); - s.delete( c ); + Plan merged = s.merge( p ); + Contract contract = (Contract) merged.getContracts().iterator().next(); + merged.removeContract( contract ); + s.remove( contract ); } ); @@ -756,7 +760,7 @@ public abstract class AbstractEntityWithManyToManyTest { assertEquals( 0, p1.getContracts().size() ); Contract c1 = getContract( s ); assertNull( c1 ); - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -791,8 +795,8 @@ public abstract class AbstractEntityWithManyToManyTest { scope.inTransaction( s -> { - s.update( p ); - s.delete( c ); + s.merge( p ); + s.remove( s.merge(c) ); } ); @@ -804,7 +808,7 @@ public abstract class AbstractEntityWithManyToManyTest { s -> { Plan p1 = getPlan( s ); assertEquals( 0, p1.getContracts().size() ); - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -864,7 +868,7 @@ public abstract class AbstractEntityWithManyToManyTest { scope.inTransaction( s -> { Plan p1 = getPlan( s ); - s.delete( p1 ); + s.remove( p1 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -906,8 +910,8 @@ public abstract class AbstractEntityWithManyToManyTest { s -> { s.beginTransaction(); pOrig.removeContract( cOrig ); - s.update( pOrig ); try { + s.merge( pOrig ); s.getTransaction().commit(); assertFalse( isContractVersioned ); } @@ -927,8 +931,8 @@ public abstract class AbstractEntityWithManyToManyTest { scope.inTransaction( s -> { Plan p1 = getPlan( s ); - s.delete( p1 ); - s.createQuery( "delete from Contract" ).executeUpdate(); + s.remove( p1 ); + s.createMutationQuery( "delete from Contract" ).executeUpdate(); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -965,7 +969,7 @@ public abstract class AbstractEntityWithManyToManyTest { p1.removeContract( c ); p2.addContract( c ); - s.save( p2 ); + s.persist( p2 ); } ); @@ -997,8 +1001,8 @@ public abstract class AbstractEntityWithManyToManyTest { assertSame( p4, c.getPlans().iterator().next() ); } //} - s.delete( p3 ); - s.delete( p4 ); + s.remove( p3 ); + s.remove( p4 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -1082,8 +1086,8 @@ public abstract class AbstractEntityWithManyToManyTest { assertSame( p4, c1.getPlans().iterator().next() ); } //} - s.delete( p3 ); - s.delete( p4 ); + s.remove( p3 ); + s.remove( p4 ); assertAllPlansAndContractsAreDeleted( s ); } ); @@ -1157,6 +1161,6 @@ public abstract class AbstractEntityWithManyToManyTest { protected void assertDeleteCount(int expected, SessionFactoryImplementor sessionFactory) { int deletes = (int) sessionFactory.getStatistics().getEntityDeleteCount(); - assertEquals( expected, deletes, "unexpected delete counts" ); + assertEquals( expected, deletes, "unexpected delete counts, expected " + expected + " but got " + deletes ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java index cd2f6f91f2..e722b1f82b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/AbstractEntityWithOneToManyTest.java @@ -7,6 +7,7 @@ package org.hibernate.orm.test.immutable.entitywithmutablecollection; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import org.hibernate.QueryException; @@ -122,7 +123,7 @@ public abstract class AbstractEntityWithOneToManyTest { if ( isContractPartiesBidirectional ) { assertSame( c, party.getContract() ); } - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); @@ -158,7 +159,7 @@ public abstract class AbstractEntityWithOneToManyTest { if ( isContractPartiesBidirectional ) { assertSame( c, party.getContract() ); } - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } ); @@ -184,8 +185,11 @@ public abstract class AbstractEntityWithOneToManyTest { Contract contract = new Contract( null, "gail", "phone" ); contract.addParty( firstParty ); + scope.inTransaction( - s -> s.save( contract ) + s -> { + s.merge( contract ); + } ); assertInsertCount( 1, sessionFactory ); @@ -200,7 +204,7 @@ public abstract class AbstractEntityWithOneToManyTest { assertEquals( 0, c.getParties().size() ); Party party = getParty( s ); assertNull( party.getContract() ); - s.delete( party ); + s.remove( party ); } else { assertEquals( 1, c.getParties().size() ); @@ -210,7 +214,7 @@ public abstract class AbstractEntityWithOneToManyTest { assertSame( c, party.getContract() ); } } - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } @@ -256,7 +260,7 @@ public abstract class AbstractEntityWithOneToManyTest { if ( isContractPartiesBidirectional ) { assertSame( c, party.getContract() ); } - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } ); @@ -307,7 +311,7 @@ public abstract class AbstractEntityWithOneToManyTest { Contract c = getContract( s ); if ( isContractPartiesInverse ) { assertEquals( 0, c.getParties().size() ); - s.delete( firstParty ); + s.remove( firstParty ); } else { assertEquals( 1, c.getParties().size() ); @@ -317,7 +321,7 @@ public abstract class AbstractEntityWithOneToManyTest { assertSame( c, party.getContract() ); } } - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } ); @@ -350,7 +354,7 @@ public abstract class AbstractEntityWithOneToManyTest { contract.addParty( firstParty ); scope.inTransaction( - s -> s.update( contract ) + s -> s.merge( contract ) ); assertInsertCount( 0 , sessionFactory); @@ -364,7 +368,7 @@ public abstract class AbstractEntityWithOneToManyTest { Contract c = getContract( s ); if ( isContractPartiesInverse ) { assertEquals( 0, c.getParties().size() ); - s.delete( firstParty ); + s.remove( firstParty ); } else { assertEquals( 1, c.getParties().size() ); @@ -374,7 +378,7 @@ public abstract class AbstractEntityWithOneToManyTest { assertSame( c, party.getContract() ); } } - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } ); @@ -405,7 +409,7 @@ public abstract class AbstractEntityWithOneToManyTest { contract.addParty( newParty ); scope.inTransaction( - s -> s.update( contract ) + s -> s.merge( contract ) ); assertInsertCount( 1, sessionFactory ); @@ -421,17 +425,14 @@ public abstract class AbstractEntityWithOneToManyTest { if ( aParty.getId() == firstParty.getId() ) { assertEquals( "party", aParty.getName() ); } - else if ( aParty.getId() == newParty.getId() ) { - assertEquals( "new party", aParty.getName() ); - } else { - fail( "unknown party" ); + assertEquals( "new party", aParty.getName() ); } if ( isContractPartiesBidirectional ) { assertSame( c, aParty.getContract() ); } } - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } ); @@ -477,7 +478,7 @@ public abstract class AbstractEntityWithOneToManyTest { Contract c = getContract( s ); if ( isContractPartiesInverse ) { assertEquals( 0, c.getParties().size() ); - s.delete( firstParty ); + s.remove( firstParty ); } else { assertEquals( 1, c.getParties().size() ); @@ -487,7 +488,7 @@ public abstract class AbstractEntityWithOneToManyTest { assertSame( c, party.getContract() ); } } - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } ); @@ -541,7 +542,7 @@ public abstract class AbstractEntityWithOneToManyTest { assertSame( c, aParty.getContract() ); } } - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } ); @@ -580,7 +581,7 @@ public abstract class AbstractEntityWithOneToManyTest { } c.removeParty( party ); contract2.addParty( party ); - s.save( contract2 ); + s.persist( contract2 ); } ); @@ -610,8 +611,8 @@ public abstract class AbstractEntityWithOneToManyTest { assertSame( c2, party.getContract() ); } } - s.delete( c ); - s.delete( c2 ); + s.remove( c ); + s.remove( c2 ); assertPartyAndContractAreDeleted( s ); } @@ -683,8 +684,8 @@ public abstract class AbstractEntityWithOneToManyTest { assertSame( c2, party.getContract() ); } } - s.delete( c ); - s.delete( c2 ); + s.remove( c ); + s.remove( c2 ); assertPartyAndContractAreDeleted( s ); } @@ -720,8 +721,8 @@ public abstract class AbstractEntityWithOneToManyTest { scope.inTransaction( s -> { - s.update( contract ); - s.update( firstParty ); + s.merge( contract ); + s.merge( firstParty ); } ); @@ -746,9 +747,9 @@ public abstract class AbstractEntityWithOneToManyTest { if ( isContractPartiesBidirectional ) { assertNull( party.getContract() ); } - s.delete( party ); + s.remove( party ); } - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } @@ -811,9 +812,9 @@ public abstract class AbstractEntityWithOneToManyTest { if ( isContractPartiesBidirectional ) { assertNull( party.getContract() ); } - s.delete( party ); + s.remove( party ); } - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } @@ -843,9 +844,15 @@ public abstract class AbstractEntityWithOneToManyTest { scope.inTransaction( s -> { - s.update( contract ); - contract.removeParty( firstParty ); - s.delete( firstParty ); + Contract merged = s.merge( contract ); + Iterator iterator = merged.getParties().iterator(); + while ( iterator.hasNext() ) { + Party p = iterator.next(); + if ( p.getId() == firstParty.getId() ) { + iterator.remove(); + s.remove( p ); + } + } } ); @@ -859,7 +866,7 @@ public abstract class AbstractEntityWithOneToManyTest { assertEquals( 0, c.getParties().size() ); Party party = getParty( s ); assertNull( party ); - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } ); @@ -894,8 +901,8 @@ public abstract class AbstractEntityWithOneToManyTest { scope.inTransaction( s -> { - s.update( contract ); - s.delete( firstParty ); + Contract merged = s.merge( contract ); + s.remove( s.merge( firstParty ) ); } ); @@ -907,7 +914,7 @@ public abstract class AbstractEntityWithOneToManyTest { s -> { Contract c = getContract( s ); assertEquals( 0, c.getParties().size() ); - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } ); @@ -942,7 +949,7 @@ public abstract class AbstractEntityWithOneToManyTest { } scope.inTransaction( - s -> s.update( contract ) + s -> s.merge( contract ) ); assertUpdateCount( isContractVersioned ? 1 : 0 , sessionFactory); @@ -955,7 +962,7 @@ public abstract class AbstractEntityWithOneToManyTest { assertEquals( 0, c.getVariations().size() ); ContractVariation cv = getContractVariation( s ); assertNull( cv ); - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } @@ -1004,7 +1011,7 @@ public abstract class AbstractEntityWithOneToManyTest { assertEquals( 0, c.getVariations().size() ); ContractVariation cv = getContractVariation( s ); assertNull( cv ); - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } ); @@ -1032,11 +1039,17 @@ public abstract class AbstractEntityWithOneToManyTest { scope.inTransaction( s -> { - s.update( contract ); - contract.getVariations().remove( contractVariation ); - contractVariation.setContract( null ); - assertEquals( 0, contract.getVariations().size() ); - s.delete( contractVariation ); + Contract merged = s.merge( contract ); + Iterator iterator = merged.getVariations().iterator(); + + while ( iterator.hasNext() ) { + ContractVariation cv = iterator.next(); + if ( cv.getId() == contractVariation.getId() ) { + iterator.remove(); + cv.setContract( null ); + s.remove( cv ); + } + } } ); @@ -1050,7 +1063,7 @@ public abstract class AbstractEntityWithOneToManyTest { assertEquals( 0, c.getVariations().size() ); ContractVariation cv = getContractVariation( s ); assertNull( cv ); - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } ); @@ -1109,7 +1122,7 @@ public abstract class AbstractEntityWithOneToManyTest { scope.inTransaction( s -> { Contract c = getContract( s ); - s.delete( c ); + s.remove( c ); assertPartyAndContractAreDeleted( s ); } @@ -1152,8 +1165,8 @@ public abstract class AbstractEntityWithOneToManyTest { s -> { s.beginTransaction(); cOrig.removeParty( partyOrig ); - s.update( cOrig ); try { + s.merge( cOrig ); s.getTransaction().commit(); assertFalse( isContractVersioned ); } @@ -1176,8 +1189,8 @@ public abstract class AbstractEntityWithOneToManyTest { Map properties = new HashMap(); properties.put("javax.persistence.fetchgraph", entityGraph); Contract c = s.find( Contract.class, cOrig.getId(), properties ); - s.createQuery( "delete from Party" ).executeUpdate(); - s.delete( c ); + s.createMutationQuery( "delete from Party" ).executeUpdate(); + s.remove( c ); s.flush(); assertPartyAndContractAreDeleted( s ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Contract.java b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Contract.java index ed527ec336..bbf19eab07 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Contract.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/immutable/entitywithmutablecollection/Contract.java @@ -82,7 +82,7 @@ public class Contract implements Serializable { this.type = type; } - public List getVariations() { + public List getVariations() { return variations; } @@ -111,7 +111,7 @@ public class Contract implements Serializable { subcontract.setParent( this ); } - public Set getParties() { + public Set getParties() { return parties; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java index 3faf1cf745..f5bad23b60 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceDeletionTest.java @@ -31,9 +31,9 @@ public class JoinedInheritanceDeletionTest { Employee employee = new Employee( 2, "Chris", "Software Engineer" ); Customer customer = new Customer( 3, "Miriam", "" ); - session.save( person ); - session.save( employee ); - session.save( customer ); + session.persist( person ); + session.persist( employee ); + session.persist( customer ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java index 8b5fa32b0f..2cd7bc8394 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/JoinedInheritanceWithDefaultSchemaDeletionTest.java @@ -41,9 +41,9 @@ public class JoinedInheritanceWithDefaultSchemaDeletionTest { Employee employee = new Employee( 2, "Chris", "Software Engineer" ); Customer customer = new Customer( 3, "Miriam", "" ); - session.save( person ); - session.save( employee ); - session.save( customer ); + session.persist( person ); + session.persist( employee ); + session.persist( customer ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java index a6114e8a80..bc4581aa1f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/JoinedInheritanceEagerTest.java @@ -95,10 +95,10 @@ public class JoinedInheritanceEagerTest { EntityD entityD = session.get( EntityD.class, 2L ); EntityC entityC = session.get( EntityC.class, 1L ); - session.delete( entityD ); - session.delete( entityC ); - session.delete( entityA ); - session.delete( entityB ); + session.remove( entityD ); + session.remove( entityC ); + session.remove( entityA ); + session.remove( entityB ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java index 84acba5f3f..5a52059d78 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/TablePerClassInheritanceTest.java @@ -79,7 +79,7 @@ public class TablePerClassInheritanceTest { scope.inTransaction( session -> { List people = session.createQuery( "FROM Person p", Person.class ).getResultList(); - people.forEach( person -> session.delete( person ) ); + people.forEach( person -> session.remove( person ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java index 384ca3dad2..6764a555a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassTest.java @@ -44,8 +44,8 @@ public class JoinedSubclassTest { subSubEntity.setSubSubString( EXPECTED_SUB_SUB_STRING_VALUE ); scope.inTransaction( session -> { - session.save( subEntity ); - session.save( subSubEntity ); + session.persist( subEntity ); + session.persist( subSubEntity ); } ); subSubEntityId = subSubEntity.getId(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java index 0701a898ad..c3c23738ea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/discriminator/joinedsubclass/JoinedSubclassWithRootInterfaceTest.java @@ -27,7 +27,7 @@ public class JoinedSubclassWithRootInterfaceTest { scope.inTransaction( session -> { final TestEntityImpl testEntity = new TestEntityImpl(); testEntity.setId( 1 ); - session.save( testEntity ); + session.persist( testEntity ); } ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java index 424cdf82dc..6dcaaa907d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingReferenceDifferentSubclassTest.java @@ -41,8 +41,8 @@ public class InsertOrderingReferenceDifferentSubclassTest extends BaseInsertOrde subclassA2.referenceB = subclassB1; - session.save( subclassA1 ); - session.save( subclassA2 ); + session.persist( subclassA1 ); + session.persist( subclassA2 ); clearBatches(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java index d4fd899ace..bbcd18f4f9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingSelfReferenceTest.java @@ -50,7 +50,7 @@ public class InsertOrderingSelfReferenceTest extends BaseInsertOrderingTest { public void testReferenceItself() { sessionFactoryScope().inTransaction( session -> { Placeholder placeholder = new Placeholder(); - session.save( placeholder ); + session.persist( placeholder ); OutputParameter outputParameter1 = new OutputParameter(); @@ -58,16 +58,16 @@ public class InsertOrderingSelfReferenceTest extends BaseInsertOrderingTest { outputParameter1.children.add( childOutputParameter ); childOutputParameter.parent = outputParameter1; - session.save( outputParameter1 ); + session.persist( outputParameter1 ); Placeholder placeholder2 = new Placeholder(); - session.save( placeholder2 ); + session.persist( placeholder2 ); InputParameter inputParameter = new InputParameter(); - session.save( inputParameter ); + session.persist( inputParameter ); OutputParameter outputParameter2 = new OutputParameter(); - session.save( outputParameter2 ); + session.persist( outputParameter2 ); clearBatches(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java index 530c39bc1c..72cd5c4c16 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingTest.java @@ -51,8 +51,8 @@ public class InsertOrderingTest { for ( int i = 0; i < iterations; i++ ) { User user = new User( "user-" + i ); Group group = new Group( "group-" + i ); - session.save( user ); - session.save( group ); + session.persist( user ); + session.persist( group ); user.addMembership( group ); } StatsBatch.reset(); @@ -73,7 +73,7 @@ public class InsertOrderingTest { Iterator users = session.createQuery( "from User u left join fetch u.memberships m left join fetch m.group" ).list().iterator(); while ( users.hasNext() ) { - session.delete( users.next() ); + session.remove( users.next() ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java index 92953f630c..8bca2b78db 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithSecondaryTable.java @@ -66,7 +66,7 @@ public class InsertOrderingWithSecondaryTable extends BaseInsertOrderingTest { area2.setShape( circle ); top.getGeographicAreas().add( area2 ); - session.save( top ); + session.persist( top ); clearBatches(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorNonNullTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorNonNullTransactionTest.java index e1ed4d64a0..af808e71e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorNonNullTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorNonNullTransactionTest.java @@ -117,7 +117,7 @@ public class InterceptorNonNullTransactionTest extends BaseJpaOrNativeBootstrapF assertNull( interceptor.afterTransactionCompletionAssertionPassed ); SimpleEntity entity = new SimpleEntity( "Hello World" ); - session.save( entity ); + session.persist( entity ); interceptor.reset(); @@ -155,7 +155,7 @@ public class InterceptorNonNullTransactionTest extends BaseJpaOrNativeBootstrapF assertNull( interceptor.afterTransactionCompletionAssertionPassed ); SimpleEntity entity = new SimpleEntity( "Hello World" ); - session.save( entity ); + session.persist( entity ); interceptor.reset(); 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 4762a553ae..2f8d79f4f3 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 @@ -67,7 +67,7 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase { t = s.beginTransaction(); u = s.get( User.class, "Gavin" ); assertEquals( 2, u.getActions().size() ); - s.delete( u ); + s.remove( u ); t.commit(); s.close(); } @@ -87,7 +87,7 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase { u = s.get( User.class, "Gavin" ); assertNotNull( u.getCreated() ); assertNotNull( u.getLastUpdated() ); - s.delete( u ); + s.remove( u ); t.commit(); s.close(); } @@ -137,7 +137,7 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase { t = s.beginTransaction(); u = s.get( User.class, "Josh" ); assertEquals( "test", u.getPassword() ); - s.delete( u ); + s.remove( u ); t.commit(); s.close(); @@ -214,7 +214,7 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase { assertNotNull( i.getDetails() ); assertEquals( checkPerm, i.getDetails().getPerm1() ); assertEquals( checkComment, i.getDetails().getComment() ); - s.delete( i ); + s.remove( i ); s.getTransaction().commit(); s.close(); } @@ -249,8 +249,8 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase { List logs = s.createQuery( criteria ).list(); // List logs = s.createCriteria(Log.class).list(); assertEquals( 2, logs.size() ); - s.delete( u ); - s.createQuery( "delete from Log" ).executeUpdate(); + s.remove( u ); + s.createMutationQuery( "delete from Log" ).executeUpdate(); } ); @@ -296,7 +296,7 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase { assertEquals( u.getName(), reloaded.getName() ); assertEquals( u.getPassword(), reloaded.getPassword() ); - s.delete( reloaded ); + s.remove( reloaded ); t.commit(); s.close(); } @@ -354,7 +354,7 @@ public class InterceptorTest extends BaseCoreFunctionalTestCase { s = sessionFactory().withOptions().statementInspector( statementInspector ).openSession(); t = s.beginTransaction(); - s.delete( u ); + s.remove( u ); t.commit(); s.close(); 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 e8fc958e9f..eb82731ada 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 @@ -47,14 +47,14 @@ public class InterfaceProxyTest { try { doc.setName( "Hibernate in Action" ); doc.setContent( session.getLobHelper().createBlob( "blah blah blah".getBytes() ) ); - session.save( doc ); + session.persist( doc ); doc2.setName( "Secret" ); doc2.setContent( session.getLobHelper().createBlob( "wxyz wxyz".getBytes() ) ); // SybaseASE15Dialect only allows 7-bits in a byte to be inserted into a tinyint // column (0 <= val < 128) doc2.setPermissionBits( (byte) 127 ); doc2.setOwner( "gavin" ); - session.save( doc2 ); + session.persist( doc2 ); session.getTransaction().commit(); } finally { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ScrollTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ScrollTest.java index 79172f3a5a..7b6573a145 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ScrollTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/iterate/ScrollTest.java @@ -61,8 +61,8 @@ public class ScrollTest { assertThat( i1.getName(), is( "foo" ) ); assertThat( i2.getName(), is( "bar" ) ); assertFalse( sr.next() ); - s.delete( i1 ); - s.delete( i2 ); + s.remove( i1 ); + s.remove( i2 ); } assertTrue( s.getPersistenceContext().getLoadContexts().isLoadingFinished() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/GeneralWorkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/GeneralWorkTest.java index 1077012441..c94201dccb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/GeneralWorkTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jdbc/GeneralWorkTest.java @@ -107,7 +107,7 @@ public class GeneralWorkTest extends BaseCoreFunctionalTestCase { Session session = openSession(); session.beginTransaction(); Person p = new Person( "Abe", "Lincoln" ); - session.save( p ); + session.persist( p ); session.getTransaction().commit(); final Session session2 = openSession(); @@ -144,7 +144,7 @@ public class GeneralWorkTest extends BaseCoreFunctionalTestCase { session = openSession(); session.beginTransaction(); - session.delete( p ); + session.remove( p ); session.getTransaction().commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java index 51857081db..9818327ba0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/JoinTest.java @@ -66,9 +66,9 @@ public class JoinTest { yomomma.setName( "mum" ); yomomma.setSex( 'F' ); - s.save( yomomma ); - s.save( mark ); - s.save( joe ); + s.persist( yomomma ); + s.persist( mark ); + s.persist( joe ); // assertEquals( s.createQuery("from java.io.Serializable").list().size(), 0 ); @@ -102,9 +102,9 @@ public class JoinTest { mark.setZip( "30306" ); assertEquals( 1, s.createQuery( "from Person p where p.zip = '30306'" ).list().size() ); - s.delete( mark ); - s.delete( joe ); - s.delete( yomomma ); + s.remove( mark ); + s.remove( joe ); + s.remove( yomomma ); assertTrue( s.createQuery( "from Person" ).list().isEmpty() ); } ); @@ -118,7 +118,7 @@ public class JoinTest { jesus.setName( "Jesus Olvera y Martinez" ); jesus.setSex( 'M' ); - s.save( jesus ); + s.persist( jesus ); // assertEquals( 0, s.createQuery("from java.io.Serializable").list().size() ); @@ -136,7 +136,7 @@ public class JoinTest { s.clear(); // Cleanup the test data - s.delete( jesus ); + s.remove( jesus ); assertTrue( s.createQuery( "from Person" ).list().isEmpty() ); @@ -249,8 +249,8 @@ public class JoinTest { .uniqueResult(); assertEquals( 1d, expiryViaSql.doubleValue(), 0.01d ); - s.delete( p ); - s.delete( u ); + s.remove( p ); + s.remove( u ); assertTrue( s.createQuery( "from Person" ).list().isEmpty() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/join/OptionalJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/join/OptionalJoinTest.java index a69c13e524..a33ab00cfd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/join/OptionalJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/join/OptionalJoinTest.java @@ -46,7 +46,7 @@ public class OptionalJoinTest { // create a new thing with a non-null name Thing thing = new Thing(); thing.setName( "one" ); - session.save( thing ); + session.persist( thing ); } ); @@ -59,7 +59,6 @@ public class OptionalJoinTest { assertEquals( "ONE", thing.getNameUpper() ); // give it a new non-null name and save it thing.setName( "one_changed" ); - session.update( thing ); } ); @@ -70,54 +69,12 @@ public class OptionalJoinTest { Thing thing = things.get( 0 ); assertEquals( "one_changed", thing.getName() ); assertEquals( "ONE_CHANGED", thing.getNameUpper() ); - session.delete( thing ); + session.remove( thing ); } ); } - @Test - public void testUpdateNonNullOptionalJoinToDiffNonNullDetached(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - // create a new thing with a non-null name - Thing thing = new Thing(); - thing.setName( "one" ); - session.save( thing ); - } - ); - - Thing aThing = scope.fromTransaction( - session -> { - List things = session.createQuery( "from Thing" ).list(); - assertEquals( 1, things.size() ); - Thing thing = things.get( 0 ); - assertEquals( "one", thing.getName() ); - assertEquals( "ONE", thing.getNameUpper() ); - return thing; - } - ); - - // change detached thing name to a new non-null name and save it - aThing.setName( "one_changed" ); - - scope.inTransaction( - session -> - session.update( aThing ) - ); - - scope.inTransaction( - session -> { - List things = session.createQuery( "from Thing" ).list(); - assertEquals( 1, things.size() ); - Thing thing = things.get( 0 ); - assertEquals( "one_changed", thing.getName() ); - assertEquals( "ONE_CHANGED", thing.getNameUpper() ); - session.delete( thing ); - } - ); - } - @Test public void testMergeNonNullOptionalJoinToDiffNonNullDetached(SessionFactoryScope scope) { scope.inTransaction( @@ -125,7 +82,7 @@ public class OptionalJoinTest { // create a new thing with a non-null name Thing thing = new Thing(); thing.setName( "one" ); - session.save( thing ); + session.persist( thing ); } ); @@ -156,90 +113,12 @@ public class OptionalJoinTest { Thing thing = things.get( 0 ); assertEquals( "one_changed", thing.getName() ); assertEquals( "ONE_CHANGED", thing.getNameUpper() ); - session.delete( thing ); + session.remove( thing ); } ); } - @Test - public void testUpdateNonNullOptionalJoinToNull(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - // create a new thing with a non-null name - Thing thing = new Thing(); - thing.setName( "one" ); - session.save( thing ); - } - ); - - scope.inTransaction( - session -> { - List things = session.createQuery( "from Thing" ).list(); - assertEquals( 1, things.size() ); - Thing thing = things.get( 0 ); - assertEquals( "one", thing.getName() ); - assertEquals( "ONE", thing.getNameUpper() ); - // give it a null name and save it - thing.setName( null ); - session.update( thing ); - } - ); - - scope.inTransaction( - session -> { - List things = session.createQuery( "from Thing" ).list(); - assertEquals( 1, things.size() ); - Thing thing = things.get( 0 ); - assertNull( thing.getName() ); - assertNull( thing.getNameUpper() ); - session.delete( thing ); - } - ); - } - - @Test - public void testUpdateNonNullOptionalJoinToNullDetached(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - // create a new thing with a non-null name - Thing thing = new Thing(); - thing.setName( "one" ); - session.save( thing ); - } - ); - - Thing aThing = scope.fromTransaction( - session -> { - List things = session.createQuery( "from Thing" ).list(); - assertEquals( 1, things.size() ); - Thing thing = things.get( 0 ); - assertEquals( "one", thing.getName() ); - assertEquals( "ONE", thing.getNameUpper() ); - return thing; - } - ); - - // give detached thing a null name and save it - aThing.setName( null ); - - scope.inTransaction( - session -> - session.update( aThing ) - ); - - scope.inTransaction( - session -> { - List things = session.createQuery( "from Thing" ).list(); - assertEquals( 1, things.size() ); - Thing thing = things.get( 0 ); - assertNull( thing.getName() ); - assertNull( thing.getNameUpper() ); - session.delete( thing ); - } - ); - } - @Test public void testMergeNonNullOptionalJoinToNullDetached(SessionFactoryScope scope) { scope.inTransaction( @@ -247,7 +126,7 @@ public class OptionalJoinTest { // create a new thing with a non-null name Thing thing = new Thing(); thing.setName( "one" ); - session.save( thing ); + session.persist( thing ); } ); @@ -277,7 +156,7 @@ public class OptionalJoinTest { Thing thing = things.get( 0 ); assertNull( thing.getName() ); assertNull( thing.getNameUpper() ); - session.delete( thing ); + session.remove( thing ); } ); } @@ -289,7 +168,7 @@ public class OptionalJoinTest { // create a new thing with a null name Thing thing = new Thing(); thing.setName( null ); - session.save( thing ); + session.persist( thing ); } ); @@ -302,7 +181,6 @@ public class OptionalJoinTest { assertNull( thing.getName() ); // change name to a non-null value thing.setName( "two" ); - session.update( thing ); } ); @@ -313,50 +191,7 @@ public class OptionalJoinTest { Thing thing = things.get( 0 ); assertEquals( "two", thing.getName() ); assertEquals( "TWO", thing.getNameUpper() ); - session.delete( thing ); - } - ); - } - - @Test - public void testUpdateNullOptionalJoinToNonNullDetached(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - // create a new thing with a null name - Thing thing = new Thing(); - thing.setName( null ); - session.save( thing ); - } - ); - - Thing aThing = scope.fromTransaction( - session -> { - List things = session.createQuery( "from Thing" ).list(); - assertEquals( 1, things.size() ); - Thing thing = things.get( 0 ); - assertNull( thing.getName() ); - assertNull( thing.getNameUpper() ); - return thing; - } - ); - - - // change detached thing name to a non-null value - aThing.setName( "two" ); - - scope.inTransaction( - session -> - session.update( aThing ) - ); - - scope.inTransaction( - session -> { - List things = session.createQuery( "from Thing" ).list(); - assertEquals( 1, things.size() ); - Thing thing = things.get( 0 ); - assertEquals( "two", thing.getName() ); - assertEquals( "TWO", thing.getNameUpper() ); - session.delete( thing ); + session.remove( thing ); } ); } @@ -368,7 +203,7 @@ public class OptionalJoinTest { // create a new thing with a null name Thing thing = new Thing(); thing.setName( null ); - session.save( thing ); + session.persist( thing ); } ); @@ -389,7 +224,7 @@ public class OptionalJoinTest { scope.inTransaction( session -> - session.update( aThing ) + session.merge( aThing ) ); scope.inTransaction( @@ -399,7 +234,7 @@ public class OptionalJoinTest { Thing thing = things.get( 0 ); assertEquals( "two", thing.getName() ); assertEquals( "TWO", thing.getNameUpper() ); - session.delete( thing ); + session.remove( thing ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java index 5fa7a55590..8143236002 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassTest.java @@ -56,7 +56,7 @@ public class JoinedSubclassTest { e.setName( "Steve" ); e.setSex( 'M' ); e.setTitle( "grand poobah" ); - session.save( e ); + session.persist( e ); } ); @@ -79,7 +79,7 @@ public class JoinedSubclassTest { scope.inTransaction( session -> { - session.delete( e ); + session.remove( e ); } ); } @@ -124,8 +124,8 @@ public class JoinedSubclassTest { assertEquals( result.size(), 1 ); assertEquals( result.get(0), new BigDecimal(1000) );*/ - s.delete( p ); - s.delete( q ); + s.remove( p ); + s.remove( q ); } ); } @@ -150,8 +150,8 @@ public class JoinedSubclassTest { session -> { session.lock( p, LockMode.PESSIMISTIC_WRITE ); session.lock( q, LockMode.PESSIMISTIC_WRITE ); - session.delete( p ); - session.delete( q ); + session.remove( p ); + session.remove( q ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java index 46472b2b4a..4e7b9f0d1b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithExplicitDiscriminatorTest.java @@ -67,8 +67,8 @@ public class JoinedSubclassWithExplicitDiscriminatorTest { public void basicUsageTest(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( new Cat( 1 ) ); - session.save( new Dog( 2 ) ); + session.persist( new Cat( 1 ) ); + session.persist( new Dog( 2 ) ); } ); @@ -77,10 +77,10 @@ public class JoinedSubclassWithExplicitDiscriminatorTest { session.createQuery( "from Animal" ).list(); Cat cat = session.get( Cat.class, 1 ); assertNotNull( cat ); - session.delete( cat ); + session.remove( cat ); Dog dog = session.get( Dog.class, 2 ); assertNotNull( dog ); - session.delete( dog ); + session.remove( dog ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java index a40359b867..69139fa9df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithIgnoredExplicitDiscriminatorTest.java @@ -73,8 +73,8 @@ public class JoinedSubclassWithIgnoredExplicitDiscriminatorTest { public void basicUsageTest(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( new Cat( 1 ) ); - session.save( new Dog( 2 ) ); + session.persist( new Cat( 1 ) ); + session.persist( new Dog( 2 ) ); } ); @@ -83,10 +83,10 @@ public class JoinedSubclassWithIgnoredExplicitDiscriminatorTest { session.createQuery( "from Animal" ).list(); Cat cat = session.get( Cat.class, 1 ); assertNotNull( cat ); - session.delete( cat ); + session.remove( cat ); Dog dog = session.get( Dog.class, 2 ); assertNotNull( dog ); - session.delete( dog ); + session.remove( dog ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java index 8567ebf4f9..0b4e47140e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclass/JoinedSubclassWithImplicitDiscriminatorTest.java @@ -81,20 +81,20 @@ public class JoinedSubclassWithImplicitDiscriminatorTest { public void basicUsageTest(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( new Cat( 1 ) ); - session.save( new Dog( 2 ) ); + session.persist( new Cat( 1 ) ); + session.persist( new Dog( 2 ) ); } ); scope.inTransaction( session -> { session.createQuery( "from Animal" ).list(); - Cat cat = (Cat) session.get( Cat.class, 1 ); + Cat cat = session.get( Cat.class, 1 ); assertNotNull( cat ); - session.delete( cat ); - Dog dog = (Dog) session.get( Dog.class, 2 ); + session.remove( cat ); + Dog dog = session.get( Dog.class, 2 ); assertNotNull( dog ); - session.delete( dog ); + session.remove( dog ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java index cdd68e0bab..dbb362fa71 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/IdentityJoinedSubclassBatchingTest.java @@ -104,7 +104,7 @@ public class IdentityJoinedSubclassBatchingTest { e.setAddress( "buckhead" ); e.setZip( "30305" ); e.setCountry( "USA" ); - s.save( e ); + s.persist( e ); if ( i % nBeforeFlush == 0 && i > 0 ) { s.flush(); s.clear(); @@ -131,7 +131,7 @@ public class IdentityJoinedSubclassBatchingTest { while ( sr.next() ) { Employee e = (Employee) sr.get(); - s.delete( e ); + s.remove( e ); } } } ); @@ -150,7 +150,7 @@ public class IdentityJoinedSubclassBatchingTest { e.setAddress( "buckhead" ); e.setZip( "30305" ); e.setCountry( "USA" ); - s.save( e ); + s.persist( e ); } } ); @@ -166,7 +166,7 @@ public class IdentityJoinedSubclassBatchingTest { while ( sr.next() ) { Employee e = (Employee) sr.get(); - s.delete( e ); + s.remove( e ); } } } ); @@ -185,7 +185,7 @@ public class IdentityJoinedSubclassBatchingTest { e.setAddress( "buckhead" ); e.setZip( "30305" ); e.setCountry( "USA" ); - s.save( e ); + s.persist( e ); s.flush(); long numberOfInsertedEmployee = (long) s.createQuery( "select count(e) from Employee e" ).uniqueResult(); @@ -200,7 +200,7 @@ public class IdentityJoinedSubclassBatchingTest { while ( sr.next() ) { Employee e = (Employee) sr.get(); - s.delete( e ); + s.remove( e ); } } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java index 36a13f5f42..ce7f84e4eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java @@ -95,7 +95,7 @@ public class JoinedSubclassBatchingTest { e.setAddress( "buckhead" ); e.setZip( "30305" ); e.setCountry( "USA" ); - s.save( e ); + s.persist( e ); if ( i % nBeforeFlush == 0 && i > 0 ) { s.flush(); s.clear(); @@ -122,7 +122,7 @@ public class JoinedSubclassBatchingTest { while ( sr.next() ) { Employee e = (Employee) sr.get(); - s.delete( e ); + s.remove( e ); } } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java index 2aba25489e..daf66609e1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/joinedsubclassbatch/SequenceJoinedSubclassBatchingTest.java @@ -102,7 +102,7 @@ public class SequenceJoinedSubclassBatchingTest { e.setAddress( "buckhead" ); e.setZip( "30305" ); e.setCountry( "USA" ); - s.save( e ); + s.persist( e ); if ( i % nBeforeFlush == 0 && i > 0 ) { s.flush(); s.clear(); @@ -129,7 +129,7 @@ public class SequenceJoinedSubclassBatchingTest { while ( sr.next() ) { Employee e = (Employee) sr.get(); - s.delete( e ); + s.remove( e ); } } } ); @@ -146,7 +146,7 @@ public class SequenceJoinedSubclassBatchingTest { e.setAddress( "buckhead" ); e.setZip( "30305" ); e.setCountry( "USA" ); - s.save( e ); + s.persist( e ); s.flush(); long numberOfInsertedEmployee = (long) s.createQuery( "select count(e) from Employee e" ).uniqueResult(); @@ -161,7 +161,7 @@ public class SequenceJoinedSubclassBatchingTest { while ( sr.next() ) { Employee e = (Employee) sr.get(); - s.delete( e ); + s.remove( e ); } } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java index 734ea7e46f..ab080950ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade/MergeWithTransientNonCascadedAssociationTest.java @@ -60,7 +60,7 @@ public class MergeWithTransientNonCascadedAssociationTest { entityManager -> { person.address = null; entityManager.unwrap( Session.class ).lock( person, LockMode.NONE ); - entityManager.unwrap( Session.class ).delete( person ); + entityManager.unwrap( Session.class ).remove( person ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/CascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/CascadeTest.java index 358c0b1158..a8d6cf0173 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/CascadeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/cascade2/CascadeTest.java @@ -56,7 +56,7 @@ public class CascadeTest extends AbstractJPATest { Parent p = new Parent( "parent" ); Child c = new Child( "child" ); c.setParent( p ); - s.save( c ); + s.persist( c ); s.getTransaction().commit(); fail( "expecting TransientObjectException on flush" ); } @@ -330,10 +330,10 @@ public class CascadeTest extends AbstractJPATest { p.setInfo( pi ); pi.setOwner( p ); assertNull( pi.getId() ); - s.save( p ); - s.save ( pi ); - s.save( c ); - s.save( ci ); + s.persist( p ); + s.persist ( pi ); + s.persist( c ); + s.persist( ci ); s.getTransaction().commit(); assertEquals( p.getId(), pi.getId() ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java index ddc81660b4..d6bd19a80a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/compliance/tck2_2/QueryExecutionTest.java @@ -123,7 +123,7 @@ public class QueryExecutionTest extends BaseNonConfigCoreFunctionalTestCase { session -> { final Customer customer = session.byId( Customer.class ).load( 1 ); if ( customer != null ) { - session.delete( customer ); + session.remove( customer ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java index 9c44277074..75369577ed 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/criteria/basic/InWithHeterogeneousCollectionTest.java @@ -64,8 +64,8 @@ public class InWithHeterogeneousCollectionTest extends BaseCoreFunctionalTestCas @Before public void setup() { doInHibernate( this::sessionFactory, session -> { - session.save( new Event( 1L, "EventName1", "EventName1".toLowerCase( Locale.ROOT ) ) ); - session.save( new Event( 2L, "EventName2", "my-tag" ) ); + session.persist( new Event( 1L, "EventName1", "EventName1".toLowerCase( Locale.ROOT ) ) ); + session.persist( new Event( 2L, "EventName2", "my-tag" ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/FetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/FetchingTest.java index ee538d17e0..90ea7d58b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/FetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/fetch/FetchingTest.java @@ -40,7 +40,7 @@ public class FetchingTest extends AbstractJPATest { p = (Person) session.createQuery( "select p from Person p where p.firstName = :name" ) .setParameter( "name", "Gavin" ).uniqueResult(); assertFalse( Hibernate.isInitialized( p.getStays() ) ); - session.delete( p ); + session.remove( p ); } ); } @@ -79,7 +79,7 @@ public class FetchingTest extends AbstractJPATest { Hibernate.isInitialized( stay3.getVeryOldPerson() ), "FetchMode.JOIN should overrides lazy options" ); - session.delete( stay3.getVeryOldPerson() ); + session.remove( stay3.getVeryOldPerson() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java index f10716adf9..60847f0211 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/JPALockTest.java @@ -95,7 +95,7 @@ public class JPALockTest extends AbstractJPATest { Long itemId = fromTransaction( session -> { it.setName( initialName ); - session.save( it ); + session.persist( it ); return it.getId(); } ); @@ -155,7 +155,7 @@ public class JPALockTest extends AbstractJPATest { inTransaction( session -> - session.delete( item ) + session.remove( item ) ); } @@ -190,7 +190,7 @@ public class JPALockTest extends AbstractJPATest { inTransaction( session -> { it.setName( initialName ); - session.save( it ); + session.persist( it ); } ); @@ -270,7 +270,7 @@ public class JPALockTest extends AbstractJPATest { inTransaction( session -> { - session.delete( item ); + session.remove( item ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java index bd3a24d38c..b164890c7a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/RepeatableReadTest.java @@ -65,7 +65,7 @@ public class RepeatableReadTest extends AbstractJPATest { Item it = new Item( check ); inTransaction( session -> { - session.save( it ); + session.persist( it ); } ); @@ -114,7 +114,7 @@ public class RepeatableReadTest extends AbstractJPATest { Item it = new Item( check ); inTransaction( session -> { - session.save( it ); + session.persist( it ); } ); @@ -185,7 +185,7 @@ public class RepeatableReadTest extends AbstractJPATest { Part p = new Part( new Item( "EJB3 Specification" ), check, "3.3.5.3", new BigDecimal( 0.0 ) ); inTransaction( session -> { - session.save( p ); + session.persist( p ); } ); @@ -220,8 +220,8 @@ public class RepeatableReadTest extends AbstractJPATest { session -> { Part part = (Part) session.createQuery( "select p from Part p" ).list().get( 0 ); - session.delete( part ); - session.delete( part.getItem() ); + session.remove( part ); + session.remove( part.getItem() ); } ); } @@ -236,7 +236,7 @@ public class RepeatableReadTest extends AbstractJPATest { Part p = new Part( new Item( "EJB3 Specification" ), check, "3.3.5.3", new BigDecimal( 0.0 ) ); inTransaction( session -> { - session.save( p ); + session.persist( p ); } ); @@ -283,8 +283,8 @@ public class RepeatableReadTest extends AbstractJPATest { inTransaction( session -> { Part part = session.get( Part.class, partId ); - session.delete( part ); - session.delete( part.getItem() ); + session.remove( part ); + session.remove( part.getItem() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ImmutableNaturalIdTest.java index 410292c402..15d1e5a209 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ImmutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/ImmutableNaturalIdTest.java @@ -41,7 +41,7 @@ public class ImmutableNaturalIdTest extends AbstractJPATest { } @Test - public void testUpdate() { + public void testMerge() { // prepare some test data... User user = new User(); inTransaction( @@ -49,26 +49,26 @@ public class ImmutableNaturalIdTest extends AbstractJPATest { user.setUserName( "steve" ); user.setEmail( "steve@hibernate.org" ); user.setPassword( "brewhaha" ); - session.save( user ); + session.persist( user ); } ); // 'user' is now a detached entity, so lets change a property and reattch... user.setPassword( "homebrew" ); - inTransaction( + User merged = fromTransaction( session -> - session.update( user ) + session.merge( user ) ); // clean up inTransaction( session -> - session.delete( user ) + session.remove( merged ) ); } @Test - public void testNaturalIdCheck() throws Exception { + public void testNaturalIdCheck() { sessionFactoryScope().inSession( session -> { Transaction t = session.beginTransaction(); @@ -85,7 +85,7 @@ public class ImmutableNaturalIdTest extends AbstractJPATest { t.rollback(); } u.setUserName( "steve" ); - session.delete( u ); + session.remove( u ); session.close(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java index 7d7a67b3ae..7325a10b47 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/naturalid/MutableNaturalIdTest.java @@ -69,7 +69,7 @@ public class MutableNaturalIdTest extends AbstractJPATest { session -> { ClassWithIdentityColumn e = new ClassWithIdentityColumn(); e.setName( "Dampf" ); - session.save( e ); + session.persist( e ); e.setName( "Klein" ); assertNotNull( session.bySimpleNaturalId( ClassWithIdentityColumn.class ).load( "Klein" ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java index fd3ff5942b..18e92f8b0b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadJpaComplianceDifferentSessionsTest.java @@ -7,24 +7,24 @@ package org.hibernate.orm.test.jpa.ops; import java.util.Map; -import jakarta.persistence.EntityManagerFactory; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; import org.hibernate.jpa.boot.spi.Bootstrap; -import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.EntityManagerFactoryBasedFunctionalTest; - +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.jupiter.api.Test; +import jakarta.persistence.EntityManagerFactory; + import static org.hibernate.testing.transaction.TransactionUtil.doInJPA; import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Vlad Mihalcea */ -@TestForIssue(jiraKey = "HHH-12273") +@JiraKey("HHH-12273") public class GetLoadJpaComplianceDifferentSessionsTest extends EntityManagerFactoryBasedFunctionalTest { @Override @@ -41,7 +41,7 @@ public class GetLoadJpaComplianceDifferentSessionsTest extends EntityManagerFact } @Test - @TestForIssue(jiraKey = "HHH-9856") + @JiraKey("HHH-9856") public void testReattachEntityToSessionWithJpaComplianceProxy() { final Integer _workloadId = fromTransaction( entityManager -> { Workload workload = new Workload(); @@ -68,17 +68,19 @@ public class GetLoadJpaComplianceDifferentSessionsTest extends EntityManagerFact ) .build(); + Workload merged; try { - doInJPA( () -> newEntityManagerFactory, entityManager -> { - entityManager.unwrap( Session.class ).update( _workload ); + merged = doInJPA( () -> newEntityManagerFactory, entityManager -> { + Workload workload = entityManager.unwrap( Session.class ).merge( _workload ); - _workload.getId(); + workload.getId(); + return workload; } ); } finally { newEntityManagerFactory.close(); } - assertEquals( "Package", _workload.getName() ); + assertEquals( "Package", merged.getName() ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java index 8ecd9b9ef1..6bd7cf1f2f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoad2Test.java @@ -53,7 +53,7 @@ public class OneToManyPersistAndLoad2Test { scope.inTransaction( session -> { Parent parent = session.get( Parent.class, 1l ); - session.delete( parent ); + session.remove( parent ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java index af1e9b3865..54e9fc520b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/orphan/onetomany/OneToManyPersistAndLoadTest.java @@ -52,7 +52,7 @@ public class OneToManyPersistAndLoadTest { scope.inTransaction( session -> { Parent parent = session.get( Parent.class, 1l ); - session.delete( parent ); + session.remove( parent ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java index df25e87c14..54934a1369 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/JPAQLComplianceTest.java @@ -181,14 +181,12 @@ public class JPAQLComplianceTest extends AbstractJPATest { @TestForIssue(jiraKey = "HHH-12290") public void testParameterCollectionParenthesesAndPositional() { final Item item = new Item( "Mouse" ); - item.setId( 1L ); final Item item2 = new Item( "Computer" ); - item2.setId( 2L ); inTransaction( s -> { - s.save( item ); - s.save( item2 ); + s.persist( item ); + s.persist( item2 ); } ); @@ -214,7 +212,7 @@ public class JPAQLComplianceTest extends AbstractJPATest { ); inTransaction( - s -> s.createQuery( "select i from Item i" ).list().forEach( result -> s.delete( result ) ) + s -> s.createQuery( "select i from Item i" ).list().forEach( result -> s.remove( result ) ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java index 73e849e85a..a34107e294 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/NamedNativeQueryTest.java @@ -33,7 +33,7 @@ public class NamedNativeQueryTest extends BaseCoreFunctionalTestCase { Session session = openSession(); session.getTransaction().begin(); FromEntity fromEntity = new FromEntity( name, lastName ); - session.save( fromEntity ); + session.persist( fromEntity ); session.getTransaction().commit(); session.close(); return fromEntity; @@ -44,7 +44,7 @@ public class NamedNativeQueryTest extends BaseCoreFunctionalTestCase { Session session = openSession(); session.getTransaction().begin(); - session.save( destinationEntity ); + session.persist( destinationEntity ); session.getTransaction().commit(); session.close(); return destinationEntity; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java index 6530a8b0be..1012a3a680 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ql/TreatKeywordTest.java @@ -71,9 +71,9 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); DiscriminatorEntity root = new DiscriminatorEntity( 1, "root" ); - s.save( root ); + s.persist( root ); DiscriminatorEntitySubclass child = new DiscriminatorEntitySubclass( 2, "child", root ); - s.save( child ); + s.persist( child ); s.getTransaction().commit(); s.close(); @@ -100,8 +100,8 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( root ); - s.delete( child ); + s.remove( root ); + s.remove( child ); s.getTransaction().commit(); s.close(); } @@ -112,9 +112,9 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); JoinedEntity root = new JoinedEntity( 1, "root" ); - s.save( root ); + s.persist( root ); JoinedEntitySubclass child = new JoinedEntitySubclass( 2, "child", root ); - s.save( child ); + s.persist( child ); s.getTransaction().commit(); s.close(); @@ -144,8 +144,8 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( child ); - s.delete( root ); + s.remove( child ); + s.remove( root ); s.getTransaction().commit(); s.close(); } @@ -156,11 +156,11 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); JoinedEntity root = new JoinedEntity( 1, "root" ); - s.save( root ); + s.persist( root ); JoinedEntitySubclass child1 = new JoinedEntitySubclass( 2, "child1", root ); - s.save( child1 ); + s.persist( child1 ); JoinedEntitySubclass2 child2 = new JoinedEntitySubclass2( 3, "child2", root ); - s.save( child2 ); + s.persist( child2 ); s.getTransaction().commit(); s.close(); @@ -185,9 +185,9 @@ public class TreatKeywordTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( child1 ); - s.delete( child2 ); - s.delete( root ); + s.remove( child1 ); + s.remove( child2 ); + s.remove( root ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/removed/RemovedEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/removed/RemovedEntityTest.java index 8595f76414..31517166f0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/removed/RemovedEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/removed/RemovedEntityTest.java @@ -36,7 +36,7 @@ public class RemovedEntityTest extends AbstractJPATest { boolean contains = fromTransaction( session -> { - session.delete( item ); + session.remove( item ); return session.contains( item ); } ); @@ -58,7 +58,7 @@ public class RemovedEntityTest extends AbstractJPATest { Item item = fromTransaction( session -> { - session.delete( it ); + session.remove( it ); return session.get( Item.class, id ); } ); @@ -83,7 +83,7 @@ public class RemovedEntityTest extends AbstractJPATest { Item item = session.get( Item.class, id ); String sessionAsString = session.toString(); - session.delete( item ); + session.remove( item ); Item item2 = session.get( Item.class, id ); assertNull( item2, "expecting removed entity to be returned as null from get()" ); @@ -108,7 +108,7 @@ public class RemovedEntityTest extends AbstractJPATest { // clean up inTransaction( session -> - session.delete( item ) + session.remove( item ) ); } @@ -124,7 +124,7 @@ public class RemovedEntityTest extends AbstractJPATest { session.persist( item ); // delete cascades to part also - session.delete( item ); + session.remove( item ); assertFalse( session.contains( item ), "the item is contained in the session after deletion" ); assertFalse( session.contains( part ), "the part is contained in the session after deletion" ); @@ -138,7 +138,7 @@ public class RemovedEntityTest extends AbstractJPATest { // clean up inTransaction( session -> - session.delete( item ) + session.remove( item ) ); } @@ -155,7 +155,7 @@ public class RemovedEntityTest extends AbstractJPATest { session.persist( item ); // delete the part - session.delete( child ); + session.remove( child ); assertFalse( session.contains( child ), "the child is contained in the session, since it is deleted" @@ -173,7 +173,7 @@ public class RemovedEntityTest extends AbstractJPATest { // clean up inTransaction( session -> - session.delete( item ) + session.remove( item ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java index 574c2fdfb7..0367ea55ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/transaction/FlushAndTransactionTest.java @@ -11,6 +11,7 @@ import java.util.Map; import org.hibernate.Session; import org.hibernate.SessionFactory; +import org.hibernate.StaleObjectStateException; import org.hibernate.cfg.AvailableSettings; import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase; import org.hibernate.stat.Statistics; @@ -35,7 +36,7 @@ import static org.junit.Assert.fail; */ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase { @Test - public void testAlwaysTransactionalOperations() throws Exception { + public void testAlwaysTransactionalOperations() { Book book = new Book(); book.name = "Le petit prince"; EntityManager em = getOrCreateEntityManager(); @@ -46,14 +47,14 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase em.flush(); fail( "flush has to be inside a Tx" ); } - catch ( TransactionRequiredException e ) { + catch (TransactionRequiredException e) { //success } try { em.lock( book, LockModeType.READ ); fail( "lock has to be inside a Tx" ); } - catch ( TransactionRequiredException e ) { + catch (TransactionRequiredException e) { //success } em.getTransaction().begin(); @@ -63,7 +64,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase } @Test - public void testTransactionalOperationsWhenExtended() throws Exception { + public void testTransactionalOperationsWhenExtended() { Book book = new Book(); book.name = "Le petit prince"; EntityManager em = getOrCreateEntityManager(); @@ -107,7 +108,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase } @Test - public void testMergeWhenExtended() throws Exception { + public void testMergeWhenExtended() { Book book = new Book(); book.name = "Le petit prince"; EntityManager em = getOrCreateEntityManager(); @@ -151,7 +152,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase } @Test - public void testCloseAndTransaction() throws Exception { + public void testCloseAndTransaction() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); Book book = new Book(); @@ -163,7 +164,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase em.flush(); fail( "direct action on a closed em should fail" ); } - catch ( IllegalStateException e ) { + catch (IllegalStateException e) { //success } finally { @@ -174,7 +175,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase } @Test - public void testTransactionCommitDoesNotFlush() throws Exception { + public void testTransactionCommitDoesNotFlush() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); Book book = new Book(); @@ -192,7 +193,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase } @Test - public void testTransactionAndContains() throws Exception { + public void testTransactionAndContains() { EntityManager em = getOrCreateEntityManager(); em.getTransaction().begin(); Book book = new Book(); @@ -212,7 +213,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase } @Test - public void testRollbackOnlyOnPersistenceException() throws Exception { + public void testRollbackOnlyOnPersistenceException() { Book book = new Book(); book.name = "Stolen keys"; book.id = null; //new Integer( 50 ); @@ -231,7 +232,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase em.flush(); fail( "optimistic locking exception" ); } - catch ( PersistenceException e ) { + catch (PersistenceException e) { //success } @@ -239,7 +240,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase em.getTransaction().commit(); fail( "Commit should be rollbacked" ); } - catch ( RollbackException e ) { + catch (RollbackException e) { //success } finally { @@ -248,7 +249,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase } @Test - public void testRollbackExceptionOnOptimisticLockException() throws Exception { + public void testRollbackExceptionOnOptimisticLockException() { Book book = new Book(); book.name = "Stolen keys"; book.id = null; //new Integer( 50 ); @@ -262,15 +263,15 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase em.flush(); em.clear(); book.setName( "kitty kid2" ); //non updated version - em.unwrap( Session.class ).update( book ); try { + em.unwrap( Session.class ).merge( book ); em.getTransaction().commit(); fail( "Commit should be rollbacked" ); } - catch ( RollbackException e ) { + catch (OptimisticLockException e) { assertTrue( "During flush a StateStateException is wrapped into a OptimisticLockException", - e.getCause() instanceof OptimisticLockException + e.getCause() instanceof StaleObjectStateException ); } finally { @@ -280,7 +281,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase } @Test - public void testRollbackClearPC() throws Exception { + public void testRollbackClearPC() { Book book = new Book(); book.name = "Stolen keys"; EntityManager em = getOrCreateEntityManager(); @@ -298,7 +299,7 @@ public class FlushAndTransactionTest extends BaseEntityManagerFunctionalTestCase } @Test - public void testSetRollbackOnlyAndFlush() throws Exception { + public void testSetRollbackOnlyAndFlush() { Book book = new Book(); book.name = "The jungle book"; EntityManager em = getOrCreateEntityManager(); 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 838b75a587..7bc63d140e 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 @@ -30,7 +30,7 @@ public class JpaSpecVersionValueUpdatingTest extends BaseCoreFunctionalTestCase session.beginTransaction(); Customer customer = new Customer(); customer.id = 1L; - session.save( customer ); + session.persist( customer ); session.getTransaction().commit(); session.close(); @@ -38,13 +38,13 @@ public class JpaSpecVersionValueUpdatingTest extends BaseCoreFunctionalTestCase session = openSession(); session.beginTransaction(); - customer = (Customer) session.get( Customer.class, 1L ); + customer = session.get( Customer.class, 1L ); assertEquals( initial, customer.version ); Order order = new Order(); order.id = 1L; order.customer = customer; customer.orders.add( order ); - session.save( order ); + session.persist( order ); session.getTransaction().commit(); session.close(); @@ -52,13 +52,13 @@ public class JpaSpecVersionValueUpdatingTest extends BaseCoreFunctionalTestCase session = openSession(); session.beginTransaction(); - customer = (Customer) session.get( Customer.class, 1L ); + customer = session.get( Customer.class, 1L ); assertEquals( initial, customer.version ); Order order2 = new Order(); order2.id = 2L; order2.customer = customer; customer.orders.add( order2 ); - session.save( order2 ); + session.persist( order2 ); session.getTransaction().commit(); session.close(); @@ -66,9 +66,9 @@ public class JpaSpecVersionValueUpdatingTest extends BaseCoreFunctionalTestCase session = openSession(); session.beginTransaction(); - customer = (Customer) session.load( Customer.class, 1L ); + customer = session.load( Customer.class, 1L ); assertEquals( initial, customer.version ); - session.delete( customer ); + session.remove( customer ); session.getTransaction().commit(); session.close(); } @@ -80,7 +80,7 @@ public class JpaSpecVersionValueUpdatingTest extends BaseCoreFunctionalTestCase Session session = openSession(); session.beginTransaction(); - session.save( customer ); + session.persist( customer ); session.getTransaction().commit(); session.close(); @@ -113,9 +113,9 @@ public class JpaSpecVersionValueUpdatingTest extends BaseCoreFunctionalTestCase session = openSession(); session.beginTransaction(); - customer = (Customer) session.load( Customer.class, 1L ); + customer = session.load( Customer.class, 1L ); assertEquals( initial, customer.version ); - session.delete( customer ); + session.remove( customer ); session.getTransaction().commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerCollectionLazyKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerCollectionLazyKeyManyToOneTest.java index f315582bbb..0956e6d280 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerCollectionLazyKeyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerCollectionLazyKeyManyToOneTest.java @@ -33,7 +33,7 @@ public class EagerCollectionLazyKeyManyToOneTest { session -> { List customers = session.createQuery( "from Customer" ).list(); customers.forEach( - customer -> session.delete( customer ) + customer -> session.remove( customer ) ); } ); @@ -47,7 +47,7 @@ public class EagerCollectionLazyKeyManyToOneTest { scope.inTransaction( session -> { - session.save( cust ); + session.persist( cust ); } ); @@ -73,7 +73,7 @@ public class EagerCollectionLazyKeyManyToOneTest { Order order = new Order( new Order.Id( cust, 1 ) ); cust.getOrders().add( order ); statistics.clear(); - session.save( cust ); + session.persist( cust ); session.flush(); assertEquals( 2, statistics.getEntityInsertCount() ); @@ -89,7 +89,7 @@ public class EagerCollectionLazyKeyManyToOneTest { customer.getOrders().add( order ); scope.inTransaction( - session -> session.save( customer ) + session -> session.persist( customer ) ); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java index 916b8cd023..f2370f2b66 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/EagerKeyManyToOneTest.java @@ -73,7 +73,7 @@ public class EagerKeyManyToOneTest { session -> { List customers = session.createQuery( "from Customer" ).list(); customers.forEach( - customer -> session.delete( customer ) + customer -> session.remove( customer ) ); } ); @@ -91,7 +91,7 @@ public class EagerKeyManyToOneTest { Customer cust = new Customer( "Acme, Inc." ); Order order = new Order( new Order.Id( cust, 1 ) ); cust.getOrders().add( order ); - s.save( cust ); + s.persist( cust ); s.flush(); assertEquals( 2, statistics.getEntityInsertCount() ); } @@ -108,7 +108,7 @@ public class EagerKeyManyToOneTest { Customer cust = new Customer( "Acme, Inc." ); Order order = new Order( new Order.Id( cust, 1 ) ); cust.getOrders().add( order ); - s.save( cust ); + s.persist( cust ); } ); @@ -159,7 +159,7 @@ public class EagerKeyManyToOneTest { Order order = new Order( new Order.Id( customer, 1 ) ); customer.getOrders().add( order ); scope.inTransaction( - session -> session.save( customer ) + session -> session.persist( customer ) ); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java index 1f211cd5e9..6f625fc546 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/component/LazyKeyManyToOneTest.java @@ -33,7 +33,7 @@ public class LazyKeyManyToOneTest { session -> { List customers = session.createQuery( "from Customer" ).list(); customers.forEach( - customer -> session.delete( customer ) + customer -> session.remove( customer ) ); } ); @@ -46,7 +46,7 @@ public class LazyKeyManyToOneTest { cust.getOrders().add( order ); scope.inTransaction( - session -> session.save( cust ) + session -> session.persist( cust ) ); scope.inTransaction( @@ -71,7 +71,7 @@ public class LazyKeyManyToOneTest { Order order = new Order( new Order.Id( cust, 1 ) ); cust.getOrders().add( order ); statistics.clear(); - session.save( cust ); + session.persist( cust ); session.flush(); assertEquals( 2, statistics.getEntityInsertCount() ); } @@ -86,7 +86,7 @@ public class LazyKeyManyToOneTest { customer.getOrders().add( order ); scope.inTransaction( - session -> session.save( customer ) + session -> session.persist( customer ) ); scope.inTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java index 555ca2d355..58dc67a7f7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/embedded/KeyManyToOneTest.java @@ -70,10 +70,10 @@ public class KeyManyToOneTest { Order order = new Order( cust, 1 ); cust.getOrders().add( order ); getStatistics( scope ).clear(); - s.save( cust ); + s.persist( cust ); s.flush(); assertThat( getStatistics( scope ).getEntityInsertCount(), is( 2L ) ); - s.delete( cust ); + s.remove( cust ); } ); } @@ -83,7 +83,7 @@ public class KeyManyToOneTest { Order order = new Order( cust, 1 ); scope.inTransaction( s -> { cust.getOrders().add( order ); - s.save( cust ); + s.persist( cust ); } ); scope.inTransaction( s -> { @@ -94,7 +94,7 @@ public class KeyManyToOneTest { } ); scope.inTransaction( s -> { - s.delete( cust ); + s.remove( cust ); } ); } @@ -105,7 +105,7 @@ public class KeyManyToOneTest { Customer cust = new Customer( "Acme, Inc." ); Order order = new Order( cust, 1 ); cust.getOrders().add( order ); - session.save( cust ); + session.persist( cust ); return cust; } ); @@ -124,7 +124,7 @@ public class KeyManyToOneTest { assertThat( cust.getOrders().size(), is( 1 ) ); session.clear(); - session.delete( cust ); + session.remove( cust ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java index 163e288820..ff7112f4b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/bidir/ondelete/KeyManyToOneCascadeDeleteTest.java @@ -48,15 +48,15 @@ public class KeyManyToOneCascadeDeleteTest { order1.setItem( "laptop" ); Order order2 = new Order( customer, 2L ); order2.setItem( "printer" ); - session.save( customer ); - session.save( order1 ); - session.save( order2 ); + session.persist( customer ); + session.persist( order1 ); + session.persist( order2 ); session.getTransaction().commit(); // Removing customer cascades to associated orders. session.getTransaction().begin(); customer = session.get( Customer.class, customer.getId() ); - session.delete( customer ); + session.remove( customer ); session.getTransaction().commit(); session.getTransaction().begin(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java index fac0714973..57dec16e47 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/keymanytoone/unidir/ondelete/KeyManyToOneCascadeDeleteTest.java @@ -38,9 +38,9 @@ public class KeyManyToOneCascadeDeleteTest { order2.setItem( "printer" ); session.getTransaction().begin(); try { - session.save( customer ); - session.save( order1 ); - session.save( order2 ); + session.persist( customer ); + session.persist( order1 ); + session.persist( order2 ); session.getTransaction().commit(); } catch (Exception e) { @@ -54,7 +54,7 @@ public class KeyManyToOneCascadeDeleteTest { session.getTransaction().begin(); try { customer = session.get( Customer.class, customer.getId() ); - session.delete( customer ); + session.remove( customer ); session.getTransaction().commit(); } catch (Exception e) { 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 efffe9d76a..3831d9095d 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 @@ -118,9 +118,10 @@ public class LazyLoadingTest { final Object clientId = scope.fromTransaction( session -> { Address address = new Address(); - session.save( address ); + session.persist( address ); Client client = new Client( address ); - return session.save( client ); + session.persist( client ); + return client.getId(); } ); @@ -155,12 +156,12 @@ public class LazyLoadingTest { public void testGetIdManyToOne(SessionFactoryScope scope) { Serializable accountId = scope.fromTransaction( session -> { Address address = new Address(); - session.save( address ); + session.persist( address ); Client client = new Client( address ); Account account = new Account(); client.addAccount( account ); - session.save( account ); - session.save( client ); + session.persist( account ); + session.persist( client ); return account.getId(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/LazyOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/LazyOneToOneTest.java index 381484bf0d..9735fbd5ce 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/LazyOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lazyonetoone/LazyOneToOneTest.java @@ -76,9 +76,9 @@ public class LazyOneToOneTest { assertEquals( p.getEmployee().getEmployments().size(), 1 ); Person p2 = session.get( Person.class, "Emmanuel" ); assertNull( p2.getEmployee() ); - session.delete( p2 ); - session.delete( old ); - session.delete( p ); + session.remove( p2 ); + session.remove( old ); + session.remove( p ); } ); } 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 3edf838882..c36789eca5 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 @@ -39,10 +39,10 @@ public class ABCTest { scope.inTransaction( session -> { D d = new D( did ); - session.save( d ); + session.persist( d ); A a = new A(); a.setName( "a" ); - session.save( a ); + session.persist( a ); d.setReverse( a ); d.inverse = a; } @@ -100,9 +100,9 @@ public class ABCTest { c.setName( "c1" ); c.setBName( "a funny name" ); c.setD( d ); - session.save( c ); + session.persist( c ); d.setId( c.getId() ); - session.save( d ); + session.persist( d ); assertThat( session.createQuery( "from C2 c where 1=1 or 1=1" ).list().size(), is( 0 ) ); } @@ -154,8 +154,8 @@ public class ABCTest { session -> { List bs = session.createQuery( "from B" ).list(); for ( C1 b : bs ) { - session.delete( b ); - session.delete( b.getD() ); + session.remove( b ); + session.remove( b.getD() ); } } ); @@ -168,10 +168,10 @@ public class ABCTest { assertNull( session.get( D.class, 1L ) ); D d = new D(); d.setId( 1L ); - session.save( d ); + session.persist( d ); session.flush(); assertNotNull( session.get( D.class, 1L ) ); - session.delete( d ); + session.remove( d ); session.flush(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.java index b990003312..5811517177 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/Fum.java @@ -86,7 +86,7 @@ public class Fum implements Lifecycle, Serializable { try { Iterator iter = friends.iterator(); while ( iter.hasNext() ) { - s.delete( iter.next() ); + s.remove( iter.next() ); } } catch (Exception e) { @@ -105,7 +105,7 @@ public class Fum implements Lifecycle, Serializable { try { Iterator iter = friends.iterator(); while ( iter.hasNext() ) { - s.save( iter.next() ); + s.persist( iter.next() ); } } catch (Exception e) { 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 b5518a5996..5f4c2e62e7 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 @@ -43,7 +43,7 @@ public class Qux implements Lifecycle { created=true; try { foo = new Foo(); - session.save(foo); + session.persist(foo); } catch (Exception e) { throw new CallbackException(e); @@ -55,12 +55,12 @@ public class Qux implements Lifecycle { public boolean onDelete(Session session) throws CallbackException { deleted=true; try { - session.delete(foo); + session.remove(foo); } catch (Exception e) { throw new CallbackException(e); } - //if (child!=null) session.delete(child); + //if (child!=null) session.remove(child); return NO_VETO; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java index 276e33c456..19eda50fa6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/MappedFetchTests.java @@ -149,12 +149,12 @@ public class MappedFetchTests { final RootEntity root1 = new RootEntity( 1, "first" ); root1.addNickName( "1st" ); root1.addNickName( "primo" ); - session.save( root1 ); + session.persist( root1 ); final RootEntity root2 = new RootEntity( 2, "second" ); root2.addNickName( "2nd" ); root2.addNickName( "first loser" ); - session.save( root2 ); + session.persist( root2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiIdEntityLoadTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiIdEntityLoadTests.java index 51cf57e975..ce2d998215 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiIdEntityLoadTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiIdEntityLoadTests.java @@ -78,7 +78,7 @@ public class MultiIdEntityLoadTests { // using ordered results scope.inTransaction( session -> { - session.delete( session.get( BasicEntity.class, 2 ) ); + session.remove( session.get( BasicEntity.class, 2 ) ); // test control - no delete-checking { @@ -129,7 +129,7 @@ public class MultiIdEntityLoadTests { // using un-ordered results scope.inTransaction( session -> { - session.delete( session.get( BasicEntity.class, 2 ) ); + session.remove( session.get( BasicEntity.class, 2 ) ); // test control - no delete-checking { @@ -184,18 +184,18 @@ public class MultiIdEntityLoadTests { final BasicEntity first = new BasicEntity( 1, "first" ); final BasicEntity second = new BasicEntity( 2, "second" ); final BasicEntity third = new BasicEntity( 3, "third" ); - session.save( first ); - session.save( second ); - session.save( third ); + session.persist( first ); + session.persist( second ); + session.persist( third ); - session.save( + session.persist( new EntityWithAggregateId( new EntityWithAggregateId.Key( "abc", "def"), "ghi" ) ); - session.save( + session.persist( new EntityWithAggregateId( new EntityWithAggregateId.Key( "123", "456"), "789" 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 49f6db6c0d..e0826fa884 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 @@ -71,7 +71,7 @@ public class MultiLoadTest { session -> { session.setCacheMode( CacheMode.IGNORE ); for ( int i = 1; i <= 60; i++ ) { - session.save( new SimpleEntity( i, "Entity #" + i ) ); + session.persist( new SimpleEntity( i, "Entity #" + i ) ); } } ); @@ -122,7 +122,7 @@ public class MultiLoadTest { session -> { // delete one of them (but do not flush)... SimpleEntity s4 = session.load(SimpleEntity.class, 5); - session.delete( s4 ); + session.remove( s4 ); assertFalse( Hibernate.isInitialized( s4 ) ); @@ -142,7 +142,7 @@ public class MultiLoadTest { // delete one of them (but do not flush)... SimpleEntity s4 = session.load( SimpleEntity.class, 5 ); Hibernate.initialize( s4 ); - session.delete( s4 ); + session.remove( s4 ); // as a baseline, assert based on how load() handles it SimpleEntity s5 = session.load( SimpleEntity.class, 5 ); @@ -159,7 +159,7 @@ public class MultiLoadTest { // delete one of them (but do not flush)... SimpleEntity s4 = session.load( SimpleEntity.class, 5 ); Hibernate.initialize( s4 ); - session.delete( s4 ); + session.remove( s4 ); // and then, assert how get() handles it SimpleEntity s5 = session.get( SimpleEntity.class, 5 ); @@ -176,7 +176,7 @@ public class MultiLoadTest { // delete one of them (but do not flush)... SimpleEntity s4 = session.load( SimpleEntity.class, 5 ); Hibernate.initialize( s4 ); - session.delete( s4 ); + session.remove( s4 ); // finally assert how multiLoad handles it List list = session.byMultipleIds( SimpleEntity.class ).multiLoad( ids( 56 ) ); @@ -191,7 +191,7 @@ public class MultiLoadTest { scope.inTransaction( session -> { // delete one of them (but do not flush)... - session.delete( session.load( SimpleEntity.class, 5 ) ); + session.remove( session.load( SimpleEntity.class, 5 ) ); // and then, assert how get() handles it SimpleEntity s5 = session.get( SimpleEntity.class, 5 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/BlobLocatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/BlobLocatorTest.java index ebfabf1cef..b7d145cfaa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/BlobLocatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/BlobLocatorTest.java @@ -57,7 +57,7 @@ public class BlobLocatorTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); LobHolder entity = new LobHolder(); entity.setBlobLocator( s.getLobHelper().createBlob( original ) ); - s.save( entity ); + s.persist( entity ); s.getTransaction().commit(); s.close(); @@ -120,7 +120,7 @@ public class BlobLocatorTest extends BaseCoreFunctionalTestCase { Assert.assertEquals( empty.length, entity.getBlobLocator().length() ); assertEquals( empty, extractData( entity.getBlobLocator() ) ); } - s.delete( entity ); + s.remove( entity ); s.getTransaction().commit(); s.close(); @@ -142,7 +142,7 @@ public class BlobLocatorTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); LobHolder entity = new LobHolder(); entity.setBlobLocator( s.getLobHelper().createBlob( original ) ); - s.save( entity ); + s.persist( entity ); s.getTransaction().commit(); s.close(); @@ -159,7 +159,7 @@ public class BlobLocatorTest extends BaseCoreFunctionalTestCase { s = openSession(); s.beginTransaction(); - s.delete( entity ); + s.remove( entity ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ClobLocatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ClobLocatorTest.java index b865ad49fc..8c748cfe49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ClobLocatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/ClobLocatorTest.java @@ -60,7 +60,7 @@ public class ClobLocatorTest { session -> { LobHolder entity = new LobHolder(); entity.setClobLocator( session.getLobHelper().createClob( original ) ); - session.save( entity ); + session.persist( entity ); return entity.getId(); } ); @@ -158,7 +158,7 @@ public class ClobLocatorTest { assertEquals( empty.length(), entity.getClobLocator().length() ); assertEquals( empty, extractData( entity.getClobLocator() ) ); } - session.delete( entity ); + session.remove( entity ); } catch (Exception e) { fail( e ); @@ -181,7 +181,7 @@ public class ClobLocatorTest { session -> { LobHolder entity = new LobHolder(); entity.setClobLocator( session.getLobHelper().createClob( original ) ); - session.save( entity ); + session.persist( entity ); return entity.getId(); } ); @@ -199,7 +199,7 @@ public class ClobLocatorTest { scope.inTransaction( session -> - session.delete( lobHolder ) + session.remove( lobHolder ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java index 3d04a01802..791619994e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobAsLastValueTest.java @@ -44,7 +44,7 @@ public class LobAsLastValueTest { new String( details ), new String( title ) ); - session.save( entity ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java index d24cedd7a9..c139cbacfb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobMergeTest.java @@ -46,7 +46,7 @@ public class LobMergeTest extends BaseCoreFunctionalTestCase { LobHolder entity = new LobHolder(); entity.setBlobLocator( s.getLobHelper().createBlob( original ) ); - s.save( entity ); + s.persist( entity ); s.getTransaction().commit(); s.close(); @@ -66,7 +66,7 @@ public class LobMergeTest extends BaseCoreFunctionalTestCase { "blob contents did not match after merge", Arrays.equals( updated, BlobLocatorTest.extractData( entity.getBlobLocator() ) ) ); - s.delete( entity ); + s.remove( entity ); s.getTransaction().commit(); s.close(); } @@ -81,7 +81,7 @@ public class LobMergeTest extends BaseCoreFunctionalTestCase { LobHolder entity = new LobHolder(); entity.setClobLocator( s.getLobHelper().createClob( original ) ); - s.save( entity ); + s.persist( entity ); s.getTransaction().commit(); s.close(); @@ -103,7 +103,7 @@ public class LobMergeTest extends BaseCoreFunctionalTestCase { updated, ClobLocatorTest.extractData( entity.getClobLocator() ) ); - s.delete( entity ); + s.remove( entity ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java index 65a1753d08..9e101dfb37 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringFunctionsTest.java @@ -51,7 +51,7 @@ public class LobStringFunctionsTest { entity.setFirstLobField( value1 ); entity.setSecondLobField( value2 ); entity.setClobField( session.getLobHelper().createClob( value2 ) ); - session.save( entity ); + session.persist( entity ); } ); scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java index 334d375d0f..8a4603181e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LobStringTest.java @@ -62,7 +62,7 @@ public class LobStringTest { entity.setFirstLobField( value1 ); entity.setSecondLobField( value2 ); entity.setClobField( session.getLobHelper().createClob( value2 ) ); - session.save( entity ); + session.persist( entity ); } ); scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayTest.java index 0f14965c05..d0880c9c0f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongByteArrayTest.java @@ -39,7 +39,7 @@ public abstract class LongByteArrayTest { Long id = scope.fromTransaction( session -> { LongByteArrayHolder entity = new LongByteArrayHolder(); - session.save( entity ); + session.persist( entity ); return entity.getId(); } ); @@ -88,7 +88,7 @@ public abstract class LongByteArrayTest { scope.inTransaction( session -> { longByteArrayHolder.setLongByteArray( empty ); - session.save( longByteArrayHolder ); + session.persist( longByteArrayHolder ); } ); @@ -121,7 +121,7 @@ public abstract class LongByteArrayTest { LongByteArrayHolder entity = session.get( LongByteArrayHolder.class, id ); Assertions.assertEquals( ARRAY_SIZE, entity.getLongByteArray().length ); assertEquals( value, entity.getLongByteArray() ); - session.delete( entity ); + session.remove( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringTest.java index 767679a059..337d27de80 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/LongStringTest.java @@ -36,7 +36,7 @@ public abstract class LongStringTest { Long id = scope.fromTransaction( session -> { LongStringHolder entity = new LongStringHolder(); - session.save( entity ); + session.persist( entity ); return entity.getId(); } ); @@ -89,7 +89,7 @@ public abstract class LongStringTest { assertEquals( empty, entity.getLongString() ); } } - session.delete( entity ); + session.remove( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableTypeTest.java index 4b3b9a89c0..9fc3cccbe0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/lob/SerializableTypeTest.java @@ -39,7 +39,7 @@ public class SerializableTypeTest { SerializableHolder serializableHolder = scope.fromTransaction( session -> { SerializableHolder holder = new SerializableHolder(); - session.save( holder ); + session.persist( holder ); return holder; } ); @@ -85,7 +85,7 @@ public class SerializableTypeTest { SerializableHolder holder = session.get( SerializableHolder.class, id ); SerializableData serialData = (SerializableData) holder.getSerialData(); assertEquals( empty, serialData.getPayload() ); - session.delete( holder ); + session.remove( holder ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java index 8eb6d2519a..5e3448f861 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/HANAOptimisticLockingTest.java @@ -50,7 +50,11 @@ public class HANAOptimisticLockingTest { private void testWithSpecifiedLockMode(SessionFactoryScope scope, LockModeType lockModeType) { // makes sure we have an entity to actually query Object id = scope.fromTransaction( - session -> session.save( new SomeEntity() ) + session -> { + SomeEntity someEntity = new SomeEntity(); + session.persist( someEntity ); + return someEntity.getId(); + } ); // tests that both the query execution doesn't throw a SQL syntax (which is the main bug) and that diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java index 61dd9186e4..f3e1afafc6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/JoinedInheritanceOptimisticForceIncrementTest.java @@ -49,7 +49,7 @@ public class JoinedInheritanceOptimisticForceIncrementTest extends BaseNonConfig doInHibernate( this::sessionFactory, session -> { - session.delete( session.get( Employee.class, 1L ) ); + session.remove( session.get( Employee.class, 1L ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java index bb9dac8aa6..793eafb64b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java @@ -69,7 +69,9 @@ public class LockModeTest extends BaseSessionFactoryFunctionalTest { @BeforeEach public void prepareTest() throws Exception { doInHibernate( this::sessionFactory, session -> { - id = (Long) session.save( new A( "it" ) ); + A a = new A( "it" ); + session.persist( a ); + id = a.getId(); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java index 11407ac0ea..2f68dac98a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockRefreshTest.java @@ -93,7 +93,7 @@ public class LockRefreshTest extends BaseNonConfigCoreFunctionalTestCase { final Employee employee = session.get( Employee.class, "Jane" ); session.lock( employee, lockModeType ); session.refresh( employee ); - session.delete( employee ); + session.remove( employee ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/RemoveEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/RemoveEntityTest.java index a842a66675..4f278ea0b1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/RemoveEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/RemoveEntityTest.java @@ -48,19 +48,19 @@ public class RemoveEntityTest { session -> { EmployeeEntity emp = new EmployeeEntity(); emp.setEmail( EMPLOYEE_TO_DELETE_MAIL ); - session.save( emp ); + session.persist( emp ); LinkEntity linkEntity = new LinkEntity(); linkEntity.setEmployeeId( emp.getEmployeeId() ); - session.save( linkEntity ); + session.persist( linkEntity ); Set link = Set.of( linkEntity ); emp.setFolderLink( link ); - session.save( emp ); + session.persist( emp ); emp = new EmployeeEntity(); emp.setEmail( "demo-user2@mail.com" ); - session.save( emp ); + session.persist( emp ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java index 7ac32ca926..0f7a7a3f0e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/paging/PagingAndLockingTest.java @@ -39,10 +39,10 @@ public class PagingAndLockingTest extends BaseCoreFunctionalTestCase { public void createTestData() { inTransaction( session -> { - session.save( new Door( 1, "Front" ) ); - session.save( new Door( 2, "Back" ) ); - session.save( new Door( 3, "Garage" ) ); - session.save( new Door( 4, "French" ) ); + session.persist( new Door( 1, "Front" ) ); + session.persist( new Door( 2, "Back" ) ); + session.persist( new Door( 3, "Garage" ) ); + session.persist( new Door( 4, "French" ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java index e1cb5ccd05..0803c109c7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyTest.java @@ -134,7 +134,7 @@ public class ManyToManyTest { scope.inTransaction( s -> { - s.delete( user ); + s.remove( user ); s.flush(); s.createQuery( "delete from Group" ).executeUpdate(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java index 3687aee0ad..6a6795f7fd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ManyToManyWhereTest.java @@ -44,8 +44,8 @@ public class ManyToManyWhereTest { // create advertisements Advertisement advertisement1 = new Advertisement(); Advertisement advertisement2 = new Advertisement(); - session.saveOrUpdate( advertisement1 ); - session.saveOrUpdate( advertisement2 ); + session.persist( advertisement1 ); + session.persist( advertisement2 ); // create attachment relationships to advertisements Attachment a1 = new Attachment(); a1.setFileName( "memo.txt" ); @@ -56,8 +56,8 @@ public class ManyToManyWhereTest { a2.setAdvertisements( new LinkedHashSet<>( Arrays.asList( advertisement1, advertisement2 ) ) ); advertisement1.setAttachments( new HashSet<>( Arrays.asList( a1, a2 ) ) ); advertisement2.setAttachments( new HashSet<>( Arrays.asList( a1, a2 ) ) ); - session.saveOrUpdate( a1 ); - session.saveOrUpdate( a2 ); + session.persist( a1 ); + session.persist( a2 ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java index ba9fc875f6..d778d43348 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/batchload/BatchedManyToManyTest.java @@ -66,8 +66,8 @@ public class BatchedManyToManyTest { scope.inTransaction( session -> { - session.save( me ); - session.save( you ); + session.persist( me ); + session.persist( you ); } ); } @@ -80,7 +80,7 @@ public class BatchedManyToManyTest { // User is the non-inverse side... List users = session.createQuery( "from User" ).list(); for ( User user : users ) { - session.delete( user ); + session.remove( user ); } session.flush(); session.createQuery( "delete Group" ).executeUpdate(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java index e68ee1d8f3..391e7888c7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomany/ordered/OrderedManyToManyTest.java @@ -128,11 +128,11 @@ public class OrderedManyToManyTest { // clean up scope.inTransaction( s -> { - s.delete( gavin ); - s.delete( steve ); - s.delete( max ); - s.delete( emmanuel ); - s.delete( hibernate ); + s.remove( gavin ); + s.remove( steve ); + s.remove( max ); + s.remove( emmanuel ); + s.remove( hibernate ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java index 5e39becaa5..11a6e30a7b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/manytomanyassociationclass/AbstractManyToManyAssociationClassTest.java @@ -37,8 +37,8 @@ public abstract class AbstractManyToManyAssociationClassTest { session -> { user = new User( "user" ); group = new Group( "group" ); - session.save( user ); - session.save( group ); + session.persist( user ); + session.persist( group ); membership = createMembership( "membership" ); addMembership( user, group, membership ); } @@ -219,8 +219,8 @@ public abstract class AbstractManyToManyAssociationClassTest { public void testDeleteDetached(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.delete( user ); - session.delete( group ); + session.remove( user ); + session.remove( group ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java index 38e4261da2..371584722c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/map/MapIndexFormulaTest.java @@ -89,7 +89,7 @@ public class MapIndexFormulaTest { Map smap = ( (User) g.getUsers().get( "gavin" ) ).getSession(); assertEquals( 1, smap.size() ); User gavin = (User) g.getUsers().put( "gavin", turin ); - session.delete( gavin ); + session.remove( gavin ); assertEquals( 0l, session.createQuery( "select count(*) from SessionAttribute" ).uniqueResult() @@ -109,8 +109,8 @@ public class MapIndexFormulaTest { 1l, session.createQuery( "select count(*) from User" ).uniqueResult() ); - session.delete( g ); - session.delete( t ); + session.remove( g ); + session.remove( t ); assertEquals( 0l, session.createQuery( "select count(*) from User" ).uniqueResult() diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/MapElementFormulaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/MapElementFormulaTest.java index c4b7a2bb1a..ac037ddca0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/MapElementFormulaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapelemformula/MapElementFormulaTest.java @@ -44,9 +44,9 @@ public class MapElementFormulaTest { session -> { Group g = session.get( Group.class, "users" ); assertEquals( 1, g.getUsers().size() ); - session.delete( g ); - session.delete( g.getUsers().get( "Gavin" ) ); - session.delete( session.get( User.class, "turin" ) ); + session.remove( g ); + session.remove( g.getUsers().get( "Gavin" ) ); + session.remove( session.get( User.class, "turin" ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java index 4cd35206b8..a22e442c48 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/SmokeTests.java @@ -199,12 +199,12 @@ public class SmokeTests { simpleEntity.setName( "Fab" ); simpleEntity.setGender2( Gender.MALE ); simpleEntity.setComponent( new Component( "a1", "a2" ) ); - session.save( simpleEntity ); + session.persist( simpleEntity ); OtherEntity otherEntity = new OtherEntity(); otherEntity.setId( 2 ); otherEntity.setName( "Bar" ); otherEntity.setSimpleEntity( simpleEntity ); - session.save( otherEntity ); + session.persist( otherEntity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java index 377c050440..d6bb71887f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/array/ArrayTests.java @@ -57,7 +57,7 @@ public class ArrayTests { scope.inTransaction( session -> { Employee employee = new Employee( 2, "Andrea" ); - session.save( employee ); + session.persist( employee ); } ); @@ -115,7 +115,7 @@ public class ArrayTests { session -> { Employee employee = new Employee( 1, "Koen" ); employee.setToDoList( new String[] { "metro", "boulot", "dodo" } ); - session.save( employee ); + session.persist( employee ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ListOperationTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ListOperationTests.java index 5d882639b0..00127620b5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ListOperationTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/ListOperationTests.java @@ -53,7 +53,7 @@ public class ListOperationTests { entityContainingLists.addComponent( new SimpleComponent( "first-a1", "first-another-a1" ) ); entityContainingLists.addComponent( new SimpleComponent( "first-a2", "first-another-a2" ) ); - session.save( entityContainingLists ); + session.persist( entityContainingLists ); } ); } 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 f3ea318383..328a84295a 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 @@ -63,7 +63,7 @@ public class MapOperationTests { entityContainingMaps.addComponentByBasic( "the stuff", new SimpleComponent( "the stuff - 1", "the stuff - 2" ) ); entityContainingMaps.addComponentByBasic( "the other stuff", new SimpleComponent( "the other stuff - 1", "the other stuff - 2" ) ); - session.save( entityContainingMaps ); + session.persist( entityContainingMaps ); } ); } @@ -76,7 +76,7 @@ public class MapOperationTests { scope.inTransaction( session -> { final EntityOfMaps entity = session.load( EntityOfMaps.class, 1 ); - session.delete( entity ); + session.remove( entity ); } ); @@ -110,7 +110,7 @@ public class MapOperationTests { EntityOfMaps.class ).getSingleResult(); - session.delete( entity ); + 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 550e424ec2..f75441a6a5 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 @@ -72,7 +72,7 @@ public class SetOperationTests { entity.addComponent( new SimpleComponent( "the stuff - 1", "the stuff - 2" ) ); entity.addComponent( new SimpleComponent( "other stuff - 1", "other stuff - 2" ) ); - session.save( entity ); + session.persist( entity ); } ); } @@ -141,7 +141,7 @@ public class SetOperationTests { scope.inTransaction( session -> { final EntityOfSets entity = session.load( EntityOfSets.class, 1 ); - session.delete( entity ); + session.remove( entity ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeTest.java index 31af80c617..ad346608c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeTest.java @@ -62,7 +62,7 @@ public abstract class UserCollectionTypeTest extends BaseNonConfigCoreFunctional ); inTransaction( - s -> s.delete( u ) + s -> s.remove( u ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeTest.java index d2780d983f..70c45c5ced 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeTest.java @@ -36,11 +36,11 @@ public abstract class ParameterizedUserCollectionTypeTest extends BaseCoreFuncti s = openSession(); t = s.beginTransaction(); - entity = ( Entity ) s.get( Entity.class, "tester" ); + entity = s.get( Entity.class, "tester" ); assertTrue( Hibernate.isInitialized( entity.getValues() ) ); assertEquals( 1, entity.getValues().size() ); assertEquals( "Hello", ( ( DefaultableList ) entity.getValues() ).getDefaultValue() ); - s.delete( entity ); + s.remove( entity ); t.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/MapCompositeElementTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/MapCompositeElementTest.java index 246809974e..a8a6eeeeca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/MapCompositeElementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/mapcompelem/MapCompositeElementTest.java @@ -54,7 +54,7 @@ public class MapCompositeElementTest { final Product prod = s.get(Product.class, "Some Thing"); assertEquals( prod.getParts().size(), 1 ); assertEquals( ( (Part) prod.getParts().get("Top") ).getDescription(), "The brand new top part" ); - s.delete(prod); + s.remove(prod); } ); } @@ -99,8 +99,8 @@ public class MapCompositeElementTest { assertEquals( list.size(), 1 ); assertSame( list.get(0), item ); - s.delete(item); - s.delete(prod); + s.remove(item); + s.remove(prod); } ); } 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 1ca03daab3..150d25c401 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 @@ -310,7 +310,7 @@ public class AttributeConverterTest extends BaseUnitTestCase { try (SessionFactory sf = cfg.buildSessionFactory()) { Session session = sf.openSession(); session.beginTransaction(); - session.save( new Tester4( 1L, "steve", 200 ) ); + session.persist( new Tester4( 1L, "steve", 200 ) ); session.getTransaction().commit(); session.close(); @@ -331,9 +331,9 @@ public class AttributeConverterTest extends BaseUnitTestCase { session = sf.openSession(); session.beginTransaction(); - t4 = (Tester4) session.get( Tester4.class, 1L ); + t4 = session.get( Tester4.class, 1L ); assertEquals( 300, t4.code.longValue() ); - session.delete( t4 ); + session.remove( t4 ); session.getTransaction().commit(); session.close(); } @@ -383,7 +383,7 @@ public class AttributeConverterTest extends BaseUnitTestCase { try (SessionFactory sf = cfg.buildSessionFactory()) { Session session = sf.openSession(); session.beginTransaction(); - session.save( new IrrelevantInstantEntity( 1L ) ); + session.persist( new IrrelevantInstantEntity( 1L ) ); session.getTransaction().commit(); session.close(); @@ -397,7 +397,7 @@ public class AttributeConverterTest extends BaseUnitTestCase { session = sf.openSession(); session.beginTransaction(); - session.delete( e ); + session.remove( e ); session.getTransaction().commit(); session.close(); } @@ -416,7 +416,7 @@ public class AttributeConverterTest extends BaseUnitTestCase { try (SessionFactory sf = cfg.buildSessionFactory()) { Session session = sf.openSession(); session.beginTransaction(); - session.save( new Tester4( 1L, "George", 150, ConvertibleEnum.DEFAULT ) ); + session.persist( new Tester4( 1L, "George", 150, ConvertibleEnum.DEFAULT ) ); session.getTransaction().commit(); session.close(); @@ -437,9 +437,9 @@ public class AttributeConverterTest extends BaseUnitTestCase { session = sf.openSession(); session.beginTransaction(); - t4 = (Tester4) session.get( Tester4.class, 1L ); + t4 = session.get( Tester4.class, 1L ); assertEquals( ConvertibleEnum.VALUE, t4.convertibleEnum ); - session.delete( t4 ); + session.remove( t4 ); session.getTransaction().commit(); session.close(); } @@ -503,7 +503,7 @@ public class AttributeConverterTest extends BaseUnitTestCase { s = sf.openSession(); s.beginTransaction(); - s.delete( entity ); + s.remove( entity ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java index cb1a766638..bb7d15ef57 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/DirtyCheckingTest.java @@ -36,7 +36,7 @@ public class DirtyCheckingTest extends BaseNonConfigCoreFunctionalTestCase { Session session = openSession(); session.getTransaction().begin(); - session.save( simpleEntity ); + session.persist( simpleEntity ); session.getTransaction().commit(); session.close(); @@ -51,7 +51,7 @@ public class DirtyCheckingTest extends BaseNonConfigCoreFunctionalTestCase { session.getTransaction().begin(); loaded = session.byId( SomeEntity.class ).load( 1L ); assertEquals( "Steve", loaded.getName().getText() ); - session.delete( loaded ); + session.remove( loaded ); session.getTransaction().commit(); session.close(); } @@ -64,7 +64,7 @@ public class DirtyCheckingTest extends BaseNonConfigCoreFunctionalTestCase { Session session = openSession(); session.getTransaction().begin(); - session.save( simpleEntity ); + session.persist( simpleEntity ); session.getTransaction().commit(); session.close(); @@ -79,7 +79,7 @@ public class DirtyCheckingTest extends BaseNonConfigCoreFunctionalTestCase { session.getTransaction().begin(); loaded = session.byId( SomeEntity.class ).load( 1L ); assertEquals( "Steve", loaded.getName().getText() ); - session.delete( loaded ); + session.remove( loaded ); session.getTransaction().commit(); session.close(); } @@ -93,7 +93,7 @@ public class DirtyCheckingTest extends BaseNonConfigCoreFunctionalTestCase { Session session = openSession(); session.getTransaction().begin(); - session.save( simpleEntity ); + session.persist( simpleEntity ); session.getTransaction().commit(); session.close(); @@ -108,7 +108,7 @@ public class DirtyCheckingTest extends BaseNonConfigCoreFunctionalTestCase { session.getTransaction().begin(); loaded = session.byId( SomeEntity.class ).load( 1L ); assertEquals( 2, loaded.getNumber().intValue() ); - session.delete( loaded ); + session.remove( loaded ); session.getTransaction().commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java index 8547d15796..7db96bc20f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/NullHandlingTests.java @@ -43,7 +43,7 @@ public class NullHandlingTests extends BaseCoreFunctionalTestCase { session.beginTransaction(); // at this point TheEntity.sex is null // lets make sure that the converter is given a chance to adjust that to UNKNOWN... - session.save( theEntity ); + session.persist( theEntity ); session.getTransaction().commit(); session.close(); @@ -78,7 +78,7 @@ public class NullHandlingTests extends BaseCoreFunctionalTestCase { session = openSession(); session.beginTransaction(); - session.delete( theEntity ); + session.remove( theEntity ); session.getTransaction().commit(); session.close(); } @@ -111,7 +111,7 @@ public class NullHandlingTests extends BaseCoreFunctionalTestCase { session = openSession(); session.beginTransaction(); - session.delete( theEntity ); + session.remove( theEntity ); session.getTransaction().commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java index cd38d8c973..a0f80524d9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicStructuredCachingOfConvertedValueTest.java @@ -53,7 +53,7 @@ public class BasicStructuredCachingOfConvertedValueTest { scope.inTransaction( (session) -> { - session.save( new Address( 1, "123 Main St.", null, PostalArea._78729 ) ); + session.persist( new Address( 1, "123 Main St.", null, PostalArea._78729 ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java index a7c96d20ef..a86718e682 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/caching/BasicUnstructuredCachingOfConvertedValueTest.java @@ -55,7 +55,7 @@ public class BasicUnstructuredCachingOfConvertedValueTest { scope.inTransaction( (session) -> { - session.save( new Address( 1, "123 Main St.", null, PostalArea._78729 ) ); + session.persist( new Address( 1, "123 Main St.", null, PostalArea._78729 ) ); } ); 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 d7478e4864..53dcca657e 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 @@ -79,7 +79,7 @@ public class ElementCollectionTests { sfScope.inTransaction( (session) -> { - session.save( entity ); + session.persist( entity ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java index 8574fd99ac..ecb2fc10e8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/lob/ConverterAndLobTest.java @@ -37,7 +37,7 @@ public class ConverterAndLobTest { PostalAreaConverter.clearCounts(); scope.inTransaction( - (session) -> session.save( new Address( 1, "123 Main St.", null, PostalArea._78729 ) ) + (session) -> session.persist( new Address( 1, "123 Main St.", null, PostalArea._78729 ) ) ); assertThat( PostalAreaConverter.toDatabaseCallCount, is(1) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java index 0e5242c46f..9d489b097e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/map/MapKeyConversionTest.java @@ -53,7 +53,7 @@ public class MapKeyConversionTest extends BaseNonConfigCoreFunctionalTestCase { session = openSession(); session.getTransaction().begin(); customer = session.get( Customer.class, 1 ); - session.delete( customer ); + session.remove( customer ); session.getTransaction().commit(); session.close(); } 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 62dfc7a545..f6be7916a7 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 @@ -86,8 +86,8 @@ public class SimpleBatchFetchBaselineTests { group2.addEmployee(employee3); group2.addEmployee( employee4 ); - session.save( group1 ); - session.save( group2 ); + session.persist( group1 ); + session.persist( group2 ); } ); } 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 cc7ffa3ce3..83feb4cc0c 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 @@ -90,8 +90,8 @@ public class SimpleBatchFetchTests { group2.addEmployee(employee3); group2.addEmployee( employee4 ); - session.save( group1 ); - session.save( group2 ); + session.persist( group1 ); + session.persist( group2 ); } ); } 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 56a8f56e1c..e29c2a7f0b 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 @@ -88,8 +88,8 @@ public class SubselectFetchCollectionFromBatchTest { group2.addEmployee(employee3); group2.addEmployee( employee4 ); - s.save( group1 ); - s.save( group2 ); + s.persist( group1 ); + s.persist( group2 ); return new EmployeeGroup[] { group1, group2 }; }); @@ -147,8 +147,8 @@ public class SubselectFetchCollectionFromBatchTest { group2.addEmployee(employee3); group2.addEmployee( employee4 ); - s.save( group1 ); - s.save( group2 ); + s.persist( group1 ); + s.persist( group2 ); return new Long[] { group1.id, group2.id }; } ); @@ -215,8 +215,8 @@ public class SubselectFetchCollectionFromBatchTest { group2.getLead().addCollaborator( new Employee( "group2 lead's collaborator#1" ) ); group2.getLead().addCollaborator( new Employee( "group2 lead's collaborator#2" ) ); - s.save( group1 ); - s.save( group2 ); + s.persist( group1 ); + s.persist( group2 ); return new Long[] { group1.id, group2.id }; } ); 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 7ee1acf4f4..c5b4d81ca2 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.delete( session.load( Parent.class, "foo" ) ); - session.delete( session.load( Parent.class, "bar" ) ); + session.remove( session.load( Parent.class, "foo" ) ); + session.remove( session.load( Parent.class, "bar" ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java index 222fc152a2..9a3a42c194 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java @@ -43,7 +43,7 @@ public abstract class AbstractGeneratedPropertyTest extends BaseCoreFunctionalTe entity.setName( "entity-1" ); Session s = openSession(); Transaction t = s.beginTransaction(); - s.save( entity ); + s.persist( entity ); s.flush(); assertNotNull( "no timestamp retrieved", entity.getLastModified() ); t.commit(); @@ -62,7 +62,7 @@ public abstract class AbstractGeneratedPropertyTest extends BaseCoreFunctionalTe s = openSession(); t = s.beginTransaction(); - s.delete( entity ); + s.remove( entity ); t.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java index aaa2e24f7e..28317e4fd2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java @@ -74,7 +74,7 @@ public class DefaultGeneratedValueIdentityTest extends BaseCoreFunctionalTestCas @Test @TestForIssue( jiraKey = "HHH-12671" ) public void testGenerationWithIdentityInsert() { - final TheEntity theEntity = new TheEntity( 1 ); + final TheEntity theEntity = new TheEntity(); doInHibernate( this::sessionFactory, session -> { assertNull( theEntity.createdDate ); @@ -96,7 +96,7 @@ public class DefaultGeneratedValueIdentityTest extends BaseCoreFunctionalTestCas assertNull( theEntity.dbCreatedDate ); assertNull( theEntity.name ); - session.save( theEntity ); + session.persist( theEntity ); assertNotNull( theEntity.createdDate ); assertNotNull( theEntity.alwaysDate ); @@ -122,7 +122,7 @@ public class DefaultGeneratedValueIdentityTest extends BaseCoreFunctionalTestCas assertEquals( "Bob", theEntity.name ); doInHibernate( this::sessionFactory, session -> { - TheEntity _theEntity = session.get( TheEntity.class, 1 ); + TheEntity _theEntity = session.get( TheEntity.class, theEntity.id ); assertNotNull( _theEntity.createdDate ); assertNotNull( _theEntity.alwaysDate ); assertNotNull( _theEntity.vmCreatedDate ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java index 11a7c9551c..e35328def7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueTest.java @@ -100,7 +100,7 @@ public class DefaultGeneratedValueTest { assertNull( theEntity.vmCreatedSqlZonedDateTime ); assertNull( theEntity.name ); - s.save( theEntity ); + s.persist( theEntity ); //TODO: Actually the values should be non-null after save assertNull( theEntity.createdDate ); assertNull( theEntity.alwaysDate ); @@ -145,7 +145,7 @@ public class DefaultGeneratedValueTest { assertNotNull( theEntity.vmCreatedSqlZonedDateTime ); assertEquals( "Bob", theEntity.name ); - s.delete( theEntity ); + s.remove( theEntity ); } ); } @@ -155,7 +155,7 @@ public class DefaultGeneratedValueTest { final TheEntity created = scope.fromTransaction( (s) -> { TheEntity theEntity = new TheEntity( 1 ); assertNull( theEntity.updated ); - s.save( theEntity ); + s.persist( theEntity ); assertNull( theEntity.updated ); return theEntity; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/PartiallyGeneratedComponentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/PartiallyGeneratedComponentTest.java index e11f4fdca0..8c702aad98 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/PartiallyGeneratedComponentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/PartiallyGeneratedComponentTest.java @@ -35,7 +35,7 @@ public class PartiallyGeneratedComponentTest { public void testPartialComponentGeneration(SessionFactoryScope scope) { ComponentOwner owner = new ComponentOwner( "initial" ); scope.inTransaction( - s -> s.save( owner ) + s -> s.persist( owner ) ); assertNotNull( owner.getComponent(), "expecting insert value generation" ); @@ -58,7 +58,7 @@ public class PartiallyGeneratedComponentTest { s -> { ComponentOwner _owner = s.get( ComponentOwner.class, owner.getId() ); assertEquals( previousValue2, _owner.getComponent().getGenerated(), "expecting update value generation" ); - s.delete( _owner ); + s.remove( _owner ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java index 4f38632d81..1754e15110 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassInheritanceTest.java @@ -106,10 +106,10 @@ public class MappedSuperclassInheritanceTest { session -> { session.createQuery( "from DomesticCustomer", DomesticCustomer.class ) .list() - .forEach( cust -> session.delete( cust ) ); + .forEach( cust -> session.remove( cust ) ); session.createQuery( "from ForeignCustomer", ForeignCustomer.class ) .list() - .forEach( cust -> session.delete( cust ) ); + .forEach( cust -> session.remove( cust ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java index cb874c5a68..917128abd2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/MappedSuperclassWithIdOnSubclassesTest.java @@ -104,10 +104,10 @@ public class MappedSuperclassWithIdOnSubclassesTest { session -> { session.createQuery( "from DomesticCustomer", DomesticCustomer.class ) .list() - .forEach( cust -> session.delete( cust ) ); + .forEach( cust -> session.remove( cust ) ); session.createQuery( "from ForeignCustomer", ForeignCustomer.class ) .list() - .forEach( cust -> session.delete( cust ) ); + .forEach( cust -> session.remove( cust ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java index 387549a72a..2ca569e755 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/OneToManyToInheritedTypeTest.java @@ -49,10 +49,10 @@ public class OneToManyToInheritedTypeTest { entity.addSuperType( superType ); entity.addSuperType( typeB ); entity.addSuperType( typeA ); - session.save( superType ); - session.save( typeB ); - session.save( typeA ); - session.save( entity ); + session.persist( superType ); + session.persist( typeB ); + session.persist( typeA ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java index 795458b40a..66d1cac230 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/SingleTableInheritanceTests.java @@ -147,10 +147,10 @@ public class SingleTableInheritanceTests { scope.inTransaction( session -> { session.createQuery( "from DomesticCustomer", DomesticCustomer.class ).list().forEach( - cust -> session.delete( cust ) + cust -> session.remove( cust ) ); session.createQuery( "from ForeignCustomer", ForeignCustomer.class ).list().forEach( - cust -> session.delete( cust ) + cust -> session.remove( cust ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java index d369d86c68..ecee213237 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java @@ -94,7 +94,7 @@ public class DiscriminatorQueryUsageTests { e.setSex( 'M' ); e.setTitle( "Gangster of love" ); - session.save( e ); + session.persist( e ); return e; } ); 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 23e1daa427..2211b147f6 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 @@ -75,9 +75,9 @@ public class DiscriminatorTest { yomomma.setName( "mum" ); yomomma.setSex( 'F' ); - s.save( yomomma ); - s.save( mark ); - s.save( joe ); + s.persist( yomomma ); + s.persist( mark ); + s.persist( joe ); try { s.createQuery( "from java.io.Serializable" ).list(); @@ -114,9 +114,9 @@ public class DiscriminatorTest { mark.setZip( "30306" ); assertThat( s.createQuery( "from Person p where p.address.zip = '30306'" ).list().size(), is( 1 ) ); - s.delete( mark ); - s.delete( joe ); - s.delete( yomomma ); + s.remove( mark ); + s.remove( joe ); + s.remove( yomomma ); assertTrue( s.createQuery( "from Person" ).list().isEmpty() ); } ); @@ -130,7 +130,7 @@ public class DiscriminatorTest { employee.setName( "Steve" ); employee.setSex( 'M' ); employee.setTitle( "grand poobah" ); - s.save( employee ); + s.persist( employee ); } ); @@ -150,7 +150,7 @@ public class DiscriminatorTest { ); scope.inTransaction( - session -> session.delete( employee ) + session -> session.remove( employee ) ); } @@ -192,8 +192,8 @@ public class DiscriminatorTest { assertEquals( result.size(), 1 ); assertEquals( result.get(0), new BigDecimal(1000) );*/ - s.delete( p ); - s.delete( q ); + s.remove( p ); + s.remove( q ); } ); @@ -207,7 +207,7 @@ public class DiscriminatorTest { e.setName( "Steve" ); e.setSex( 'M' ); e.setTitle( "grand poobah" ); - s.save( e ); + s.persist( e ); } ); @@ -266,7 +266,7 @@ public class DiscriminatorTest { ); scope.inTransaction( - s -> s.delete( e ) + s -> s.remove( e ) ); } @@ -278,7 +278,7 @@ public class DiscriminatorTest { e.setName( "Steve" ); e.setSex( 'M' ); e.setTitle( "grand poobah" ); - s.save( e ); + s.persist( e ); } ); @@ -309,7 +309,7 @@ public class DiscriminatorTest { ); scope.inTransaction( - s -> s.delete( e ) + s -> s.remove( e ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java index 620e22b666..46b706aef4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java @@ -95,10 +95,10 @@ public class JoinedInheritanceEagerTest { EntityD entityD = session.get( EntityD.class, 2L ); EntityC entityC = session.get( EntityC.class, 1L ); - session.delete( entityD ); - session.delete( entityC ); - session.delete( entityA ); - session.delete( entityB ); + session.remove( entityD ); + session.remove( entityC ); + session.remove( entityA ); + session.remove( entityB ); } ); } 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 dc7dc04f2f..81591ab708 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 @@ -66,9 +66,9 @@ public class SimpleInheritanceTest { yomomma.setName( "mum" ); yomomma.setSex( 'F' ); - s.save( yomomma ); - s.save( mark ); - s.save( joe ); + s.persist( yomomma ); + s.persist( mark ); + s.persist( joe ); try { s.createQuery( "from java.io.Serializable" ).list(); @@ -110,9 +110,9 @@ public class SimpleInheritanceTest { mark = s.get( Employee.class, mark.getId() ); joe = s.get( Customer.class, joe.getId() ); - s.delete( mark ); - s.delete( joe ); - s.delete( yomomma ); + s.remove( mark ); + s.remove( joe ); + s.remove( yomomma ); assertTrue( s.createQuery( "from Person" ).list().isEmpty() ); } @@ -128,7 +128,7 @@ public class SimpleInheritanceTest { employee.setName( "Steve" ); employee.setSex( 'M' ); employee.setTitle( "grand poobah" ); - s.save( employee ); + s.persist( employee ); } ); @@ -150,7 +150,7 @@ public class SimpleInheritanceTest { ); scope.inTransaction( - session -> session.delete( employee ) + session -> session.remove( employee ) ); } @@ -162,14 +162,14 @@ public class SimpleInheritanceTest { p.setId( 5 ); p.setName( "Emmanuel" ); p.setSex( 'M' ); - s.save( p ); + s.persist( p ); Employee q = new Employee(); q.setId( 6 ); q.setName( "Steve" ); q.setSex( 'M' ); q.setTitle( "Mr" ); q.setSalary( new BigDecimal( 1000 ) ); - s.save( q ); + s.persist( q ); List result = s.createQuery( "from Person where salary > 100" ) .list(); @@ -198,8 +198,8 @@ public class SimpleInheritanceTest { assertEquals( result.size(), 1 ); assertEquals( result.get(0), new BigDecimal(1000) );*/ - s.delete( p ); - s.delete( q ); + s.remove( p ); + s.remove( q ); } ); } @@ -213,7 +213,7 @@ public class SimpleInheritanceTest { employee.setName( "Steve" ); employee.setSex( 'M' ); employee.setTitle( "grand poobah" ); - s.save( employee ); + s.persist( employee ); } ); @@ -248,7 +248,7 @@ public class SimpleInheritanceTest { ); scope.inTransaction( - s -> s.delete( employee ) + s -> s.remove( employee ) ); } @@ -261,7 +261,7 @@ public class SimpleInheritanceTest { employee.setName( "Steve" ); employee.setSex( 'M' ); employee.setTitle( "grand poobah" ); - s.save( employee ); + s.persist( employee ); } ); @@ -295,7 +295,7 @@ public class SimpleInheritanceTest { ); scope.inTransaction( - s -> s.delete( employee ) + s -> s.remove( employee ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java index 72db9d1175..9fda5e52d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java @@ -86,7 +86,7 @@ public class DiscriminatorQueryUsageTests { @BeforeEach public void createTestData(SessionFactoryScope scope) { - scope.inTransaction( (session) -> session.save( new ChildEntity( 1, "Child" ) ) ); + scope.inTransaction( (session) -> session.persist( new ChildEntity( 1, "Child" ) ) ); } @AfterEach diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java index ff6c2a4570..2959794ed1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java @@ -37,7 +37,7 @@ public class JoinedSubclassInheritanceTest { @Test public void testConfiguredDiscriminatorValue(SessionFactoryScope scope) { final ChildEntity childEntity = new ChildEntity( 1, "Child" ); - scope.inTransaction( session -> session.save( childEntity ) ); + scope.inTransaction( session -> session.persist( childEntity ) ); scope.inTransaction( session -> { ChildEntity ce = session.find( ChildEntity.class, 1 ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java index 511fa9dbc0..aebd757d2b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java @@ -42,7 +42,7 @@ public class DynamicJoinedInheritanceTests { entity.put( "id", 1 ); entity.put( "name", "sub" ); entity.put( "subText", "" ); - session.save( "Sub", entity ); + session.persist( "Sub", entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java index d810aa22d7..5def556365 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java @@ -172,10 +172,10 @@ public class JoinedInheritanceTest { } ); // session.createQuery( "from DomesticCustomer", DomesticCustomer.class ).list().forEach( -// cust -> session.delete( cust ) +// cust -> session.remove( cust ) // ); // session.createQuery( "from ForeignCustomer", ForeignCustomer.class ).list().forEach( -// cust -> session.delete( cust ) +// cust -> session.remove( cust ) // ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java index 712fa552b1..ceaac89e3b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java @@ -139,10 +139,10 @@ public class JoinedInheritanceWithExplicitDiscriminatorTest { } ); // session.createQuery( "from DomesticCustomer", DomesticCustomer.class ).list().forEach( -// cust -> session.delete( cust ) +// cust -> session.remove( cust ) // ); // session.createQuery( "from ForeignCustomer", ForeignCustomer.class ).list().forEach( -// cust -> session.delete( cust ) +// cust -> session.remove( cust ) // ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java index dc4491b106..f3cb08bbfa 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java @@ -70,9 +70,9 @@ public class JoinedSubclassTest { yomomma.setName( "mum" ); yomomma.setSex( 'F' ); - s.save( yomomma ); - s.save( mark ); - s.save( joe ); + s.persist( yomomma ); + s.persist( mark ); + s.persist( joe ); assertEquals( s.createQuery( "from Person" ).list().size(), 3 ); assertEquals( s.createQuery( "from Person p where p.class = Customer" ).list().size(), 1 ); @@ -128,9 +128,9 @@ public class JoinedSubclassTest { // s.createCriteria( Person.class ).add( // Restrictions.in( "address", mark.getAddress(), joe.getAddress() ) ).list(); - s.delete( mark ); - s.delete( joe ); - s.delete( yomomma ); + s.remove( mark ); + s.remove( joe ); + s.remove( yomomma ); assertTrue( s.createQuery( "from Person" ).list().isEmpty() ); } ); } @@ -243,8 +243,8 @@ public class JoinedSubclassTest { .uniqueResult() ).doubleValue(); assertEquals( 1d, expiryViaSql, 0.01d ); - session.delete( p ); - session.delete( e ); + session.remove( p ); + session.remove( e ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java index 15f772f18a..74d306862f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/MixedInheritanceTest.java @@ -173,7 +173,7 @@ public class MixedInheritanceTest { scope.inTransaction( session -> { session.createQuery( "from Person", Person.class ).list().forEach( - cust -> session.delete( cust ) + cust -> session.remove( cust ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java index 19662fcd57..74509d6fdb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithAbstractRootTest.java @@ -152,10 +152,10 @@ public class TablePerClassInheritanceWithAbstractRootTest { scope.inTransaction( session -> { session.createQuery( "from DomesticCustomer", DomesticCustomer.class ).list().forEach( - cust -> session.delete( cust ) + cust -> session.remove( cust ) ); session.createQuery( "from ForeignCustomer", ForeignCustomer.class ).list().forEach( - cust -> session.delete( cust ) + cust -> session.remove( cust ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java index b5ae60319e..cf84157733 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/tableperclass/TablePerClassInheritanceWithConcreteRootTest.java @@ -205,7 +205,7 @@ public class TablePerClassInheritanceWithConcreteRootTest { scope.inTransaction( session -> { session.createQuery( "from Person", Person.class ).list().forEach( - cust -> session.delete( cust ) + cust -> session.remove( cust ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java index d6fcfabadd..c5d8de4e08 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyBidirectionalTest.java @@ -58,11 +58,11 @@ public class ManyToManyBidirectionalTest { bookByAuthor1AndAuthor2.addAuthor( author1 ); bookByAuthor1AndAuthor2.addAuthor( author2 ); - session.save( author1 ); - session.save( author2 ); - session.save( bookByAuthor1 ); - session.save( bookByAuthor2 ); - session.save( bookByAuthor1AndAuthor2 ); + session.persist( author1 ); + session.persist( author2 ); + session.persist( bookByAuthor1 ); + session.persist( bookByAuthor2 ); + session.persist( bookByAuthor1AndAuthor2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java index ed207079ec..09c4391b60 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytomany/ManyToManyUnidirectionalFetchTest.java @@ -45,7 +45,7 @@ public class ManyToManyUnidirectionalFetchTest { scope.inTransaction( session -> { Event event = new Event( 1L, "Hibernate" ); - session.save( event ); + session.persist( event ); } ); } @@ -55,7 +55,7 @@ public class ManyToManyUnidirectionalFetchTest { scope.inTransaction( session -> { Event event = session.get( Event.class, 1L ); - session.delete( event ); + session.remove( event ); } ); } @@ -131,7 +131,7 @@ public class ManyToManyUnidirectionalFetchTest { Event event = session.get( Event.class, 1l ); Speaker speaker = new Speaker( 2l, "Steve" ); event.addSpeaker( speaker ); - session.save( speaker ); + session.persist( speaker ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java index b9e92ad99d..7b777a1fb1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalCircularityTest.java @@ -42,8 +42,8 @@ public class ManyToOneBidirectionalCircularityTest { EntityTest2 entity2 = new EntityTest2( 2, "e2" ); entity.setEntity2( entity2 ); entity2.setEntity( entity ); - session.save( entity2 ); - session.save( entity ); + session.persist( entity2 ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java index fc8d8952ce..c371b9d3c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneBidirectionalTest.java @@ -37,9 +37,9 @@ public class ManyToOneBidirectionalTest { EntityTest entity3 = new EntityTest( 3, "e3" ); entity.setEntity2( entity2 ); entity2.setEntity( entity3 ); - session.save( entity3 ); - session.save( entity2 ); - session.save( entity ); + session.persist( entity3 ); + session.persist( entity2 ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneWithAnyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneWithAnyTest.java index 5be9e4c4a2..035a892c93 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneWithAnyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/ManyToOneWithAnyTest.java @@ -88,15 +88,13 @@ class ManyToOneWithAnyTest { entityManager -> { Session session = entityManager.unwrap( Session.class ); Library library = new Library(); - library.setId( 1L ); library.setBooks( Set.of( new Book(), new Book() ) ); Shop shop = new Shop(); - shop.setId( 1L ); shop.setBooks( Set.of( new Book(), new Book(), new Book() ) ); - session.save( library ); - session.save( shop ); + session.persist( library ); + session.persist( shop ); session.flush(); session.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java index c56e141453..8dcd129677 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/cid/AbstractCompositeIdAndNaturalIdTest.java @@ -48,7 +48,7 @@ public abstract class AbstractCompositeIdAndNaturalIdTest { (session) -> { // prepare some test data... Account account = new Account( new AccountId( 1 ), NATURAL_ID_VALUE ); - session.save( account ); + session.persist( account ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java index 86cc3f4475..d8344d581f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableManyToOneNaturalIdHbmTest.java @@ -121,7 +121,7 @@ public class ImmutableManyToOneNaturalIdHbmTest { scope.inTransaction( (s) -> { try { - s.saveOrUpdate( child ); + s.merge( child ); s.flush(); fail( "should have failed because immutable natural ID was altered"); } @@ -151,7 +151,7 @@ public class ImmutableManyToOneNaturalIdHbmTest { Child c2 = new Child( 2, "joey", p ); p.getChildren().add( c2 ); - scope.inTransaction( (session) -> session.update( p ) ); + scope.inTransaction( (session) -> session.merge( p ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java index 6ec6756cdd..9125bc3596 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutable/ImmutableNaturalIdTest.java @@ -163,7 +163,7 @@ public class ImmutableNaturalIdTest { scope.inTransaction( (session) -> { final User steve = session.bySimpleNaturalId( User.class ).load( "steve" ); - session.delete( steve ); + session.remove( steve ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java index ad50aab68b..8fc953922f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java @@ -165,7 +165,7 @@ public class ImmutableEntityNaturalIdTest { assertEquals( "Cache put should be one after second query", 1, stats.getNaturalIdCachePutCount() ); // Try Deleting - session.delete( building ); + session.remove( building ); // third query naturalIdLoader.load(); @@ -219,7 +219,7 @@ public class ImmutableEntityNaturalIdTest { Building building = naturalIdLoader.getReference(); assertNotNull( building ); - s.delete( building ); + s.remove( building ); building = naturalIdLoader.load(); //org.hibernate.ObjectNotFoundException: No row with the given identifier exists: [org.hibernate.test.naturalid.immutableentity.Building#1] // at org.hibernate.internal.SessionFactoryImpl$1$1.handleEntityNotFound(SessionFactoryImpl.java:247) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java index b2d4bbb0e4..ee16a1774f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/inheritance/InheritedNaturalIdTest.java @@ -58,7 +58,7 @@ public class InheritedNaturalIdTest { @BeforeEach public void prepareTestData(SessionFactoryScope scope) { scope.inTransaction( - (session) -> session.save( new User( ORIGINAL ) ) + (session) -> session.persist( new User( ORIGINAL ) ) ); } @@ -102,7 +102,7 @@ public class InheritedNaturalIdTest { final Principal p = session.bySimpleNaturalId( Principal.class ).load( ORIGINAL ); assertNotNull( p ); - session.delete( p ); + session.remove( p ); session.flush(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java index c07eed3f0a..0f4a262408 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/lazy/NaturalIdInUninitializedAssociationTest.java @@ -105,7 +105,7 @@ public class NaturalIdInUninitializedAssociationTest { public void cleanUpTestData(SessionFactoryScope scope) { scope.inTransaction( (session) -> { - session.delete( session.get( AnEntity.class, 3 ) ); + session.remove( session.get( AnEntity.class, 3 ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java index bb8a2e2ec6..37ede30092 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/MutableNaturalIdTest.java @@ -108,7 +108,7 @@ public class MutableNaturalIdTest { scope.inTransaction( (session) -> { try { - session.update( created ); + session.merge( created ); final User loaded = session .byNaturalId( User.class ) .using( "name", "Gavin" ) @@ -249,7 +249,7 @@ public class MutableNaturalIdTest { final User user = session.bySimpleNaturalId( User.class ) .load( new Object[] { "steve", "hb" } ); assertNotNull( user ); - session.delete( user ); + session.remove( user ); } ); @@ -282,7 +282,7 @@ public class MutableNaturalIdTest { .load(); assertNotNull( user ); - session.delete( user ); + session.remove( user ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java index ad74fa36a6..8db5c34893 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdStrictReadWriteTest.java @@ -43,7 +43,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu statistics.clear(); scope.inTransaction( - (session) -> session.save( new AllCached( "IT" ) ) + (session) -> session.persist( new AllCached( "IT" ) ) ); final NaturalIdStatistics naturalIdStatistics = statistics.getNaturalIdStatistics( AllCached.class.getName() ); @@ -57,7 +57,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu statistics.clear(); scope.inTransaction( - (session) -> session.save( new Another( "it" ) ) + (session) -> session.persist( new Another( "it" ) ) ); scope.inTransaction( @@ -80,7 +80,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu final Transaction transaction = session.getTransaction(); transaction.begin(); - session.save( new Another( "it" ) ); + session.persist( new Another( "it" ) ); session.flush(); transaction.rollback(); @@ -103,7 +103,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu statistics.clear(); scope.inTransaction( - (session) -> session.save( new Another( "it" ) ) + (session) -> session.persist( new Another( "it" ) ) ); scope.inTransaction( @@ -134,7 +134,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu statistics.clear(); scope.inTransaction( - (session) -> session.save( new Another( "it" ) ) + (session) -> session.persist( new Another( "it" ) ) ); scope.inTransaction( @@ -173,7 +173,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu (session) -> { Another it = new Another( "it" ); // schedules an InsertAction - session.save( it ); + session.persist( it ); // schedules an UpdateAction // - without bug-fix this will re-cache natural-id with identical key and at same time invalidate it @@ -199,7 +199,7 @@ public class CachedMutableNaturalIdStrictReadWriteTest extends CachedMutableNatu scope.inTransaction( (session) -> { - session.save( new Another( "IT" ) ); + session.persist( new Another( "IT" ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java index afded9f7ee..28e367b912 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/naturalid/mutable/cached/CachedMutableNaturalIdTest.java @@ -11,7 +11,6 @@ import org.hibernate.cache.spi.CacheImplementor; import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.stat.spi.StatisticsImplementor; -import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; @@ -33,10 +32,10 @@ public abstract class CachedMutableNaturalIdTest { public void dropTestData(SessionFactoryScope scope) { scope.inTransaction( (session) -> { - session.createQuery( "delete from Another" ).executeUpdate(); - session.createQuery( "delete from AllCached" ).executeUpdate(); - session.createQuery( "delete from SubClass" ).executeUpdate(); - session.createQuery( "delete from A" ).executeUpdate(); + session.createMutationQuery( "delete from Another" ).executeUpdate(); + session.createMutationQuery( "delete from AllCached" ).executeUpdate(); + session.createMutationQuery( "delete from SubClass" ).executeUpdate(); + session.createMutationQuery( "delete from A" ).executeUpdate(); } ); @@ -47,7 +46,7 @@ public abstract class CachedMutableNaturalIdTest { @Test public void testNaturalIdChangedWhileAttached(SessionFactoryScope scope) { scope.inTransaction( - (session) -> session.save( new Another( "it" ) ) + (session) -> session.persist( new Another( "it" ) ) ); scope.inTransaction( @@ -72,7 +71,7 @@ public abstract class CachedMutableNaturalIdTest { @Test public void testNaturalIdChangedWhileDetached(SessionFactoryScope scope) { scope.inTransaction( - (session) -> session.save( new Another( "it" ) ) + (session) -> session.persist( new Another( "it" ) ) ); final Another detached = scope.fromTransaction( @@ -86,7 +85,7 @@ public abstract class CachedMutableNaturalIdTest { detached.setName( "it2" ); scope.inTransaction( - (session) -> session.update( detached ) + (session) -> session.merge( detached ) ); scope.inTransaction( @@ -107,7 +106,7 @@ public abstract class CachedMutableNaturalIdTest { final Integer id = scope.fromTransaction( (session) -> { Another it = new Another( "it" ); - session.save( it ); + session.persist( it ); return it.getId(); } ); @@ -135,13 +134,13 @@ public abstract class CachedMutableNaturalIdTest { } @Test - @TestForIssue( jiraKey = "HHH-7245" ) + @JiraKey( "HHH-7245" ) public void testNaturalIdChangeAfterResolveEntityFrom2LCache(SessionFactoryScope scope) { final Integer id = scope.fromTransaction( (session) -> { AllCached it = new AllCached( "it" ); - session.save( it ); + session.persist( it ); return it.getId(); } ); @@ -161,10 +160,10 @@ public abstract class CachedMutableNaturalIdTest { } @Test - @TestForIssue( jiraKey = "HHH-12657" ) + @JiraKey( "HHH-12657" ) public void testBySimpleNaturalIdResolveEntityFrom2LCacheSubClass(SessionFactoryScope scope) { scope.inTransaction( - (session) -> session.save( new SubClass( "it" ) ) + (session) -> session.persist( new SubClass( "it" ) ) ); scope.inTransaction( @@ -181,7 +180,7 @@ public abstract class CachedMutableNaturalIdTest { } @Test - @TestForIssue( jiraKey = "HHH-16557" ) + @JiraKey( "HHH-16557" ) public void testCreateDeleteRecreate(SessionFactoryScope scope) { final Integer id = scope.fromTransaction( @@ -297,8 +296,8 @@ public abstract class CachedMutableNaturalIdTest { (session) -> { // HHH-7513 failure during reattachment session.buildLockRequest( LockOptions.NONE ).lock( created ); - session.delete( created.assA ); - session.delete( created ); + session.remove( created.assA ); + session.remove( created ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java index 0cffa5b2cf..6194df1ef5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyBidirectionalTest.java @@ -60,16 +60,16 @@ public class OneToManyBidirectionalTest { public void setUp(SessionFactoryScope scope) { scope.inTransaction( session -> { Item i = new Item( 1L ); - session.save( i ); + session.persist( i ); Item i2 = new Item( 2L ); - session.save( i2 ); + session.persist( i2 ); Order o = new Order( 3L ); o.addItem( i ); o.addItem( i2 ); - session.save( o ); + session.persist( o ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java index c9cb1f6c46..51fc04eab4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyEmptyCollectionTest.java @@ -57,7 +57,7 @@ public class OneToManyEmptyCollectionTest { scope.inTransaction( session -> { Order order = new Order(); - session.save( order ); + session.persist( order ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java index 23f40253c3..bad8a952c4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManySelfReferenceTest.java @@ -56,8 +56,8 @@ public class OneToManySelfReferenceTest { parent.addChid( child ); - session.save( parent ); - session.save( child ); + session.persist( parent ); + session.persist( child ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java index 6de0068e3d..b5af62cd92 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetomany/OneToManyTest.java @@ -70,11 +70,11 @@ public class OneToManyTest { card.getFields().forEach( cardField -> { Key key = cardField.key; - session.delete( cardField ); - session.delete( key ); + session.remove( cardField ); + session.remove( key ); } ); - session.delete( card ); + session.remove( card ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java index fb180a0177..858c6e6ff9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableNonOptionalTest.java @@ -45,7 +45,7 @@ public class OneToOneJoinTableNonOptionalTest { scope.inTransaction( (session) -> { Show show = new Show(); - session.save( show ); + session.persist( show ); } ); @@ -53,7 +53,7 @@ public class OneToOneJoinTableNonOptionalTest { scope.inTransaction( (session) -> { ShowDescription showDescription = new ShowDescription(); - session.save( showDescription ); + session.persist( showDescription ); } ); fail(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java index 5a23ac80f4..e748471395 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneJoinTableOptionalTest.java @@ -41,14 +41,14 @@ public class OneToOneJoinTableOptionalTest { scope.inTransaction( (session) -> { Show show = new Show(); - session.save( show ); + session.persist( show ); } ); scope.inTransaction( (session) -> { ShowDescription showDescription = new ShowDescription(); - session.save( showDescription ); + session.persist( showDescription ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java index 8d9b28945e..d6d8f1276f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/OneToOneLazyTest.java @@ -43,8 +43,8 @@ public class OneToOneLazyTest { Title title = new Title( 1L ); Book book = new Book( 2L, title ); - sesison.save( title ); - sesison.save( book ); + sesison.persist( title ); + sesison.persist( book ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java index 0ec48bf974..4f0f1b7ab6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/onetoone/hhh9798/OneToOneJoinTableTest.java @@ -34,13 +34,13 @@ public class OneToOneJoinTableTest { Transaction tx = session.beginTransaction(); Item someItem = new Item( "Some Item" ); - session.save( someItem ); + session.persist( someItem ); Shipment shipment1 = new Shipment( someItem ); - session.save( shipment1 ); + session.persist( shipment1 ); Shipment shipment2 = new Shipment( someItem ); - session.save( shipment2 ); + session.persist( shipment2 ); tx.commit(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java index 51746e4c4f..e70efccc63 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/quote/ColumnQuoteTest.java @@ -38,7 +38,7 @@ public class ColumnQuoteTest { public void setUp(SessionFactoryScope scope) { scope.inTransaction( session -> { Product product = new Product( testProductId, fieldWithHibernateQuotingValue, fieldWithJpaQuotingValue ); - session.save( product ); + session.persist( product ); } ); scope.getSessionFactory().getQueryEngine().getInterpretationCache().close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java index eacc8c5bdd..ac3c924a46 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/contribution/array/StringArrayContributorTests.java @@ -48,9 +48,9 @@ public class StringArrayContributorTests { public void simpleTest(SessionFactoryScope scope) { scope.inTransaction( (session) -> { // save one with tags - session.save( new Post( 1, "with tags", "tag1", "tag2" ) ); + session.persist( new Post( 1, "with tags", "tag1", "tag2" ) ); // and one without (null) - session.save( new Post( 2, "no tags" ) ); + session.persist( new Post( 2, "no tags" ) ); } ); scope.inTransaction( (session) -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleMappingTests.java index ba6657574d..b671470af5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleMappingTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/type/java/LocaleMappingTests.java @@ -87,8 +87,8 @@ public class LocaleMappingTests { final LocaleMappingTestEntity entity2 = new LocaleMappingTestEntity( 2, Locale.FRENCH, "Salut" ); scope.inTransaction( (session) -> { - session.save( entity ); - session.save( entity2 ); + session.persist( entity ); + session.persist( entity2 ); } ); try { @@ -102,8 +102,8 @@ public class LocaleMappingTests { .containsExactly( 2 ) ); } finally { - scope.inTransaction( session -> session.delete( entity ) ); - scope.inTransaction( session -> session.delete( entity2 ) ); + scope.inTransaction( session -> session.remove( entity ) ); + scope.inTransaction( session -> session.remove( entity2 ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/TypedManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/TypedManyToOneTest.java index 7db1fa2e60..b466cb237f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/TypedManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/typedmanytoone/TypedManyToOneTest.java @@ -70,7 +70,7 @@ public class TypedManyToOneTest { final Customer merged = s.merge( cust ); Address shipAddress = merged.getShippingAddress(); merged.setShippingAddress(null); - s.delete("ShippingAddress", shipAddress); + s.remove( shipAddress ); s.flush(); assertNull( s.get( "ShippingAddress", shipAddress.getAddressId() ) ); s.remove( merged ); 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 48b98787ad..896c455443 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 @@ -39,12 +39,12 @@ public class MixedTest { try { Folder f = new Folder(); f.setName( "/" ); - session.save( f ); + session.persist( f ); doc.setName( "Hibernate in Action" ); doc.setContent( session.getLobHelper().createBlob( "blah blah blah".getBytes() ) ); doc.setParent( f ); - session.save( doc ); + session.persist( doc ); doc2.setName( "Secret" ); doc2.setContent( session.getLobHelper().createBlob( "wxyz wxyz".getBytes() ) ); @@ -53,7 +53,7 @@ public class MixedTest { doc2.setPermissionBits( (byte) 127 ); doc2.setOwner( "gavin" ); doc2.setParent( f ); - session.save( doc2 ); + session.persist( doc2 ); session.getTransaction().commit(); } finally { @@ -116,9 +116,9 @@ public class MixedTest { assertNotNull( d2.getCreated() ); assertNotNull( d2.getModified() ); - session.delete( d.getParent() ); - session.delete( d ); - session.delete( d2 ); + session.remove( d.getParent() ); + session.remove( d ); + session.remove( d2 ); } finally { if ( session.getTransaction().isActive() ) { 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 fc02c5ab72..4ba9583d8a 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 @@ -132,7 +132,7 @@ public class DiscriminatorMultiTenancyTest extends BaseUnitTestCase { doInHibernate( "jboss", session -> { Customer steve = new Customer( 1L, "steve" ); - session.save( steve ); + session.persist( steve ); } ); sessionFactory.getStatistics().clear(); @@ -178,7 +178,7 @@ public class DiscriminatorMultiTenancyTest extends BaseUnitTestCase { doInHibernate( "jboss", session -> { Customer customer = session.load( Customer.class, 1L ); - session.delete( customer ); + 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 5347c033f6..d85c7c8017 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 @@ -161,7 +161,7 @@ public abstract class AbstractSchemaBasedMultiTenancyTest { Customer _steve = new Customer( 1L, "steve" ); - session.save( _steve ); + session.persist( _steve ); return _steve; } ); @@ -171,7 +171,7 @@ public abstract class AbstractSchemaBasedMultiTenancyTest { - session.delete( steve ); + session.remove( steve ); } ); } @@ -180,14 +180,14 @@ public abstract class AbstractSchemaBasedMultiTenancyTest { Customer _steve = new Customer( 1L, "steve" ); - session.save( _steve ); + session.persist( _steve ); return _steve; } ); // now, create a customer 'john' in acme Customer john = doInHibernateSessionBuilder( this::acme, session -> { Customer _john = new Customer( 1L, "john" ); - session.save( _john ); + session.persist( _john ); return _john; } ); @@ -232,11 +232,11 @@ public abstract class AbstractSchemaBasedMultiTenancyTest { - session.delete( steve ); + session.remove( steve ); } ); doInHibernateSessionBuilder( this::acme, session -> { - session.delete( john ); + session.remove( john ); } ); } @@ -244,24 +244,24 @@ public abstract class AbstractSchemaBasedMultiTenancyTest { Invoice _orderJboss = new Invoice(); - session.save( _orderJboss ); + session.persist( _orderJboss ); Assert.assertEquals( Long.valueOf( 1 ), _orderJboss.getId() ); return _orderJboss; } ); Invoice orderAcme = doInHibernateSessionBuilder( this::acme, session -> { Invoice _orderAcme = new Invoice(); - session.save( _orderAcme ); + session.persist( _orderAcme ); Assert.assertEquals( Long.valueOf( 1 ), _orderAcme.getId() ); return _orderAcme; } ); doInHibernateSessionBuilder( this::jboss, session -> { - session.delete( orderJboss ); + session.remove( orderJboss ); } ); doInHibernateSessionBuilder( this::acme, session -> { - session.delete( orderAcme ); + session.remove( orderAcme ); } ); sessionFactory.getStatistics().clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java index c91f6bbef0..b72fdb8589 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/nationalized/NationalizedLobFieldTest.java @@ -44,7 +44,7 @@ public class NationalizedLobFieldTest { session -> { MyEntity e = new MyEntity( 1L ); e.setState( "UK" ); - session.save( e ); + session.persist( e ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundLogicalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundLogicalOneToOneTest.java index de95ddca21..ebbf4b817a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundLogicalOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundLogicalOneToOneTest.java @@ -50,7 +50,7 @@ public class NotFoundLogicalOneToOneTest { scope.inTransaction( session -> - session.delete( euro ) + session.remove( euro ) ); scope.inTransaction( @@ -58,7 +58,7 @@ public class NotFoundLogicalOneToOneTest { Coin coin = session.get( Coin.class, fiveC.getId() ); assertNull( coin.getCurrency() ); - session.delete( coin ); + session.remove( coin ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java index 84f21727e6..ad3f9fe15a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundOneToOneNonInsertableNonUpdateableTest.java @@ -52,7 +52,7 @@ public class NotFoundOneToOneNonInsertableNonUpdateableTest { scope.inTransaction( session -> - session.delete( session.get( PersonInfo.class, ID ) ) + session.remove( session.get( PersonInfo.class, ID ) ) ); scope.inTransaction( @@ -61,7 +61,7 @@ public class NotFoundOneToOneNonInsertableNonUpdateableTest { assertNotNull( person ); assertNull( person.personInfo ); - session.delete( person ); + session.remove( person ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundTest.java index 81074683b1..e774ee836a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/notfound/NotFoundTest.java @@ -53,13 +53,13 @@ public class NotFoundTest { scope.inTransaction( session -> { Currency _euro = session.get( Currency.class, euro.getId() ); - session.delete( _euro ); + session.remove( _euro ); } ); scope.inTransaction( session -> { Coin _fiveCents = session.get( Coin.class, fiveCents.getId() ); assertNull( _fiveCents.getCurrency() ); - session.delete( _fiveCents ); + session.remove( _fiveCents ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java index 6b9cf13af1..68c64ee90f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/OnDeleteTest.java @@ -71,7 +71,7 @@ public class OnDeleteTest { joe.setSalesperson( mark ); mark.getCustomers().add( joe ); - session.save( mark ); + session.persist( mark ); session.getTransaction().commit(); @@ -83,7 +83,7 @@ public class OnDeleteTest { statistics.clear(); Transaction t = session.beginTransaction(); - session.delete( mark ); + session.remove( mark ); t.commit(); assertThat( statistics.getEntityDeleteCount(), is( 2L ) ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java index e9d34fb905..ea09c0fd0c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ondelete/toone/hbm/ToOneOnDeleteHbmTest.java @@ -76,7 +76,7 @@ public class ToOneOnDeleteHbmTest { scope.inTransaction( session -> { Parent parent = session.get( Parent.class, 1L ); - session.delete( parent ); + session.remove( parent ); } ); } 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 36ded46a22..20f7a3e251 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 @@ -70,8 +70,8 @@ public class LazyLoadingTest { public void cleanUpData(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.delete( session.get( Store.class, 1 ) ); - session.delete( session.get( Product.class, "007" ) ); + session.remove( session.get( Store.class, 1 ) ); + session.remove( session.get( Product.class, "007" ) ); } ); } 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 62ec57da25..a58cb298d4 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 @@ -76,7 +76,7 @@ public abstract class AbstractRecursiveBidirectionalOneToManyTest extends BaseSe node1.addSubNode( node2 ); node2.addSubNode( node3 ); - session.save( node1 ); + session.persist( node1 ); } ); } @@ -155,8 +155,8 @@ public abstract class AbstractRecursiveBidirectionalOneToManyTest extends BaseSe inTransaction( session -> { session.setCacheMode( getSessionCacheMode() ); - Node node1 = (Node) session.get( Node.class, Integer.valueOf( 1 ) ); - session.delete( node1 ); + Node node1 = session.get( Node.class, Integer.valueOf( 1 ) ); + session.remove( node1 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyTest.java index 4a1e453632..22db17dbcd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetomany/OneToManyTest.java @@ -37,7 +37,7 @@ public class OneToManyTest { p.setName( "Parent" ); p.getChildren().add( c ); c.setParent( p ); - session.save( p ); + session.persist( p ); session.flush(); p.getChildren().remove( c ); @@ -49,17 +49,18 @@ public class OneToManyTest { } ); - scope.inTransaction( + Child merged = scope.fromTransaction( session -> { c.setParent( null ); - session.update( c ); + return session.merge( c ); + } ); scope.inTransaction( session -> { - c.setParent( p ); - session.update( c ); + merged.setParent( p ); + session.merge( merged ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheTest.java index edd25fb48b..cc762cf252 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/cache/OneToOneCacheTest.java @@ -91,7 +91,8 @@ public class OneToOneCacheTest { person.setName( String.format( "%s%d", personClass.getName(), i ) ); - ids.add( session.save( person ) ); + session.persist( person ); + ids.add( person.getId() ); } catch (Exception e) { throw new RuntimeException( e ); 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 89122d66a4..e8b8803c3e 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 @@ -96,7 +96,7 @@ public class OneToOneFormulaTest extends BaseSessionFactoryFunctionalTest { @AfterEach protected void cleanupTest() { inTransaction( session -> { - session.delete( person ); + session.remove( person ); } ); } @@ -223,8 +223,8 @@ public class OneToOneFormulaTest extends BaseSessionFactoryFunctionalTest { } ); -// s.delete(a2); -// s.delete( s.get( Person.class, p.getName() ) ); //this is certainly undesirable! oh well... +// s.remove(a2); +// s.remove( s.get( Person.class, p.getName() ) ); //this is certainly undesirable! oh well... // // t.commit(); // s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java index 11cebf706c..c133fa6774 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/joined/JoinedSubclassOneToOneTest.java @@ -180,10 +180,10 @@ public class JoinedSubclassOneToOneTest { assertNull( p.mailingAddress ); session.clear(); - session.delete( p ); - session.delete( p.address ); - session.delete( org ); - session.delete( a2 ); + session.remove( p ); + session.remove( p.address ); + session.remove( org ); + session.remove( a2 ); session.flush(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java index c11b2c5c2e..f2eab23973 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/jointable/OneToOneJoinTableTest.java @@ -36,18 +36,18 @@ public class OneToOneJoinTableTest { Long id = scope.fromTransaction( s -> { Event childEvent = new Event(); childEvent.setDescription( "childEvent" ); - s.save( childEvent ); + s.persist( childEvent ); Event parentEvent = new Event(); parentEvent.setDescription( "parentEvent" ); - s.save( parentEvent ); + s.persist( parentEvent ); OtherEntity otherEntity = new OtherEntity(); otherEntity.setId( "123" ); - s.save( otherEntity ); + s.persist( otherEntity ); childEvent.setOther( otherEntity ); - s.save( childEvent ); + s.persist( childEvent ); s.flush(); // Test updates and deletes diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/OneToOneLinkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/OneToOneLinkTest.java index 45558fd9f7..c4e7bb3c7e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/OneToOneLinkTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/link/OneToOneLinkTest.java @@ -95,7 +95,7 @@ public class OneToOneLinkTest { assertTrue( Hibernate.isInitialized( e.getPerson() ) ); assertTrue( Hibernate.isInitialized( e.getPerson().getCustomer() ) ); assertNotNull( e.getPerson().getCustomer() ); - session.delete( e ); + session.remove( e ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/nopojo/DynamicMapOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/nopojo/DynamicMapOneToOneTest.java index 3bc3a7ea48..d7a369f7f2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/nopojo/DynamicMapOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/nopojo/DynamicMapOneToOneTest.java @@ -74,7 +74,7 @@ public class DynamicMapOneToOneTest { assertNotNull( person, "could not locate person" ); assertNotNull( person.get( "address" ), "could not locate persons address" ); - session.delete( "Person", person ); + session.remove( person ); return aStats; } 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 05bec8dbdb..ad247153f4 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 @@ -37,7 +37,7 @@ public class OptionalOneToOneTest { session -> { Person me = new Person(); me.name = "Steve"; - session.save( me ); + session.persist( me ); return me.name; } ); @@ -46,7 +46,7 @@ public class OptionalOneToOneTest { session -> { Person me = session.load( Person.class, name ); assertNull( me.address ); - session.delete( me ); + 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 f55f3d0805..47943a21da 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 @@ -44,7 +44,7 @@ public class CreateTest extends AbstractOperationTestCase { VersionedEntity child = new VersionedEntity( "c1", "child-1" ); root.getChildren().add( child ); child.setParent( root ); - session.save( root ); + session.persist( root ); } ); @@ -54,7 +54,7 @@ public class CreateTest extends AbstractOperationTestCase { scope.inTransaction( session -> - session.delete( root ) + session.remove( root ) ); assertUpdateCount( 0, scope ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/DeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/DeleteTest.java index fecbdc6e31..e152f9d290 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/DeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/DeleteTest.java @@ -28,7 +28,7 @@ public class DeleteTest extends AbstractOperationTestCase { VersionedEntity p = new VersionedEntity( "root", "root" ); p.getChildren().add( c ); c.setParent( p ); - session.save( p ); + session.persist( p ); } ); @@ -37,7 +37,7 @@ public class DeleteTest extends AbstractOperationTestCase { scope.inTransaction( session -> { VersionedEntity loadedParent = session.get( VersionedEntity.class, "root" ); - session.delete( loadedParent ); + session.remove( loadedParent ); } ); @@ -58,7 +58,7 @@ public class DeleteTest extends AbstractOperationTestCase { scope.inTransaction( session -> - session.delete( node ) + session.remove( node ) ); assertUpdateCount( 0, scope ); @@ -83,7 +83,7 @@ public class DeleteTest extends AbstractOperationTestCase { scope.inTransaction( session -> { Node parent = session.get( Node.class, "parent" ); - session.delete( parent ); + session.remove( parent ); } ); 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 e1b9a19542..80fe18d0a2 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 @@ -120,7 +120,7 @@ public class GetLoadTest { Employer e = scope.fromTransaction( session -> { - session.delete( emp ); + session.remove( emp ); return session.get( Employer.class, emp.getId() ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedOrphanDeleteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedOrphanDeleteTest.java index 8fb287caad..0500eef464 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedOrphanDeleteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedOrphanDeleteTest.java @@ -473,19 +473,19 @@ public class MergeMultipleEntityCopiesAllowedOrphanDeleteTest { session.createQuery( "delete from SubItem" ).executeUpdate(); for ( Hoarder hoarder : (List) session.createQuery( "from Hoarder" ).list() ) { hoarder.getItems().clear(); - session.delete( hoarder ); + session.remove( hoarder ); } for ( Category category : (List) session.createQuery( "from Category" ).list() ) { if ( category.getExampleItem() != null ) { category.setExampleItem( null ); - session.delete( category ); + session.remove( category ); } } for ( Item item : (List) session.createQuery( "from Item" ).list() ) { item.setCategory( null ); - session.delete( item ); + session.remove( item ); } session.createQuery( "delete from Item" ).executeUpdate(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java index f9fd05834e..7faee0bdc0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesAllowedTest.java @@ -1169,7 +1169,7 @@ public class MergeMultipleEntityCopiesAllowedTest { session.createQuery( "delete from SubItem" ).executeUpdate(); for ( Hoarder hoarder : (List) session.createQuery( "from Hoarder" ).list() ) { hoarder.getItems().clear(); - session.delete( hoarder ); + session.remove( hoarder ); } for ( Category category : (List) session.createQuery( "from Category" ).list() ) { @@ -1177,8 +1177,8 @@ public class MergeMultipleEntityCopiesAllowedTest { if ( exampleItem != null ) { category.setExampleItem( null ); exampleItem.setCategory( null ); - session.delete( category ); - session.delete( exampleItem ); + session.remove( category ); + session.remove( exampleItem ); } } @@ -1188,7 +1188,7 @@ public class MergeMultipleEntityCopiesAllowedTest { if ( category != null ) { category.setExampleItem( null ); } - session.delete( item ); + session.remove( item ); } session.createQuery( "delete from Item" ).executeUpdate(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java index 92818fa7de..756090cc58 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesCustomTest.java @@ -170,19 +170,19 @@ public class MergeMultipleEntityCopiesCustomTest { session -> { for ( Hoarder hoarder : (List) session.createQuery( "from Hoarder" ).list() ) { hoarder.getItems().clear(); - session.delete( hoarder ); + session.remove( hoarder ); } for ( Category category : (List) session.createQuery( "from Category" ).list() ) { if ( category.getExampleItem() != null ) { category.setExampleItem( null ); - session.delete( category ); + session.remove( category ); } } for ( Item item : (List) session.createQuery( "from Item" ).list() ) { item.setCategory( null ); - session.delete( item ); + session.remove( item ); } session.createQuery( "delete from Item" ).executeUpdate(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java index 307a81ed62..2e09601ef4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeMultipleEntityCopiesDisallowedByDefaultTest.java @@ -123,19 +123,19 @@ public class MergeMultipleEntityCopiesDisallowedByDefaultTest { session.createQuery( "delete from SubItem" ).executeUpdate(); for ( Hoarder hoarder : (List) session.createQuery( "from Hoarder" ).list() ) { hoarder.getItems().clear(); - session.delete( hoarder ); + session.remove( hoarder ); } for ( Category category : (List) session.createQuery( "from Category" ).list() ) { if ( category.getExampleItem() != null ) { category.setExampleItem( null ); - session.delete( category ); + session.remove( category ); } } for ( Item item : (List) session.createQuery( "from Item" ).list() ) { item.setCategory( null ); - session.delete( item ); + session.remove( item ); } session.createQuery( "delete from Item" ).executeUpdate(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java index c3380efe65..528733f6cc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/MergeTest.java @@ -10,14 +10,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import jakarta.persistence.OptimisticLockException; -import jakarta.persistence.PersistenceException; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Root; - import org.hibernate.Hibernate; -import org.hibernate.NonUniqueObjectException; import org.hibernate.Session; import org.hibernate.StaleObjectStateException; import org.hibernate.dialect.HANADialect; @@ -29,6 +22,13 @@ import org.hibernate.testing.orm.junit.SkipForDialect; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hibernate.testing.orm.junit.ExtraAssertions.assertTyping; @@ -109,7 +109,7 @@ public class MergeTest extends AbstractOperationTestCase { scope.inTransaction( session -> - session.delete( person ) + session.remove( person ) ); } @@ -139,8 +139,8 @@ public class MergeTest extends AbstractOperationTestCase { scope.inTransaction( session -> { - session.delete( a ); - session.delete( person ); + session.remove( a ); + session.remove( person ); } ); } @@ -380,10 +380,10 @@ public class MergeTest extends AbstractOperationTestCase { try { // control operation... - session.saveOrUpdate( new VersionedEntity( "test", "test-3" ) ); - fail( "saveOrUpdate() should fail here" ); + session.persist( new VersionedEntity( "test", "test-3" ) ); + fail( "persist should fail here" ); } - catch (NonUniqueObjectException expected) { + catch (EntityExistsException expected) { // expected behavior } } @@ -402,10 +402,10 @@ public class MergeTest extends AbstractOperationTestCase { try { // control operation... - session.saveOrUpdate( new TimestampedEntity( "test", "test-3" ) ); - fail( "saveOrUpdate() should fail here" ); + session.persist( new TimestampedEntity( "test", "test-3" ) ); + fail( "persist should fail here" ); } - catch (NonUniqueObjectException expected) { + catch (EntityExistsException expected) { // expected behavior } } @@ -463,12 +463,12 @@ public class MergeTest extends AbstractOperationTestCase { scope.inTransaction( session -> { - session.delete( grandchild ); - session.delete( grandchild2 ); - session.delete( grandchild3 ); - session.delete( child ); - session.delete( child2 ); - session.delete( root ); + session.remove( grandchild ); + session.remove( grandchild2 ); + session.remove( grandchild3 ); + session.remove( child ); + session.remove( child2 ); + session.remove( root ); } ); } @@ -767,7 +767,7 @@ public class MergeTest extends AbstractOperationTestCase { session.getTransaction().begin(); Employer otherJboss; otherJboss = session.get( Employer.class, jboss.getId() ); - session.delete( otherJboss ); + session.remove( otherJboss ); session.getTransaction().commit(); session.clear(); jboss.setVers( 1 ); @@ -821,7 +821,7 @@ public class MergeTest extends AbstractOperationTestCase { session -> { Competition c = session.get( Competition.class, competition.getId() ); assertThat( c.getCompetitors().size(), is( 2 ) ); - session.delete( c ); + session.remove( c ); } ); @@ -846,7 +846,7 @@ public class MergeTest extends AbstractOperationTestCase { session.createQuery( "delete from Competition" ).executeUpdate(); for ( Employer employer : (List) session.createQuery( "from Employer" ).list() ) { - session.delete( employer ); + session.remove( employer ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java index 5d3a996479..69c3290d50 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/RemoveOrderingTest.java @@ -42,8 +42,8 @@ public class RemoveOrderingTest { company = person.employer; - session.delete( company ); - session.delete( person ); + session.remove( company ); + session.remove( person ); session.flush(); session.persist( person ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SaveOrUpdateTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SaveOrUpdateTest.java deleted file mode 100644 index b8810fbcf5..0000000000 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/SaveOrUpdateTest.java +++ /dev/null @@ -1,533 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later. - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.orm.test.ops; - -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Root; - -import org.hibernate.Hibernate; -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.engine.spi.PersistentAttributeInterceptable; - -import org.hibernate.testing.orm.junit.DomainModel; -import org.hibernate.testing.orm.junit.ServiceRegistry; -import org.hibernate.testing.orm.junit.SessionFactory; -import org.hibernate.testing.orm.junit.SessionFactoryScope; -import org.hibernate.testing.orm.junit.Setting; -import org.junit.jupiter.api.Test; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -/** - * @author Gavin King - */ -@DomainModel( - xmlMappings = "org/hibernate/orm/test/ops/Node.hbm.xml", - concurrencyStrategy = "nonstrict-read-write" -) -@SessionFactory( - generateStatistics = true -) -@ServiceRegistry( - settings = @Setting(name = AvailableSettings.STATEMENT_BATCH_SIZE, value = "0") -) -public class SaveOrUpdateTest { - - @Test - public void testSaveOrUpdateDeepTree(SessionFactoryScope scope) { - clearCounts( scope ); - - Node root = new Node( "root" ); - Node child = new Node( "child" ); - Node grandchild = new Node( "grandchild" ); - - scope.inTransaction( - session -> { - root.addChild( child ); - child.addChild( grandchild ); - session.saveOrUpdate( root ); - } - ); - - assertInsertCount( 3, scope ); - assertUpdateCount( 0, scope ); - clearCounts( scope ); - - grandchild.setDescription( "the grand child" ); - Node grandchild2 = new Node( "grandchild2" ); - child.addChild( grandchild2 ); - - scope.inTransaction( - session -> - session.saveOrUpdate( root ) - ); - - assertInsertCount( 1, scope ); - assertUpdateCount( 1, scope ); - clearCounts( scope ); - - Node child2 = new Node( "child2" ); - Node grandchild3 = new Node( "grandchild3" ); - child2.addChild( grandchild3 ); - root.addChild( child2 ); - - scope.inTransaction( - session -> - session.saveOrUpdate( root ) - ); - - assertInsertCount( 2, scope ); - assertUpdateCount( 0, scope ); - clearCounts( scope ); - - scope.inTransaction( - session -> { - session.delete( grandchild ); - session.delete( grandchild2 ); - session.delete( grandchild3 ); - session.delete( child ); - session.delete( child2 ); - session.delete( root ); - } - ); - } - - @Test - public void testSaveOrUpdateDeepTreeWithGeneratedId(SessionFactoryScope scope) { - boolean instrumented = PersistentAttributeInterceptable.class.isAssignableFrom( NumberedNode.class ); - clearCounts( scope ); - - NumberedNode root = new NumberedNode( "root" ); - NumberedNode c = new NumberedNode( "child" ); - NumberedNode gc = new NumberedNode( "grandchild" ); - scope.inTransaction( - session -> { - root.addChild( c ); - c.addChild( gc ); - session.saveOrUpdate( root ); - } - ); - - assertInsertCount( 3, scope ); - assertUpdateCount( 0, scope ); - clearCounts( scope ); - - NumberedNode child = (NumberedNode) root.getChildren().iterator().next(); - NumberedNode grandchild = (NumberedNode) child.getChildren().iterator().next(); - grandchild.setDescription( "the grand child" ); - NumberedNode grandchild2 = new NumberedNode( "grandchild2" ); - child.addChild( grandchild2 ); - - scope.inTransaction( - session -> - session.saveOrUpdate( root ) - ); - - assertInsertCount( 1, scope ); - assertUpdateCount( instrumented ? 1 : 3, scope ); - clearCounts( scope ); - - NumberedNode child2 = new NumberedNode( "child2" ); - NumberedNode grandchild3 = new NumberedNode( "grandchild3" ); - child2.addChild( grandchild3 ); - root.addChild( child2 ); - - scope.inTransaction( - session -> - session.saveOrUpdate( root ) - ); - - assertInsertCount( 2, scope ); - assertUpdateCount( instrumented ? 0 : 4, scope ); - clearCounts( scope ); - - scope.inTransaction( - session -> { - session.createQuery( "delete from NumberedNode where name like 'grand%'" ).executeUpdate(); - session.createQuery( "delete from NumberedNode where name like 'child%'" ).executeUpdate(); - session.createQuery( "delete from NumberedNode" ).executeUpdate(); - } - ); - } - - @Test - public void testSaveOrUpdateTree(SessionFactoryScope scope) { - clearCounts( scope ); - - Node root = new Node( "root" ); - Node child = new Node( "child" ); - scope.inTransaction( - session -> { - root.addChild( child ); - session.saveOrUpdate( root ); - } - ); - - assertInsertCount( 2, scope ); - clearCounts( scope ); - - root.setDescription( "The root node" ); - child.setDescription( "The child node" ); - - Node secondChild = new Node( "second child" ); - - root.addChild( secondChild ); - - scope.inTransaction( - session -> - session.saveOrUpdate( root ) - ); - - assertInsertCount( 1, scope ); - assertUpdateCount( 2, scope ); - - scope.inTransaction( - session -> { - session.createQuery( "delete from Node where parent is not null" ).executeUpdate(); - session.createQuery( "delete from Node" ).executeUpdate(); - } - ); - } - - @Test - public void testSaveOrUpdateTreeWithGeneratedId(SessionFactoryScope scope) { - clearCounts( scope ); - - NumberedNode root = new NumberedNode( "root" ); - NumberedNode child = new NumberedNode( "child" ); - scope.inTransaction( - session -> { - root.addChild( child ); - session.saveOrUpdate( root ); - } - ); - - assertInsertCount( 2, scope ); - clearCounts( scope ); - - root.setDescription( "The root node" ); - child.setDescription( "The child node" ); - - NumberedNode secondChild = new NumberedNode( "second child" ); - - root.addChild( secondChild ); - - scope.inTransaction( - session -> - session.saveOrUpdate( root ) - ); - - assertInsertCount( 1, scope ); - assertUpdateCount( 2, scope ); - - scope.inTransaction( - session -> { - session.createQuery( "delete from NumberedNode where parent is not null" ).executeUpdate(); - session.createQuery( "delete from NumberedNode" ).executeUpdate(); - } - ); - } - - @Test - public void testSaveOrUpdateManaged(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - NumberedNode root = new NumberedNode( "root" ); - session.saveOrUpdate( root ); - - session.getTransaction().commit(); - - session.beginTransaction(); - NumberedNode child = new NumberedNode( "child" ); - root.addChild( child ); - session.saveOrUpdate( root ); - assertFalse( session.contains( child ) ); - session.flush(); - assertTrue( session.contains( child ) ); - session.getTransaction().commit(); - - assertTrue( root.getChildren().contains( child ) ); - assertThat( root.getChildren().size(), is( 1 ) ); - - session.beginTransaction(); - assertThat( - getRowCount( session, NumberedNode.class ), - is( 2L ) - ); - session.delete( root ); - session.delete( child ); - } - ); - } - - @Test - public void testSaveOrUpdateGot(SessionFactoryScope scope) { - clearCounts( scope ); - - boolean instrumented = PersistentAttributeInterceptable.class.isAssignableFrom( NumberedNode.class ); - - NumberedNode root = new NumberedNode( "root" ); - scope.inTransaction( - session -> - session.saveOrUpdate( root ) - ); - - assertInsertCount( 1, scope ); - assertUpdateCount( 0, scope ); - clearCounts( scope ); - - scope.inTransaction( - session -> - session.saveOrUpdate( root ) - ); - - assertInsertCount( 0, scope ); - assertUpdateCount( instrumented ? 0 : 1, scope ); - - NumberedNode r = scope.fromTransaction( - session -> { - NumberedNode r1 = session.get( NumberedNode.class, root.getId() ); - Hibernate.initialize( r1.getChildren() ); - return r1; - } - ); - - clearCounts( scope ); - - scope.inTransaction( - session -> { - NumberedNode child = new NumberedNode( "child" ); - r.addChild( child ); - session.saveOrUpdate( r ); - assertTrue( session.contains( child ) ); - session.getTransaction().commit(); - - assertInsertCount( 1, scope ); - assertUpdateCount( instrumented ? 0 : 1, scope ); - - session.beginTransaction(); - assertThat( - getRowCount( session, NumberedNode.class ), - is( 2L ) - ); - session.delete( r ); - session.delete( child ); - } - ); - } - - @Test - public void testSaveOrUpdateGotWithMutableProp(SessionFactoryScope scope) { - clearCounts( scope ); - - Node root = new Node( "root" ); - scope.inTransaction( - session -> - session.saveOrUpdate( root ) - ); - - assertInsertCount( 1, scope ); - assertUpdateCount( 0, scope ); - clearCounts( scope ); - - scope.inTransaction( - session -> - session.saveOrUpdate( root ) - ); - - assertInsertCount( 0, scope ); - assertUpdateCount( 0, scope ); - - Node root1 = scope.fromTransaction( - session -> { - Node r1 = session.get( Node.class, "root" ); - Hibernate.initialize( r1.getChildren() ); - return r1; - } - ); - - clearCounts( scope ); - - scope.inTransaction( - session -> { - Node child = new Node( "child" ); - root1.addChild( child ); - session.saveOrUpdate( root1 ); - assertTrue( session.contains( child ) ); - session.getTransaction().commit(); - - assertInsertCount( 1, scope ); - assertUpdateCount( 1, scope ); //note: will fail here if no second-level cache - - session.beginTransaction(); - assertThat( - getRowCount( session, Node.class ), - is( 2L ) - ); - session.delete( root1 ); - session.delete( child ); - } - ); - } - - @Test - public void testEvictThenSaveOrUpdate(SessionFactoryScope scope) { - scope.inTransaction( - session -> { - Node parent = new Node( "1:parent" ); - Node child = new Node( "2:child" ); - Node grandchild = new Node( "3:grandchild" ); - parent.addChild( child ); - child.addChild( grandchild ); - session.saveOrUpdate( parent ); - } - ); - - - Session s1 = scope.getSessionFactory().openSession(); - Session s2 = null; - try { - s1.getTransaction().begin(); - Node child = s1.load( Node.class, "2:child" ); - assertTrue( s1.contains( child ) ); - assertFalse( Hibernate.isInitialized( child ) ); - assertTrue( s1.contains( child.getParent() ) ); - assertTrue( Hibernate.isInitialized( child ) ); - assertFalse( Hibernate.isInitialized( child.getChildren() ) ); - assertFalse( Hibernate.isInitialized( child.getParent() ) ); - assertTrue( s1.contains( child ) ); - s1.evict( child ); - assertFalse( s1.contains( child ) ); - assertTrue( s1.contains( child.getParent() ) ); - - s2 = scope.getSessionFactory().openSession(); - try { - s2.getTransaction().begin(); - s2.saveOrUpdate( child ); - fail(); - } - catch (HibernateException ex) { - // expected because parent is connected to s1 - } - finally { - s2.getTransaction().rollback(); - } - s2.close(); - - s1.evict( child.getParent() ); - assertFalse( s1.contains( child.getParent() ) ); - - s2 = scope.getSessionFactory().openSession(); - s2.getTransaction().begin(); - s2.saveOrUpdate( child ); - assertTrue( s2.contains( child ) ); - assertFalse( s1.contains( child ) ); - assertTrue( s2.contains( child.getParent() ) ); - assertFalse( s1.contains( child.getParent() ) ); - assertFalse( Hibernate.isInitialized( child.getChildren() ) ); - assertFalse( Hibernate.isInitialized( child.getParent() ) ); - assertThat( child.getChildren().size(), is( 1 ) ); - assertThat( child.getParent().getName(), is( "1:parent" ) ); - assertTrue( Hibernate.isInitialized( child.getChildren() ) ); - assertFalse( Hibernate.isInitialized( child.getParent() ) ); - assertNull( child.getParent().getDescription() ); - assertTrue( Hibernate.isInitialized( child.getParent() ) ); - - s1.getTransaction().commit(); - s2.getTransaction().commit(); - } - finally { - if ( s1.getTransaction().isActive() ) { - s1.getTransaction().rollback(); - } - s1.close(); - if ( s2 != null ) { - if ( s2.getTransaction().isActive() ) { - s1.getTransaction().rollback(); - } - s2.close(); - } - } - - scope.inTransaction( - session -> { - session.delete( session.get( Node.class, "3:grandchild" ) ); - session.delete( session.get( Node.class, "2:child" ) ); - session.delete( session.get( Node.class, "1:parent" ) ); - } - ); - } - - @Test - public void testSavePersistentEntityWithUpdate(SessionFactoryScope scope) { - clearCounts( scope ); - - NumberedNode root = new NumberedNode( "root" ); - root.setName( "a name" ); - scope.inTransaction( - session -> - session.saveOrUpdate( root ) - ); - - assertInsertCount( 1, scope ); - assertUpdateCount( 0, scope ); - clearCounts( scope ); - - NumberedNode r = scope.fromTransaction( - session -> { - NumberedNode node = session.get( NumberedNode.class, root.getId() ); - assertThat( node.getName(), is( "a name" ) ); - node.setName( "a new name" ); - session.save( node ); - return node; - } - ); - - assertInsertCount( 0, scope ); - assertUpdateCount( 1, scope ); - clearCounts( scope ); - - scope.inTransaction( - session -> { - NumberedNode node = session.get( NumberedNode.class, r.getId() ); - assertThat( node.getName(), is( "a new name" ) ); - session.delete( node ); - } - ); - } - - private Long getRowCount(Session s, Class clazz) { - CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder(); - CriteriaQuery criteria = criteriaBuilder.createQuery( Long.class ); - Root root = criteria.from( clazz ); - criteria.select( criteriaBuilder.count( root ) ); - return s.createQuery( criteria ).uniqueResult(); - } - - private void clearCounts(SessionFactoryScope scope) { - scope.getSessionFactory().getStatistics().clear(); - } - - private void assertInsertCount(int count, SessionFactoryScope scope) { - int inserts = (int) scope.getSessionFactory().getStatistics().getEntityInsertCount(); - assertThat( inserts, is( count ) ); - } - - private void assertUpdateCount(int count, SessionFactoryScope scope) { - int updates = (int) scope.getSessionFactory().getStatistics().getEntityUpdateCount(); - assertThat( updates, is( count ) ); - } -} - 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 6b0814ab0d..cb6fdd4c5b 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 @@ -39,7 +39,7 @@ public class SimpleOpsTest extends AbstractOperationTestCase { SimpleEntity entity = new SimpleEntity(); entity.setId( id ); entity.setName( "name" ); - session.save( entity ); + session.persist( entity ); } ); @@ -98,7 +98,7 @@ public class SimpleOpsTest extends AbstractOperationTestCase { SimpleEntity entity = session.get( SimpleEntity.class, id ); assertThat( entity.getId(), is( 1L ) ); assertThat( entity.getName(), is( "another new name" ) ); - session.delete( entity ); + session.remove( entity ); } ); 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 8cb5259321..ae0d03fc28 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 @@ -52,7 +52,7 @@ public class BasicGetLoadAccessTest { // create a row scope.inTransaction( session -> - session.save( new User( "steve" ) ) + session.persist( new User( "steve" ) ) ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/ProxiedGetLoadAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/ProxiedGetLoadAccessTest.java index 45f0272f0b..a0fbbb4618 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/ProxiedGetLoadAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ops/genericApi/ProxiedGetLoadAccessTest.java @@ -36,7 +36,7 @@ public class ProxiedGetLoadAccessTest { // create a row scope.inTransaction( session -> - session.save( new UserImpl( "steve" ) ) + session.persist( new UserImpl( "steve" ) ) ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 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 30096e56aa..b6ba2b7a46 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 @@ -84,7 +84,7 @@ public class OptimisticLockTest { document.setSummary( "Very boring book about persistence" ); document.setText( "blah blah yada yada yada" ); document.setPubDate( new PublicationDate( 2004 ) ); - session.save( entityName, document ); + session.persist( entityName, document ); return document; } ); @@ -116,7 +116,7 @@ public class OptimisticLockTest { scope.inTransaction( session -> { Document document = (Document) session.load( entityName, doc.getId() ); - session.delete( entityName, document ); + session.remove( document ); } ); } @@ -130,7 +130,7 @@ public class OptimisticLockTest { document.setSummary( "Very boring book about persistence" ); document.setText( "blah blah yada yada yada" ); document.setPubDate( new PublicationDate( 2004 ) ); - session.save( entityName, document ); + session.persist( entityName, document ); session.flush(); document.setSummary( "A modern classic" ); session.flush(); @@ -153,7 +153,7 @@ public class OptimisticLockTest { ); try { - mainSession.delete( document ); + mainSession.remove( document ); mainSession.flush(); fail( "expecting opt lock failure" ); } @@ -171,7 +171,7 @@ public class OptimisticLockTest { scope.inTransaction( session -> { Document document = (Document) session.load( entityName, doc.getId() ); - session.delete( entityName, document ); + session.remove( document ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java index dd6a2a1785..074c1e9e07 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ordered/OrderByTest.java @@ -101,7 +101,7 @@ public class OrderByTest { assertEquals( iter.next(), "jboss.com" ); assertFalse( iter.hasNext() );*/ - sess.delete( s ); + sess.remove( s ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java index a082a09a9f..90345811b0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/OrphanTest.java @@ -60,7 +60,7 @@ public class OrphanTest { prod.getParts().remove( part ); - session.delete( prod ); + session.remove( prod ); } ); @@ -99,7 +99,7 @@ public class OrphanTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -130,7 +130,7 @@ public class OrphanTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -166,79 +166,7 @@ public class OrphanTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); - } - ); - } - - @Test - @SuppressWarnings("unchecked") - public void testOrphanDeleteOnSaveOrUpdate(SessionFactoryScope scope) { - Product prod = new Product(); - Part part = new Part(); - scope.inTransaction( - session -> { - prod.setName( "Widget" ); - part.setName( "Widge" ); - part.setDescription( "part if a Widget" ); - prod.getParts().add( part ); - Part part2 = new Part(); - part2.setName( "Get" ); - part2.setDescription( "another part if a Widget" ); - prod.getParts().add( part2 ); - session.persist( prod ); - } - ); - - prod.getParts().remove( part ); - - scope.inTransaction( - session -> - session.saveOrUpdate( prod ) - ); - - scope.inTransaction( - session -> { - assertNull( session.get( Part.class, "Widge" ) ); - assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); - } - ); - } - - @Test - @SuppressWarnings("unchecked") - public void testOrphanDeleteOnSaveOrUpdateAfterSerialization(SessionFactoryScope scope) { - Product prod = new Product(); - Part part = new Part(); - scope.inTransaction( - session -> { - prod.setName( "Widget" ); - part.setName( "Widge" ); - part.setDescription( "part if a Widget" ); - prod.getParts().add( part ); - Part part2 = new Part(); - part2.setName( "Get" ); - part2.setDescription( "another part if a Widget" ); - prod.getParts().add( part2 ); - session.persist( prod ); - } - ); - - prod.getParts().remove( part ); - - Product cloned = (Product) SerializationHelper.clone( prod ); - - scope.inTransaction( - session -> - session.saveOrUpdate( cloned ) - ); - - scope.inTransaction( - session -> { - assertNull( session.get( Part.class, "Widge" ) ); - assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -279,7 +207,7 @@ public class OrphanTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -315,7 +243,7 @@ public class OrphanTest { session -> { assertNull( session.get( Part.class, "Widge" ) ); assertNotNull( session.get( Part.class, "Get" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -346,7 +274,7 @@ public class OrphanTest { scope.inTransaction( session -> { assertNull( session.get( Part.class, "Widge" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } @@ -384,7 +312,7 @@ public class OrphanTest { scope.inTransaction( session -> { assertNotNull( session.get( Part.class, "Widge" ) ); - session.delete( session.get( Product.class, "Widget" ) ); + session.remove( session.get( Product.class, "Widget" ) ); } ); } 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 a669f78239..f62aa24d01 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 @@ -44,14 +44,14 @@ public class PropertyRefTest { session -> { user.addMail( "test" ); user.addMail( "test" ); - session.save( user ); + session.persist( user ); } ); scope.inTransaction( session -> { User u = session.load( User.class, user.getId() ); - session.delete( u ); + session.remove( u ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java index 36a0651483..ff1b6dfb6f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/elementcollection/ElementCollectionOrphanTest.java @@ -34,7 +34,7 @@ public class ElementCollectionOrphanTest { EnrollableClass aClass = new EnrollableClass(); aClass.setId( "123" ); aClass.setName( "Math" ); - session.save( aClass ); + session.persist( aClass ); Student aStudent = new Student(); aStudent.setId( "s1" ); @@ -51,7 +51,7 @@ public class ElementCollectionOrphanTest { enrClass.setClassStartTime( 130 ); enrClass.setSeat( seat ); aStudent.setEnrolledClasses( Collections.singleton( enrClass ) ); - session.save( aStudent ); + session.persist( aStudent ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java index 347214f63f..bdd0653df5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerNonOptionalOrphanRemovalTest.java @@ -55,10 +55,10 @@ public class OneToOneEagerNonOptionalOrphanRemovalTest { final Engine engine2 = new Engine( 2, 295 ); final Car car = new Car( 1, engine1, color ); - session.save( engine1 ); - session.save( engine2 ); - session.save( color ); - session.save( car ); + session.persist( engine1 ); + session.persist( engine2 ); + session.persist( color ); + session.persist( car ); } ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -67,7 +67,7 @@ public class OneToOneEagerNonOptionalOrphanRemovalTest { final Car car = session.find( Car.class, 1 ); final Engine engine = session.find( Engine.class, 2 ); car.setEngine( engine ); - session.update( car ); + session.merge( car ); } ); scope.inTransaction( session -> { @@ -84,8 +84,8 @@ public class OneToOneEagerNonOptionalOrphanRemovalTest { final PaintColor color = new PaintColor( 2, "Blue" ); final Car car = session.find( Car.class, 1 ); car.setPaintColor( color ); - session.save( color ); - session.update( car ); + session.persist( color ); + session.merge( car ); } ); scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java index 90d44bfa2d..3033ba6144 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneEagerOrphanRemovalTest.java @@ -54,9 +54,9 @@ public class OneToOneEagerOrphanRemovalTest { final Engine engine = new Engine( 1, 275 ); final Car car = new Car( 1, engine, color ); - session.save( engine ); - session.save( color ); - session.save( car ); + session.persist( engine ); + session.persist( color ); + session.persist( car ); } ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -64,7 +64,7 @@ public class OneToOneEagerOrphanRemovalTest { scope.inTransaction( session -> { final Car car = session.find( Car.class, 1 ); car.setEngine( null ); - session.update( car ); + session.merge( car ); } ); scope.inTransaction( session -> { @@ -80,7 +80,7 @@ public class OneToOneEagerOrphanRemovalTest { scope.inTransaction( session -> { final Car car = session.find( Car.class, 1 ); car.setPaintColor( null ); - session.update( car ); + session.merge( car ); } ); scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java index a8d3f7ae6b..ad3f26c7c8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyNonOptionalOrphanRemovalTest.java @@ -6,25 +6,25 @@ */ package org.hibernate.orm.test.orphan.one2one; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.OneToOne; - -import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; + import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9663") +@JiraKey("HHH-9663") @DomainModel( annotatedClasses = { OneToOneLazyNonOptionalOrphanRemovalTest.Car.class, @@ -39,9 +39,9 @@ public class OneToOneLazyNonOptionalOrphanRemovalTest { public void tearDown(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.createQuery( "delete from Car" ).executeUpdate(); - session.createQuery( "delete from Engine" ).executeUpdate(); - session.createQuery( "delete from PaintColor" ).executeUpdate(); + session.createMutationQuery( "delete from Car" ).executeUpdate(); + session.createMutationQuery( "delete from Engine" ).executeUpdate(); + session.createMutationQuery( "delete from PaintColor" ).executeUpdate(); } ); } @@ -56,10 +56,10 @@ public class OneToOneLazyNonOptionalOrphanRemovalTest { final Engine engine2 = new Engine( 2, 295 ); final Car car = new Car( 1, engine1, color ); - session.save( engine1 ); - session.save( engine2 ); - session.save( color ); - session.save( car ); + session.persist( engine1 ); + session.persist( engine2 ); + session.persist( color ); + session.persist( car ); } ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -68,7 +68,7 @@ public class OneToOneLazyNonOptionalOrphanRemovalTest { final Car car = session.find( Car.class, 1 ); final Engine engine = session.find( Engine.class, 2 ); car.setEngine( engine ); - session.update( car ); + session.merge( car ); } ); scope.inTransaction( session -> { @@ -85,8 +85,8 @@ public class OneToOneLazyNonOptionalOrphanRemovalTest { final PaintColor color = new PaintColor( 2, "Blue" ); final Car car = session.find( Car.class, 1 ); car.setPaintColor( color ); - session.save( color ); - session.update( car ); + session.persist( color ); + session.merge( car ); } ); scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java index ee646f42d1..14a364cc3d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/OneToOneLazyOrphanRemovalTest.java @@ -6,24 +6,24 @@ */ package org.hibernate.orm.test.orphan.one2one; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.OneToOne; - -import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; + import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-9663") +@JiraKey("HHH-9663") @DomainModel( annotatedClasses = { OneToOneLazyOrphanRemovalTest.Car.class, @@ -54,9 +54,9 @@ public class OneToOneLazyOrphanRemovalTest { final Engine engine = new Engine( 1, 275 ); final Car car = new Car( 1, engine, color ); - session.save( engine ); - session.save( color ); - session.save( car ); + session.persist( engine ); + session.persist( color ); + session.persist( car ); } ); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -64,7 +64,7 @@ public class OneToOneLazyOrphanRemovalTest { scope.inTransaction( session -> { final Car car = session.find( Car.class, 1 ); car.setEngine( null ); - session.update( car ); + session.merge( car ); } ); scope.inTransaction( session -> { @@ -80,7 +80,7 @@ public class OneToOneLazyOrphanRemovalTest { scope.inTransaction( session -> { final Car car = session.find( Car.class, 1 ); car.setPaintColor( null ); - session.update( car ); + session.merge( car ); } ); scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java index d4ddbad6e2..66da3bd6eb 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java @@ -35,7 +35,7 @@ public class DeleteOneToOneOrphansTest { session -> { Employee emp = new Employee(); emp.setInfo( new EmployeeInfo( emp ) ); - session.save( emp ); + session.persist( emp ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java index 2442921d91..487a49043f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java @@ -66,7 +66,7 @@ public class DeleteMultiLevelOrphansTest { scope.inTransaction( session -> - session.save( preisregelung ) + session.persist( preisregelung ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java index 0a907dfd93..b32ad9911e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java @@ -35,7 +35,7 @@ public class DeleteOneToOneOrphansTest { session -> { Employee emp = new Employee(); emp.setInfo( new EmployeeInfo( 1L, 1L ) ); - session.save( emp ); + session.persist( emp ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java index 00835e92b7..39f1c81717 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java @@ -35,7 +35,7 @@ public class DeleteOneToOneOrphansTest { session -> { Employee emp = new Employee(); emp.setInfo( new EmployeeInfo( emp ) ); - session.save( emp ); + session.persist( emp ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java index fadfaf42a3..6563a0a2c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/bidirectional/multilevelcascade/DeleteMultiLevelOrphansTest.java @@ -58,7 +58,7 @@ public class DeleteMultiLevelOrphansTest { scope.inTransaction( session -> - session.save( preisregelung ) + session.persist( preisregelung ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java index 1483cc3066..816fa0e00b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java @@ -10,6 +10,7 @@ import java.util.List; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; import org.junit.jupiter.api.AfterEach; @@ -35,7 +36,7 @@ public class DeleteOneToOneOrphansTest { session -> { Employee emp = new Employee(); emp.setInfo( new EmployeeInfo() ); - session.save( emp ); + session.persist( emp ); } ); } @@ -80,7 +81,7 @@ public class DeleteOneToOneOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-5267") + @JiraKey("HHH-5267") public void testOrphanedWhileDetached(SessionFactoryScope scope) { Employee e = scope.fromTransaction( @@ -102,7 +103,7 @@ public class DeleteOneToOneOrphansTest { e.setInfo( null ); //save using the new session (this used to work prior to 3.5.x) - session.saveOrUpdate( e ); + session.merge( e ); } ); @@ -122,7 +123,7 @@ public class DeleteOneToOneOrphansTest { } @Test - @TestForIssue(jiraKey = "HHH-6484") + @JiraKey("HHH-6484") public void testReplacedWhileManaged(SessionFactoryScope scope) { Employee e = scope.fromTransaction( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java index 2f9a27a555..b51e6fe8ae 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java @@ -34,7 +34,7 @@ public class DeleteOneToOneOrphansTest { session -> { Employee emp = new Employee(); emp.setInfo( new EmployeeInfo( emp ) ); - session.save( emp ); + session.persist( emp ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java index 3a9ce30627..a60a6f06b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java @@ -34,7 +34,7 @@ public class DeleteOneToOneOrphansTest { scope.inTransaction( session -> { Employee emp = new Employee(); - session.save( emp ); + session.persist( emp ); emp.setInfo( new EmployeeInfo( emp.getId() ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java index c4df945bbd..219252074b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/DistinctSelectTest.java @@ -50,13 +50,13 @@ public class DistinctSelectTest extends BaseCoreFunctionalTestCase { for (int i = 0; i < 5; i++) { Tag tag = new Tag("Tag: " + SafeRandomUUIDGenerator.safeRandomUUID()); tags.add(tag); - s.save(tag); + s.persist(tag); } for (int i = 0; i < NUM_OF_USERS; i++) { Entry e = new Entry("Entry: " + SafeRandomUUIDGenerator.safeRandomUUID()); e.getTags().addAll(tags); - s.save(e); + s.persist(e); } t.commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java index 22b66cacfa..6b2a8de1d7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/FetchClausePaginationTest.java @@ -55,7 +55,7 @@ public class FetchClausePaginationTest { entityContainingLists.addComponent( new SimpleComponent( "first-a2", "first-another-a2" ) ); entityContainingLists.addComponent( new SimpleComponent( "first-a3", "first-another-a2" ) ); - session.save( entityContainingLists ); + session.persist( entityContainingLists ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java index e346c61f53..f2caa61666 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/pagination/SubqueryPaginationTest.java @@ -57,7 +57,7 @@ public class SubqueryPaginationTest { entityContainingLists.addComponent( new SimpleComponent( "first-a2", "first-another-a2" ) ); entityContainingLists.addComponent( new SimpleComponent( "first-a3", "first-another-a2" ) ); - session.save( entityContainingLists ); + session.persist( entityContainingLists ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java index e0b5db7857..f1b6c82696 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingIdentityTest.java @@ -76,7 +76,7 @@ public class CustomSqlSchemaResolvingIdentityTest { scope.inTransaction( session -> { CustomEntity entity = session.find( CustomEntity.class, _entitty.id ); - session.delete( entity ); + session.remove( entity ); } ); scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java index d325dfd83a..81ea358136 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/persister/entity/CustomSqlSchemaResolvingTest.java @@ -70,7 +70,7 @@ public class CustomSqlSchemaResolvingTest { scope.inTransaction( session -> { CustomEntity entity = session.find( CustomEntity.class, 1 ); - session.delete( entity ); + session.remove( entity ); } ); scope.inTransaction( session -> { 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 575ca0e1d3..f5a31f5c00 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 @@ -50,9 +50,9 @@ public class PolymorphicAssociationTest { level3.setName( "initial-name" ); - session.save( level1 ); - session.save( level2 ); - session.save( level3 ); + session.persist( level1 ); + session.persist( level2 ); + session.persist( level3 ); } ); } 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 aaa379ed7f..0d3e6f7bdd 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 @@ -50,9 +50,9 @@ public class PolymorphicAssociationTest2 { level3.setName( "initial-name" ); - session.save( level1 ); - session.save( level2 ); - session.save( level3 ); + session.persist( level1 ); + session.persist( level2 ); + session.persist( level3 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java index 50d3105e20..30d4fd64a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/property/GetAndIsVariantGetterWithTransientAnnotationTest.java @@ -39,7 +39,7 @@ public class GetAndIsVariantGetterWithTransientAnnotationTest { TestEntity entity = new TestEntity(); entity.setId( 1L ); entity.setChecked( true ); - session1.save( entity ); + session1.persist( entity ); } ); scope.inTransaction( session1 -> { @@ -64,7 +64,7 @@ public class GetAndIsVariantGetterWithTransientAnnotationTest { SecondTestEntity entity = new SecondTestEntity(); entity.setId( 1L ); entity.setChecked( true ); - session1.save( entity ); + session1.persist( entity ); } ); scope.inTransaction( session1 -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkTest.java index 8c7f4e6457..e4ec886ae3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkTest.java @@ -46,7 +46,7 @@ public class DoesNotWorkTest { // session.beginTransaction(); // DoesNotWork entity = new DoesNotWork( pk ); // entity.setGlobalNotes( Arrays.asList( "My first note!" ) ); -// session.save( entity ); +// session.persist( entity ); // session.getTransaction().commit(); // session.close(); // } @@ -60,7 +60,7 @@ public class DoesNotWorkTest { System.out.println( s ); } } - session.delete( entity ); + session.remove( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkWithHbmTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkWithHbmTest.java index 12f1b268fb..9545f2ec83 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkWithHbmTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/DoesNotWorkWithHbmTest.java @@ -49,7 +49,7 @@ public class DoesNotWorkWithHbmTest { // session.beginTransaction(); // DoesNotWork entity = new DoesNotWork( pk ); // entity.setGlobalNotes( Arrays.asList( "My first note!" ) ); -// session.save( entity ); +// session.persist( entity ); // session.getTransaction().commit(); // session.close(); // } @@ -64,7 +64,7 @@ public class DoesNotWorkWithHbmTest { for ( String s : notes ) { System.out.println( s ); } - session.delete( entity ); + session.remove( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java index 0e8cf7bb19..083e496c56 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/basic/PropertyRefTest.java @@ -78,7 +78,7 @@ public class PropertyRefTest { List results = session.createQuery( "from Person" ).list(); Iterator itr = results.iterator(); while ( itr.hasNext() ) { - session.delete( itr.next() ); + session.remove( itr.next() ); } } ); @@ -108,7 +108,7 @@ public class PropertyRefTest { scope.inTransaction( session -> - session.update( g ) + session.merge( g ) ); // test retrieval of the group @@ -117,7 +117,7 @@ public class PropertyRefTest { Group group = (Group) session.createQuery( "from Group g left join fetch g.users" ).uniqueResult(); assertTrue( Hibernate.isInitialized( group.getUsers() ) ); assertEquals( 2, group.getUsers().size() ); - session.delete( group ); + session.remove( group ); session.createQuery( "delete Person" ).executeUpdate(); } ); @@ -135,16 +135,16 @@ public class PropertyRefTest { a.setCountry( "USA" ); p.setAddress( a ); a.setPerson( p ); - session.save( p ); + session.persist( p ); Person p2 = new Person(); p2.setName( "Max" ); p2.setUserId( "max" ); - session.save( p2 ); + session.persist( p2 ); Account act = new Account(); act.setType( 'c' ); act.setUser( p2 ); p2.getAccounts().add( act ); - session.save( act ); + session.persist( act ); session.flush(); session.clear(); @@ -225,7 +225,7 @@ public class PropertyRefTest { a.setCountry( "USA" ); p.setAddress( a ); a.setPerson( p ); - s.save( p ); + s.persist( p ); s.flush(); s.clear(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java index c30ebe15da..37b81ac5c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java @@ -39,7 +39,7 @@ public class CachedPropertyRefCollectionTest { session -> { mo = new ManagedObject( "test", "test" ); mo.getMembers().add( "members" ); - session.save( mo ); + session.persist( mo ); } ); } @@ -48,7 +48,7 @@ public class CachedPropertyRefCollectionTest { public void tearDown(SessionFactoryScope scope) { scope.inTransaction( session -> - session.delete( mo ) + session.remove( mo ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java index 080e739891..b75a93e65c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java @@ -74,8 +74,8 @@ public class CompleteComponentPropertyRefTest { assertEquals( "Gavin", a.getOwner().getIdentity().getName() ); assertTrue( Hibernate.isInitialized( a.getOwner() ) ); - session.delete( a ); - session.delete( a.getOwner() ); + session.remove( a ); + session.remove( a.getOwner() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java index 69f1d5610d..b3c1e14493 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java @@ -70,9 +70,9 @@ public class SubclassPropertyRefTest { Customer c = (Customer) session.createQuery( "from Customer" ).uniqueResult(); assertSame( a.getCustomer(), c ); assertSame( a.getPerson(), c ); - session.delete( a ); - session.delete( a.getCustomer() ); - session.delete( a.getPerson() ); + session.remove( a ); + session.remove( a.getCustomer() ); + session.remove( a.getPerson() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java index 9412404970..1242569eef 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java @@ -68,7 +68,7 @@ public class JoinedSubclassPropertyRefTest { ); scope.inTransaction( - session -> session.delete( person ) + session -> session.remove( person ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java index 0334b092a5..254902f7f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java @@ -72,9 +72,9 @@ public class UnionSubclassPropertyRefTest { Customer c = (Customer) session.createQuery( "from Customer" ).uniqueResult(); assertSame( a.getCustomer(), c ); assertSame( a.getPerson(), c ); - session.delete( a ); - session.delete( a.getCustomer() ); - session.delete( a.getPerson() ); + session.remove( a ); + session.remove( a.getCustomer() ); + session.remove( a.getPerson() ); } ); } 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 bcf1626e68..0e732a131a 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 @@ -76,7 +76,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { } catch (NoSuchMethodException e) {} - s.delete(dp); + s.remove(dp); t.commit(); s.close(); @@ -104,7 +104,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { catch (Exception e) { assertTrue( e.getClass()==Exception.class ); } - s.delete(dp); + s.remove(dp); t.commit(); s.close(); } @@ -131,7 +131,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { catch (Exception e) { assertTrue( e.getClass()==Exception.class ); } - s.delete(dp); + s.remove(dp); t.commit(); s.close(); } @@ -158,7 +158,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { catch (Exception e) { assertTrue( e.getClass()==Exception.class ); } - s.delete(dp); + s.remove(dp); t.commit(); s.close(); } @@ -182,7 +182,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -208,7 +208,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -256,7 +256,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { assertSame(none, snone); assertTrue(snone instanceof HibernateProxy); - sclone.delete(dp); + sclone.remove(dp); t.commit(); sclone.close(); @@ -308,7 +308,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { dp2 = (DataPoint) s.createQuery("from DataPoint").uniqueResult(); assertSame(dp, dp2); assertTrue( Hibernate.isInitialized(dp) ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -358,7 +358,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { dp2 = (DataPoint) s.createQuery("from DataPoint").uniqueResult(); assertSame(dp, dp2); assertTrue( Hibernate.isInitialized(dp) ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -406,7 +406,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { container.setInfo( new Info( "blah blah blah" ) ); container.getDataPoints().add( new DataPoint( new BigDecimal( 1 ), new BigDecimal( 1 ), "first data point" ) ); container.getDataPoints().add( new DataPoint( new BigDecimal( 2 ), new BigDecimal( 2 ), "second data point" ) ); - s.save( container ); + s.persist( container ); t.commit(); s.close(); @@ -437,7 +437,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { // expected result } - s.delete( c ); + s.remove( c ); t.commit(); s.close(); @@ -463,7 +463,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { dp.setY( new BigDecimal( dp_indx ) ); container.getDataPoints().add( dp ); } - s.save( container ); + s.persist( container ); lastContainerId = container.getId(); } t.commit(); @@ -480,7 +480,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { .setParameter( "l", lastContainerId.longValue() ) .list(); Container container = ( Container ) all.get( 0 ); - s.delete( container ); + s.remove( container ); // force a snapshot retrieval of the proxied container SessionImpl sImpl = ( SessionImpl ) s; sImpl.getPersistenceContext().getDatabaseSnapshot( @@ -533,7 +533,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s.refresh( dp, LockOptions.UPGRADE ); assertSame( LockOptions.UPGRADE.getLockMode(), s.getCurrentLockMode( dp ) ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -551,7 +551,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s.refresh( dp, LockOptions.UPGRADE ); assertSame( LockOptions.UPGRADE.getLockMode(), s.getCurrentLockMode( dp ) ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -580,7 +580,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { dp.getX(); assertSame( LockOptions.UPGRADE.getLockMode(), s.getCurrentLockMode( dp ) ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -596,7 +596,7 @@ public class ProxyTest extends BaseCoreFunctionalTestCase { s.buildLockRequest( LockOptions.UPGRADE ).lock( dp ); assertSame( LockOptions.UPGRADE.getLockMode(), s.getCurrentLockMode( dp ) ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } 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 9fd98ad92c..c5378fd96e 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 @@ -35,10 +35,10 @@ public class ProxyNarrowingTest { Integer entityReferenceId = scope.fromTransaction( session -> { ConcreteEntity entity = new ConcreteEntity(); - session.save( entity ); + session.persist( entity ); LazyAbstractEntityReference reference = new LazyAbstractEntityReference( entity ); - session.save( reference ); + session.persist( reference ); Integer id = reference.getId(); session.flush(); @@ -73,8 +73,8 @@ public class ProxyNarrowingTest { assertTrue( session.contains( concreteEntityProxy ) ); // clean up - session.delete( reference ); - session.delete( concreteEntityProxy ); + session.remove( reference ); + session.remove( concreteEntityProxy ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java index 48779527cb..27163a063f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryHintTest.java @@ -82,7 +82,7 @@ public class QueryHintTest { @AfterEach public void dropTestData(SessionFactoryScope scope) { scope.inTransaction( (session) -> { - session.createQuery( "from Contact" ).list().forEach( session::delete ); + session.createQuery( "from Contact" ).list().forEach( session::remove ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java index d03d8acb52..dbfd744218 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/SQLServerNationalizedScalarQueryTest.java @@ -52,8 +52,8 @@ public class SQLServerNationalizedScalarQueryTest { User user2 = new User( 2, "Steve" ); scope.inTransaction( session -> { - session.save( user1 ); - session.save( user2 ); + session.persist( user1 ); + session.persist( user2 ); } ); scope.inTransaction( session -> { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java index 2f7a78ec84..f08711632e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/hhh13151/TreatedEntityFetchTest.java @@ -46,7 +46,7 @@ public class TreatedEntityFetchTest extends BaseCoreFunctionalTestCase { public void prepareEntities() { Session s = openSession(); Transaction tx = s.beginTransaction(); - s.save( new SubEntity().setSubField( new SideEntity( "testName" ) ) ); + s.persist( new SubEntity().setSubField( new SideEntity( "testName" ) ) ); tx.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java index 164fd4b71d..aecc741da5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/AnnotationMappingJoinClassTest.java @@ -13,6 +13,17 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; + +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -32,116 +43,108 @@ import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; import jakarta.persistence.Version; -import org.hibernate.annotations.CreationTimestamp; -import org.hibernate.annotations.UpdateTimestamp; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.junit.Test; - -import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; -import static org.junit.Assert.assertNotNull; @TestForIssue(jiraKey = "HHH-12076") -public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { +@DomainModel( + annotatedClasses = { + AnnotationMappingJoinClassTest.Claim.class, + AnnotationMappingJoinClassTest.Settlement.class, + AnnotationMappingJoinClassTest.Task.class, + AnnotationMappingJoinClassTest.SettlementTask.class, + AnnotationMappingJoinClassTest.TaskStatus.class, + AnnotationMappingJoinClassTest.Extension.class, + AnnotationMappingJoinClassTest.SettlementExtension.class, + AnnotationMappingJoinClassTest.GapAssessmentExtension.class, + AnnotationMappingJoinClassTest.EwtAssessmentExtension.class + } +) +@SessionFactory +public class AnnotationMappingJoinClassTest { - @Override - protected Class[] getAnnotatedClasses() { - return new Class[]{ - Claim.class, - Settlement.class, - Task.class, - SettlementTask.class, - TaskStatus.class, - Extension.class, - SettlementExtension.class, - GapAssessmentExtension.class, - EwtAssessmentExtension.class - }; - } + @BeforeAll + protected void prepareTest(SessionFactoryScope scope) { + scope.inTransaction( session -> { + TaskStatus taskStatus = new TaskStatus(); + taskStatus.setName( "Enabled" ); + taskStatus.setDisplayName( "Enabled" ); + session.persist( taskStatus ); - @Override - protected void prepareTest() { - doInHibernate( this::sessionFactory, session -> { - TaskStatus taskStatus = new TaskStatus(); - taskStatus.setName("Enabled"); - taskStatus.setDisplayName("Enabled"); - session.save(taskStatus); + for ( long i = 0; i < 10; i++ ) { + SettlementTask settlementTask = new SettlementTask(); + settlementTask.setId( i ); + Settlement settlement = new Settlement(); + settlementTask.setLinked( settlement ); + settlementTask.setStatus( taskStatus ); - for (long i = 0; i < 10; i++) { - SettlementTask settlementTask = new SettlementTask(); - settlementTask.setId(i); - Settlement settlement = new Settlement(); - settlementTask.setLinked(settlement); - settlementTask.setStatus(taskStatus); + Claim claim = new Claim(); + claim.setId( i ); + settlement.setClaim( claim ); - Claim claim = new Claim(); - claim.setId(i); - settlement.setClaim(claim); + for ( int j = 0; j < 2; j++ ) { + GapAssessmentExtension gapAssessmentExtension = new GapAssessmentExtension(); + gapAssessmentExtension.setSettlement( settlement ); + EwtAssessmentExtension ewtAssessmentExtension = new EwtAssessmentExtension(); + ewtAssessmentExtension.setSettlement( settlement ); - for (int j = 0; j < 2; j++) { - GapAssessmentExtension gapAssessmentExtension = new GapAssessmentExtension(); - gapAssessmentExtension.setSettlement(settlement); - EwtAssessmentExtension ewtAssessmentExtension = new EwtAssessmentExtension(); - ewtAssessmentExtension.setSettlement(settlement); + settlement.getExtensions().add( gapAssessmentExtension ); + settlement.getExtensions().add( ewtAssessmentExtension ); + } + session.persist( claim ); + session.persist( settlement ); + session.persist( settlementTask ); + } + } ); + } - settlement.getExtensions().add(gapAssessmentExtension); - settlement.getExtensions().add(ewtAssessmentExtension); - } - session.save(claim); - session.save(settlement); - session.save(settlementTask); - } - } ); - } + @Test + public void testClassExpressionInOnClause(SessionFactoryScope scope) { + scope.inTransaction( session -> { + List results = session.createQuery( + "select " + + " rootAlias.id, " + + " linked.id, " + + " extensions.id " + + "from SettlementTask as rootAlias " + + "join rootAlias.linked as linked " + + "left join linked.extensions as extensions on extensions.class = EwtAssessmentExtension " + + "where linked.id = :claimId " + ) + .setParameter( "claimId", 1L ) + .getResultList(); - @Test - public void testClassExpressionInOnClause() { - doInHibernate( this::sessionFactory, session -> { - List results = session.createQuery( - "select " + - " rootAlias.id, " + - " linked.id, " + - " extensions.id " + - "from SettlementTask as rootAlias " + - "join rootAlias.linked as linked " + - "left join linked.extensions as extensions on extensions.class = EwtAssessmentExtension " + - "where linked.id = :claimId " - ) - .setParameter("claimId", 1L) - .getResultList(); + assertThat( results ).isNotNull(); + } ); + } - assertNotNull(results); - } ); - } + @Test + public void testClassExpressionInWhereClause(SessionFactoryScope scope) { + scope.inTransaction( session -> { + List results = session.createQuery( + "select " + + " rootAlias.id, " + + " linked.id, " + + " extensions.id " + + "from SettlementTask as rootAlias " + + "join rootAlias.linked as linked " + + "left join linked.extensions as extensions " + + "where linked.id = :claimId and (extensions is null or extensions.class = EwtAssessmentExtension)" + ) + .setParameter( "claimId", 1L ) + .getResultList(); - @Test - public void testClassExpressionInWhereClause() { - doInHibernate( this::sessionFactory, session -> { - List results = session.createQuery( - "select " + - " rootAlias.id, " + - " linked.id, " + - " extensions.id " + - "from SettlementTask as rootAlias " + - "join rootAlias.linked as linked " + - "left join linked.extensions as extensions " + - "where linked.id = :claimId and (extensions is null or extensions.class = EwtAssessmentExtension)" - ) - .setParameter("claimId", 1L) - .getResultList(); + assertThat( results ).isNotNull(); + } ); + } - assertNotNull(results); - } ); - } - - @Entity(name = "Claim") + @Entity(name = "Claim") @Table(name = "claim") public static class Claim { public static final long serialVersionUID = 1L; @Id - @GeneratedValue +// @GeneratedValue private Long id; @Version @@ -157,25 +160,25 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { private Integer term; private Double initialReserve = 0.0; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date effectiveDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date expiryDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date notificationDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date pendingDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date openDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date suspendDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date closeDate; private String externalId; @@ -193,13 +196,13 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public void addExtension(Extension extension) { - extensions.add( extension); - extension.setClaim(this); + extensions.add( extension ); + extension.setClaim( this ); } public void addSettlement(Settlement settlement) { - settlements.add( settlement); - settlement.setClaim(this); + settlements.add( settlement ); + settlement.setClaim( this ); } public Long getId() { @@ -347,7 +350,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } } - @Entity(name = "EwtAssessmentExtension") + @Entity(name = "EwtAssessmentExtension") public static class EwtAssessmentExtension extends SettlementExtension { public static final long serialVersionUID = 1L; @@ -550,7 +553,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } - @Entity(name = "Extension") + @Entity(name = "Extension") @Table(name = "claimext") @Inheritance(strategy = InheritanceType.JOINED) public abstract static class Extension { @@ -574,8 +577,8 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { private Claim claim; public Extension() { - String[] name = this.getClass().getName().split("\\."); - type = name[name.length-1]; + String[] name = this.getClass().getName().split( "\\." ); + type = name[name.length - 1]; } public Long getId() { @@ -628,7 +631,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } - @Entity(name = "GapAssessmentExtension") + @Entity(name = "GapAssessmentExtension") public static class GapAssessmentExtension extends SettlementExtension { private Double insuredsObligation = 0.0; @@ -669,7 +672,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } } - @Entity(name = "Settlement") + @Entity(name = "Settlement") @Table(name = "claim_settlement") public static class Settlement { @@ -701,13 +704,13 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { private Double totalAmount = 0.0; private Double underinsuredAmount = 0.0; - @Temporal( TemporalType.TIMESTAMP ) + @Temporal(TemporalType.TIMESTAMP) private Date openDate; - @Temporal( TemporalType.TIMESTAMP ) + @Temporal(TemporalType.TIMESTAMP) private Date allocateDate; - @Temporal( TemporalType.TIMESTAMP ) + @Temporal(TemporalType.TIMESTAMP) private Date closeDate; private String trackingId; @@ -821,29 +824,29 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public void addExtension(SettlementExtension extension) { - if (!hasExtension(extension.getClass())) { - if (extension.getOrderIndex() == null) { - extension.setOrderIndex( extensions.size()); + if ( !hasExtension( extension.getClass() ) ) { + if ( extension.getOrderIndex() == null ) { + extension.setOrderIndex( extensions.size() ); } - extension.setSettlement(this); - extensions.add( extension); + extension.setSettlement( this ); + extensions.add( extension ); } } @SuppressWarnings("unchecked") public X getExtension(Class extensionType) { - if (extensionMap == null || extensionMap.size() != extensions.size()) { - Map, SettlementExtension> map = new HashMap, SettlementExtension>( extensions.size()); - for (SettlementExtension extension : extensions ) { - map.put(extension.getClass(), extension); + if ( extensionMap == null || extensionMap.size() != extensions.size() ) { + Map, SettlementExtension> map = new HashMap, SettlementExtension>( extensions.size() ); + for ( SettlementExtension extension : extensions ) { + map.put( extension.getClass(), extension ); } extensionMap = map; } - return (X)extensionMap.get(extensionType); + return (X) extensionMap.get( extensionType ); } public boolean hasExtension(Class extensionType) { - return getExtension(extensionType) != null; + return getExtension( extensionType ) != null; } public Boolean isOverride() { @@ -928,7 +931,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } - @Entity(name = "SettlementExtension") + @Entity(name = "SettlementExtension") @Table(name = "claimsettlement_ext") public abstract static class SettlementExtension { @@ -1008,11 +1011,11 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } - public enum SettlementStatus { + public enum SettlementStatus { RESERVED, ALLOCATED, PAID, VOID, DENIED } - @Entity(name = "SettlementTask") + @Entity(name = "SettlementTask") public static class SettlementTask extends Task { @ManyToOne(fetch = FetchType.LAZY) @@ -1028,13 +1031,13 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } - @Entity(name = "Task") + @Entity(name = "Task") @Table(name = "wf_task") @Inheritance public abstract static class Task { @Id - @GeneratedValue +// @GeneratedValue private Long id; @Version @@ -1046,25 +1049,25 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { @UpdateTimestamp private Date modifiedDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date startDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date closeDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date dueDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date stateDueDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date statusDueDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date stateTransitionDate; - @Temporal( TemporalType.DATE ) + @Temporal(TemporalType.DATE) private Date statusTransitionDate; @ManyToOne(fetch = FetchType.LAZY) @@ -1081,11 +1084,12 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { // private Set> linkedTasks = new HashSet<>(); public abstract T getLinked(); + public abstract void setLinked(T linked); public void addChild(Task task) { - task.setParent(this); - children.add( task); + task.setParent( this ); + children.add( task ); } public Long getId() { @@ -1097,7 +1101,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public Integer getVersion() { - return version; + return version; } public void setVersion(Integer version) { @@ -1105,7 +1109,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public Date getCreationDate() { - return creationDate; + return creationDate; } public void setCreationDate(Date creationDate) { @@ -1113,7 +1117,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public Date getModifiedDate() { - return modifiedDate; + return modifiedDate; } public void setModifiedDate(Date modifiedDate) { @@ -1133,9 +1137,9 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { Set children = null; children = new LinkedHashSet(); - for (Task child : this.children ) { - if (ofType.isInstance(child)) { - children.add((X) child); + for ( Task child : this.children ) { + if ( ofType.isInstance( child ) ) { + children.add( (X) child ); } } return children; @@ -1150,15 +1154,15 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public Date getStartDate() { - return startDate; + return startDate; } public void setStartDate(Date openDate) { - startDate = openDate; + startDate = openDate; } public Date getCloseDate() { - return closeDate; + return closeDate; } public void setCloseDate(Date closeDate) { @@ -1166,11 +1170,11 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public Date getDueDate() { - return dueDate; + return dueDate; } public void setDueDate(Date expiryDate) { - dueDate = expiryDate; + dueDate = expiryDate; } public Task getParent() { @@ -1190,7 +1194,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { // } public Date getStateTransitionDate() { - return stateTransitionDate; + return stateTransitionDate; } public void setStateTransitionDate(Date stateTransitionDate) { @@ -1198,15 +1202,15 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public Date getStatusTransitionDate() { - return statusTransitionDate; + return statusTransitionDate; } public void setStatusTransitionDate(Date taskTransitionDate) { - statusTransitionDate = taskTransitionDate; + statusTransitionDate = taskTransitionDate; } public Date getStateDueDate() { - return stateDueDate; + return stateDueDate; } public void setStateDueDate(Date stateDueDate) { @@ -1214,7 +1218,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public Date getStatusDueDate() { - return statusDueDate; + return statusDueDate; } public void setStatusDueDate(Date statusDueDate) { @@ -1223,40 +1227,40 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } - @Entity(name = "TaskStatus") + @Entity(name = "TaskStatus") @Table(name = "wf_task_status") public static class TaskStatus { @Id @GeneratedValue - private Long id; + private Long id; @Version - private Integer version; + private Integer version; @CreationTimestamp - private Date creationDate; + private Date creationDate; @UpdateTimestamp - private Date modifiedDate; + private Date modifiedDate; - private boolean active; + private boolean active; @Column(name = "order_index") private Integer orderIndex; - private String name; - private String displayName; + private String name; + private String displayName; public TaskStatus() { } public String getEntityName() { - return displayName; + return displayName; } public Long getId() { - return id; + return id; } public void setId(Long id) { @@ -1264,7 +1268,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public Integer getVersion() { - return version; + return version; } public void setVersion(Integer version) { @@ -1272,7 +1276,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public Date getCreationDate() { - return creationDate; + return creationDate; } public void setCreationDate(Date creationDate) { @@ -1280,7 +1284,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public Date getModifiedDate() { - return modifiedDate; + return modifiedDate; } public void setModifiedDate(Date modifiedDate) { @@ -1288,7 +1292,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public String getName() { - return name; + return name; } public void setName(String name) { @@ -1296,15 +1300,15 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { } public String getDisplayName() { - return displayName; + return displayName; } public void setDisplayName(String displayName) { - this.displayName = displayName; + this.displayName = displayName; } public boolean isActive() { - return active; + return active; } public void setActive(boolean active) { @@ -1313,7 +1317,7 @@ public class AnnotationMappingJoinClassTest extends BaseCoreFunctionalTestCase { @Override public String toString() { - return name; + return name; } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java index 4efe99bdc3..3ae183ff5e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12076/HbmMappingJoinClassTest.java @@ -41,17 +41,15 @@ public class HbmMappingJoinClassTest { TaskStatus taskStatus = new TaskStatus(); taskStatus.setName( "Enabled" ); taskStatus.setDisplayName( "Enabled" ); - session.save( taskStatus ); + session.persist( taskStatus ); for ( long i = 0; i < 10; i++ ) { SettlementTask settlementTask = new SettlementTask(); - settlementTask.setId( i ); Settlement settlement = new Settlement(); settlementTask.setLinked( settlement ); settlementTask.setStatus( taskStatus ); Claim claim = new Claim(); - claim.setId( i ); settlement.setClaim( claim ); for ( int j = 0; j < 2; j++ ) { @@ -63,9 +61,9 @@ public class HbmMappingJoinClassTest { settlement.getExtensions().add( gapAssessmentExtension ); settlement.getExtensions().add( ewtAssessmentExtension ); } - session.save( claim ); - session.save( settlement ); - session.save( settlementTask ); + session.persist( claim ); + session.persist( settlement ); + session.persist( settlementTask ); } } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java index d2ce69c813..b05bda7853 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hhh12225/HQLTypeTest.java @@ -61,10 +61,10 @@ public class HQLTypeTest { Vehicle vehicle2 = new Vehicle(); vehicle2.setContract( vehicleTrackContract ); - session.save( vehicle1 ); - session.save( vehicle2 ); - session.save( vehicleContract ); - session.save( vehicleTrackContract ); + session.persist( vehicle1 ); + session.persist( vehicle2 ); + session.persist( vehicleContract ); + session.persist( vehicleTrackContract ); if ( i == 0 ) { firstCotract = vehicleContract; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java index 8398292125..99260a84e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/DateQueryParameterTest.java @@ -40,7 +40,7 @@ public class DateQueryParameterTest { session -> { final DateEntity entity = new DateEntity(); entity.setTimestamp( new Date(timestamp2) ); - session.save( entity ); + session.persist( entity ); } ); @@ -48,7 +48,7 @@ public class DateQueryParameterTest { session -> { final DateEntity entity = new DateEntity(); entity.setTimestamp( new Date(timestamp4) ); - session.save( entity ); + session.persist( entity ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java index ce48886bc8..c87c7e79ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableAsParameterTest.java @@ -80,7 +80,7 @@ public class EmbeddableAsParameterTest { 33 ); - session.save( person ); + session.persist( person ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java index 60f52dda54..275d0351c6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EmbeddableWithPluralAttributeTest.java @@ -42,7 +42,7 @@ public class EmbeddableWithPluralAttributeTest { B b = B.buildB(); a.b = b; - session.save( a ); + session.persist( a ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java index 3ea47ac5a3..365379df74 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/EntityJoinTest.java @@ -287,11 +287,11 @@ public class EntityJoinTest { scope.inTransaction( (session) -> { final Customer customer = new Customer( 1, "Acme" ); - session.save( customer ); - session.save( new User( 1, "steve", customer ) ); - session.save( new User( 2, "jane" ) ); - session.save( new FinancialRecord( 1, customer, "steve" ) ); - session.save( new FinancialRecord( 2, customer, null ) ); + session.persist( customer ); + session.persist( new User( 1, "steve", customer ) ); + session.persist( new User( 2, "jane" ) ); + session.persist( new FinancialRecord( 1, customer, "steve" ) ); + session.persist( new FinancialRecord( 2, customer, null ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java index 51892f6e89..549ad4ec1a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/LegacyParameterTests.java @@ -71,7 +71,7 @@ public class LegacyParameterTests { Human human1 = new Human(); human1.setId( 2L ); human1.setNickName( null ); - s.save( human1 ); + s.persist( human1 ); parameters = new HashMap<>(); @@ -235,7 +235,7 @@ public class LegacyParameterTests { human.setId( 1L ); human.setNickName( "nick" ); human.setIntValue( 1 ); - s.save( human ); + s.persist( human ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java index 2ac90c333c..e7ab676260 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/NamedHqlQueriesTest.java @@ -61,8 +61,8 @@ public class NamedHqlQueriesTest { public void setUp(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( GOD_OF_WAR ); - session.save( THE_LAST_OF_US ); + session.persist( GOD_OF_WAR ); + session.persist( THE_LAST_OF_US ); } ); } @@ -71,7 +71,7 @@ public class NamedHqlQueriesTest { scope.inTransaction( session -> session.createQuery( "from VideoGame vg", VideoGame.class ) .list() - .forEach(session::delete) + .forEach(session::remove) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java index 1c7e015c7a..d7787cda38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/OrderByTests.java @@ -127,15 +127,15 @@ public class OrderByTests extends BaseCoreFunctionalTestCase { Session s = openSession(); Transaction t = s.beginTransaction(); - s.save( stateProvince ); - s.save( zoo1Mammal1 ); - s.save( zoo1Mammal2 ); - s.save( zoo1 ); - s.save( zoo2Director1 ); - s.save( zoo2Director2 ); - s.save( zoo2 ); - s.save( zoo3 ); - s.save( zoo4 ); + s.persist( stateProvince ); + s.persist( zoo1Mammal1 ); + s.persist( zoo1Mammal2 ); + s.persist( zoo1 ); + s.persist( zoo2Director1 ); + s.persist( zoo2Director2 ); + s.persist( zoo2 ); + s.persist( zoo3 ); + s.persist( zoo4 ); t.commit(); s.close(); @@ -151,39 +151,39 @@ public class OrderByTests extends BaseCoreFunctionalTestCase { Session s = openSession(); Transaction t = s.beginTransaction(); if ( zoo1 != null ) { - s.delete( zoo1 ); + s.remove( zoo1 ); zoo1 = null; } if ( zoo2 != null ) { - s.delete( zoo2 ); + s.remove( zoo2 ); zoo2 = null; } if ( zoo3 != null ) { - s.delete( zoo3 ); + s.remove( zoo3 ); zoo3 = null; } if ( zoo4 != null ) { - s.delete( zoo4 ); + s.remove( zoo4 ); zoo4 = null; } if ( zoo1Mammal1 != null ) { - s.delete( zoo1Mammal1 ); + s.remove( zoo1Mammal1 ); zoo1Mammal1 = null; } if ( zoo1Mammal2 != null ) { - s.delete( zoo1Mammal2 ); + s.remove( zoo1Mammal2 ); zoo1Mammal2 = null; } if ( zoo2Director1 != null ) { - s.delete( zoo2Director1 ); + s.remove( zoo2Director1 ); zoo2Director1 = null; } if ( zoo2Director2 != null ) { - s.delete( zoo2Director2 ); + s.remove( zoo2Director2 ); zoo2Director2 = null; } if ( stateProvince != null ) { - s.delete( stateProvince ); + s.remove( stateProvince ); } t.commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java index 00e681054c..ea60d51536 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ScrollableTest.java @@ -40,8 +40,8 @@ public class ScrollableTest extends BaseCoreFunctionalTestCase { try (Session session = openSession()) { session.getTransaction().begin(); try { - session.save( new MyEntity( 1L, "entity_1" ) ); - session.save( new MyEntity( 2L, "entity_2" ) ); + session.persist( new MyEntity( 1L, "entity_1" ) ); + session.persist( new MyEntity( 2L, "entity_2" ) ); session.getTransaction().commit(); } catch (Exception e) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java index 663f02151c..b9c259aef5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryLimitOffsetTest.java @@ -52,7 +52,7 @@ public class SubqueryLimitOffsetTest { Long.MAX_VALUE, "some" ); - session.save( entity ); + session.persist( entity ); SimpleEntity second_entity = new SimpleEntity( 2, @@ -62,7 +62,7 @@ public class SubqueryLimitOffsetTest { Long.MAX_VALUE, "some" ); - session.save( second_entity ); + session.persist( second_entity ); } ); } @@ -72,7 +72,7 @@ public class SubqueryLimitOffsetTest { scope.inTransaction( session -> session.createQuery( "from SimpleEntity e" ) .list() - .forEach( simpleEntity -> session.delete( simpleEntity ) ) + .forEach( simpleEntity -> session.remove( simpleEntity ) ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java index 7430655594..c590485690 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/SubqueryOperatorsTest.java @@ -111,7 +111,7 @@ public class SubqueryOperatorsTest { Long.MAX_VALUE, "aaa" ); - session.save( entity ); + session.persist( entity ); SimpleEntity second_entity = new SimpleEntity( 2, @@ -121,7 +121,7 @@ public class SubqueryOperatorsTest { Long.MAX_VALUE, "zzz" ); - session.save( second_entity ); + session.persist( second_entity ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java index 28efb0894f..c849232e70 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/TupleTest.java @@ -59,7 +59,7 @@ public class TupleTest { Long.MAX_VALUE, "aaa" ); - session.save( entity ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java index 89e01d0942..bb5f4d91e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntitiesWithPackageNamesStartingWithKeywordsTest.java @@ -36,7 +36,7 @@ public class UpdateEntitiesWithPackageNamesStartingWithKeywordsTest extends Base session.getTransaction().begin(); try { - session.save( entity ); + session.persist( entity ); session.getTransaction().commit(); } catch (Exception e) { @@ -85,7 +85,7 @@ public class UpdateEntitiesWithPackageNamesStartingWithKeywordsTest extends Base session.getTransaction().begin(); try { - session.save( entity ); + session.persist( entity ); session.getTransaction().commit(); } catch (Exception e) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java index cd313e5cbe..603dd0e56e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/mutation/UpdateEntityWithEmbeddedTest.java @@ -32,7 +32,7 @@ public class UpdateEntityWithEmbeddedTest { (session) -> { Logo logo = new Logo( "logo1", "png" ); Company company = new Company( 1l, logo ); - session.save( company ); + session.persist( company ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java index 69f116d16b..14fcdac6e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/nullPrecedence/AbstractNullPrecedenceTest.java @@ -30,14 +30,14 @@ abstract class AbstractNullPrecedenceTest { scope.inTransaction( session -> { ExampleEntity entity1 = new ExampleEntity( 1L ); entity1.setName( "name1" ); - session.save( entity1 ); + session.persist( entity1 ); ExampleEntity entity2 = new ExampleEntity( 2L ); - session.save( entity2 ); + session.persist( entity2 ); ExampleEntity entity3 = new ExampleEntity( 3L ); entity3.setName( "name3" ); - session.save( entity3 ); + session.persist( entity3 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java index 61af258a16..d521fcad72 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/set/SetOperationTest.java @@ -44,14 +44,14 @@ public class SetOperationTest { public void createTestData(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( new EntityOfLists( 1, "first" ) ); - session.save( new EntityOfLists( 2, "second" ) ); - session.save( new EntityOfLists( 3, "third" ) ); + session.persist( new EntityOfLists( 1, "first" ) ); + session.persist( new EntityOfLists( 2, "second" ) ); + session.persist( new EntityOfLists( 3, "third" ) ); EntityWithManyToOneSelfReference first = new EntityWithManyToOneSelfReference( 1, "first", 123 ); EntityWithManyToOneSelfReference second = new EntityWithManyToOneSelfReference( 2, "second", 123 ); - session.save( first ); + session.persist( first ); first.setOther( first ); - session.save( second ); + session.persist( second ); second.setOther( second ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java index c7d1bb7796..28bcf4eda6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/ManyToManySizeTest.java @@ -295,7 +295,7 @@ public class ManyToManySizeTest { scope.inTransaction( (session) -> { for ( Company company : session.createQuery( "from Company", Company.class ).list() ) { - session.delete( company ); + session.remove( company ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java index 6ee809437d..c737792d28 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/size/OneToManySizeTest.java @@ -254,7 +254,7 @@ public class OneToManySizeTest { scope.inTransaction( (session) -> { for ( Company company : session.createQuery( "from Company", Company.class ).list() ) { - session.delete( company ); + session.remove( company ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchTest.java index 14d2f53f52..c0fe788d27 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/joinfetch/JoinFetchTest.java @@ -227,7 +227,7 @@ public class JoinFetchTest { } ); - scope.inTransaction( (s) -> s.delete( group ) ); + scope.inTransaction( (s) -> s.remove( group ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java index 78df849ae4..909690c981 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java @@ -191,7 +191,7 @@ public class QueryResultCacheTests { @BeforeEach public void prepareTestData(SessionFactoryScope scope) { scope.inTransaction( - session -> session.save( + session -> session.persist( new AggregateEntity( 1, "aggregate", diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java index 8bf0777df8..878900fbca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/AbstractUsageTest.java @@ -22,7 +22,7 @@ public abstract class AbstractUsageTest { public void prepareData(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( new SimpleEntityWithNamedMappings( 1, "test", "notes" ) ); + session.persist( new SimpleEntityWithNamedMappings( 1, "test", "notes" ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java index c258171488..23e0707788 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java @@ -382,7 +382,7 @@ public class EntityResultTests extends AbstractUsageTest { entityOfBasics.setTheTimestamp( THEN_TIMESTAMP ); entityOfBasics.setTheInstant( THEN ); - session.save( entityOfBasics ); + session.persist( entityOfBasics ); // embedded values final EntityWithEmbedded entityWithEmbedded = new EntityWithEmbedded( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java index 7edf1bd079..611d12a8dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/InheritanceTests.java @@ -43,7 +43,7 @@ public class InheritanceTests { public void prepareData(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( new Child( 1L, "test", 123 ) ); + session.persist( new Child( 1L, "test", 123 ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java index 12180579fb..b090d4b894 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicCriteriaResultTests.java @@ -36,7 +36,7 @@ public class BasicCriteriaResultTests { @BeforeEach public void prepareTestData(SessionFactoryScope scope) { scope.inTransaction( (session) -> { - session.save( new SimpleEntity( 1, "first", new SimpleComposite( "a", "b" ) ) ); + session.persist( new SimpleEntity( 1, "first", new SimpleComposite( "a", "b" ) ) ); }); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java index 6bb15c797c..4857ecd1ca 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/results/BasicHqlResultTests.java @@ -27,7 +27,7 @@ public class BasicHqlResultTests { @BeforeEach public void prepareTestData(SessionFactoryScope scope) { scope.inTransaction( (session) -> { - session.save( new SimpleEntity( 1, "first", new SimpleComposite( "a", "b" ) ) ); + session.persist( new SimpleEntity( 1, "first", new SimpleComposite( "a", "b" ) ) ); }); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java index 64e031ad79..8ca755b3ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/DiscriminatorTests.java @@ -36,8 +36,8 @@ public class DiscriminatorTests extends BaseSessionFactoryFunctionalTest { public void setUpTestData() { inTransaction( session -> { - session.save( new ForeignVendor( 1, "ForeignVendor", "Vendor, Inc." ) ); - session.save( new DomesticVendor( 2, "DomesticVendor", "Vendor, Inc." ) ); + session.persist( new ForeignVendor( 1, "ForeignVendor", "Vendor, Inc." ) ); + session.persist( new DomesticVendor( 2, "DomesticVendor", "Vendor, Inc." ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java index 4fd2a42ac5..25b70559a3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryImplicitJoinReferenceTest.java @@ -47,7 +47,7 @@ public class SubQueryImplicitJoinReferenceTest { entity.setData( "Test" ); // Persist the entities - scope.inTransaction( session -> { session.save( revEntity ); session.save( entity ); } ); + scope.inTransaction( session -> { session.persist( revEntity ); session.persist( entity ); } ); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryTest.java index 455c4f329e..a247e2fa0d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sqm/exec/SubQueryTest.java @@ -68,9 +68,9 @@ public class SubQueryTest { BasicEntity entity1 = new BasicEntity( 1, "e1" ); BasicEntity entity2 = new BasicEntity( 2, "e2" ); BasicEntity entity3 = new BasicEntity( 3, "e1" ); - session.save( entity1 ); - session.save( entity2 ); - session.save( entity3 ); + session.persist( entity1 ); + session.persist( entity2 ); + session.persist( entity3 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java index eb13a4b084..875072065f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/AbstractQueryCacheResultTransformerTest.java @@ -149,7 +149,7 @@ public abstract class AbstractQueryCacheResultTransformerTest { courseMeetingExpected2 = new CourseMeeting( courseExpected, "Tuesday", 2, "1313 Mockingbird Lane" ); courseExpected.getCourseMeetings().add( courseMeetingExpected1 ); courseExpected.getCourseMeetings().add( courseMeetingExpected2 ); - s.save( courseExpected ); + s.persist( courseExpected ); yogiExpected = new Student(); yogiExpected.setName( new PersonName( "Yogi", "The", "Bear" ) ); @@ -158,7 +158,7 @@ public abstract class AbstractQueryCacheResultTransformerTest { List yogiSecretCodes = new ArrayList(); yogiSecretCodes.add( 0 ); yogiExpected.setSecretCodes( yogiSecretCodes ); - s.save( yogiExpected ); + s.persist( yogiExpected ); Address address1 = new Address( yogiExpected, @@ -180,8 +180,8 @@ public abstract class AbstractQueryCacheResultTransformerTest { ); yogiExpected.getAddresses().put( address1.getAddressType(), address1 ); yogiExpected.getAddresses().put( address2.getAddressType(), address2 ); - s.save( address1 ); - s.save( address2 ); + s.persist( address1 ); + s.persist( address2 ); shermanExpected = new Student(); shermanExpected.setName( new PersonName( "Sherman", null, "Grote" ) ); @@ -190,7 +190,7 @@ public abstract class AbstractQueryCacheResultTransformerTest { shermanSecretCodes.add( 1 ); shermanSecretCodes.add( 2 ); shermanExpected.setSecretCodes( shermanSecretCodes ); - s.save( shermanExpected ); + s.persist( shermanExpected ); shermanEnrolmentExpected = new Enrolment(); shermanEnrolmentExpected.setCourse( courseExpected ); @@ -200,7 +200,7 @@ public abstract class AbstractQueryCacheResultTransformerTest { shermanEnrolmentExpected.setStudent( shermanExpected ); shermanEnrolmentExpected.setStudentNumber( shermanExpected.getStudentNumber() ); shermanExpected.getEnrolments().add( shermanEnrolmentExpected ); - s.save( shermanEnrolmentExpected ); + s.persist( shermanEnrolmentExpected ); yogiEnrolmentExpected = new Enrolment(); yogiEnrolmentExpected.setCourse( courseExpected ); @@ -210,7 +210,7 @@ public abstract class AbstractQueryCacheResultTransformerTest { yogiEnrolmentExpected.setStudent( yogiExpected ); yogiEnrolmentExpected.setStudentNumber( yogiExpected.getStudentNumber() ); yogiExpected.getEnrolments().add( yogiEnrolmentExpected ); - s.save( yogiEnrolmentExpected ); + s.persist( yogiEnrolmentExpected ); } ); } @@ -218,13 +218,13 @@ public abstract class AbstractQueryCacheResultTransformerTest { protected void deleteData(SessionFactoryScope scope) { scope.inTransaction( s -> { - s.delete( yogiExpected ); - s.delete( shermanExpected ); - s.delete( yogiEnrolmentExpected ); - s.delete( shermanEnrolmentExpected ); - s.delete( courseMeetingExpected1 ); - s.delete( courseMeetingExpected2 ); - s.delete( courseExpected ); + s.remove( yogiExpected ); + s.remove( shermanExpected ); + s.remove( yogiEnrolmentExpected ); + s.remove( shermanEnrolmentExpected ); + s.remove( courseMeetingExpected1 ); + s.remove( courseMeetingExpected2 ); + s.remove( courseExpected ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java index 7b8f1c1667..9d5bfa4454 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/querycache/QueryCacheTest.java @@ -30,8 +30,8 @@ import org.hibernate.stat.spi.StatisticsImplementor; import org.hibernate.transform.Transformers; import org.hibernate.type.Type; -import org.hibernate.testing.TestForIssue; import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.orm.junit.ServiceRegistry; import org.hibernate.testing.orm.junit.SessionFactory; import org.hibernate.testing.orm.junit.SessionFactoryScope; @@ -92,7 +92,7 @@ public class QueryCacheTest { @Test - @TestForIssue(jiraKey = "HHH-5426") + @JiraKey("HHH-5426") public void testInvalidationFromBulkHQL(SessionFactoryScope scope) { scope.getSessionFactory().getCache().evictQueryRegions(); scope.getSessionFactory().getStatistics().clear(); @@ -132,7 +132,7 @@ public class QueryCacheTest { } @Test - @TestForIssue(jiraKey = "JBPAPP-4224") + @JiraKey("JBPAPP-4224") public void testHitCacheInSameSession(SessionFactoryScope scope) { scope.getSessionFactory().getCache().evictQueryRegions(); scope.getSessionFactory().getStatistics().clear(); @@ -180,7 +180,7 @@ public class QueryCacheTest { scope.inTransaction( session -> { for ( Object obj : list ) { - session.delete( obj ); + session.remove( obj ); } } ); @@ -206,7 +206,7 @@ public class QueryCacheTest { Item i = new Item(); i.setName( "widget" ); i.setDescription( "A really top-quality, full-featured widget." ); - session.save( i ); + session.persist( i ); } ); @@ -335,7 +335,7 @@ public class QueryCacheTest { session.createQuery( queryString ).setCacheable( true ).list(); Item i = session.get( Item.class, item.getId() ); - session.delete( i ); + session.remove( i ); } ); @@ -376,7 +376,7 @@ public class QueryCacheTest { session -> { item.setName( "widget" ); item.setDescription( "A really top-quality, full-featured widget." ); - session.save( item ); + session.persist( item ); } ); @@ -386,7 +386,7 @@ public class QueryCacheTest { assertEquals( 1, result.size() ); Item i = session.get( Item.class, item.getId() ); assertEquals( "widget", i.getName() ); - session.delete( i ); + session.remove( i ); } ); } @@ -405,7 +405,7 @@ public class QueryCacheTest { session.createQuery( queryString ).setCacheable( true ).list(); item.setName( "widget" ); item.setDescription( "A really top-quality, full-featured widget." ); - session.save( item ); + session.persist( item ); } ); @@ -513,7 +513,7 @@ public class QueryCacheTest { assertEquals( 3, qs.getCacheMissCount() ); assertEquals( 3, qs.getCachePutCount() ); - session.delete( i ); + session.remove( i ); } ); @@ -525,7 +525,7 @@ public class QueryCacheTest { } @Test - @TestForIssue(jiraKey = "HHH-4459") + @JiraKey("HHH-4459") public void testGetByCompositeId(SessionFactoryScope scope) { scope.inSession( @@ -578,7 +578,7 @@ public class QueryCacheTest { } @Test - @TestForIssue(jiraKey = "HHH-3051") + @JiraKey("HHH-3051") public void testScalarSQLQuery(SessionFactoryScope scope) { scope.getSessionFactory().getCache().evictQueryRegions(); scope.getSessionFactory().getStatistics().clear(); @@ -634,7 +634,7 @@ public class QueryCacheTest { // } @Test - @TestForIssue(jiraKey = "HHH-9962") + @JiraKey("HHH-9962") /* Test courtesy of Giambattista Bloisi */ public void testDelayedLoad(SessionFactoryScope scope) throws InterruptedException, ExecutionException { DelayLoadOperations interceptor = new DelayLoadOperations(); @@ -731,6 +731,17 @@ public class QueryCacheTest { @Override public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { + onLoad(); + return true; + } + + @Override + public boolean onLoad(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types){ + onLoad(); + return true; + } + + private void onLoad() { // Synchronize load and update activities try { if ( waitLatch != null ) { @@ -744,9 +755,10 @@ public class QueryCacheTest { Thread.currentThread().interrupt(); throw new RuntimeException( e ); } - return true; } + + public void blockOnLoad() { blockLatch = new CountDownLatch( 1 ); waitLatch = new CountDownLatch( 1 ); 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 fdd3588a6b..c5a3eb23b0 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 @@ -85,7 +85,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -132,7 +132,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -219,7 +219,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -309,7 +309,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -348,7 +348,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -387,7 +387,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( "changed", dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -436,7 +436,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -483,7 +483,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -528,7 +528,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( "changed", dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -573,7 +573,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( "changed", dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -616,7 +616,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -658,7 +658,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( "changed", dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -701,7 +701,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -743,7 +743,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( "changed", dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -803,7 +803,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { scope.inTransaction( session -> { DataPoint dp = session.get( DataPoint.class, dpOrig.getId() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -863,13 +863,13 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { scope.inTransaction( session -> { DataPoint dp = session.get( DataPoint.class, dpOrig.getId() ); - session.delete( dp ); + session.remove( dp ); } ); } @Test - public void testReadOnlyChangedEvictedUpdate(SessionFactoryScope scope) { + public void testReadOnlyChangedEvictedMerge(SessionFactoryScope scope) { DataPoint dpOrig = createDataPoint( CacheMode.IGNORE, scope ); scope.inSession( @@ -888,9 +888,9 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( "changed", dp.getDescription() ); session.evict( dp ); assertFalse( session.contains( dp ) ); - session.update( dp ); - checkReadOnly( session, dp, false ); - assertEquals( "changed", dp.getDescription() ); + DataPoint merged = session.merge( dp ); + assertEquals( false, session.isReadOnly( merged )); + assertEquals( "changed", merged.getDescription() ); session.flush(); session.getTransaction().commit(); } @@ -910,7 +910,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getId(), dp.getId() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -953,7 +953,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( "changed", dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -999,13 +999,13 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( "changed", dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @Test - public void testReadOnlyModifiedUpdate(SessionFactoryScope scope) { + public void testReadOnlyModifiedMerge(SessionFactoryScope scope) { DataPoint dpOrig = createDataPoint( CacheMode.IGNORE, scope ); scope.inSession( @@ -1023,7 +1023,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertTrue( Hibernate.isInitialized( dp ) ); assertEquals( "changed", dp.getDescription() ); checkReadOnly( session, dp, true ); - session.update( dp ); + session.merge( dp ); session.flush(); session.getTransaction().commit(); } @@ -1042,7 +1042,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - session.delete( dp ); + session.remove( dp ); } ); } @@ -1062,7 +1062,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { session.setReadOnly( dp, true ); checkReadOnly( session, dp, true ); assertFalse( Hibernate.isInitialized( dp ) ); - session.delete( dp ); + session.remove( dp ); session.flush(); session.getTransaction().commit(); } @@ -1091,7 +1091,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { dp.setDescription( "original" ); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -1121,7 +1121,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { t = s.beginTransaction(); dp = s.get( DataPoint.class, dp.getId() ); assertEquals( "original", dp.getDescription() ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -1135,7 +1135,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { dp.setDescription( "original" ); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -1151,7 +1151,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); dp = s.get( DataPoint.class, dp.getId() ); - s.delete( dp ); + s.remove( dp ); s.flush(); try { s.refresh( dp ); @@ -1171,7 +1171,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { DataPoint dpProxyInit = s.load( DataPoint.class, dp.getId() ); assertEquals( "original", dp.getDescription() ); assertEquals( "original", dpProxyInit.getDescription() ); - s.delete( dpProxyInit ); + s.remove( dpProxyInit ); t.commit(); s.close(); @@ -1218,7 +1218,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { dp.setDescription( "original" ); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -1248,7 +1248,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { t = s.beginTransaction(); dp = s.get( DataPoint.class, dp.getId() ); assertEquals( "original", dp.getDescription() ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -1297,7 +1297,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1347,7 +1347,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1397,7 +1397,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1448,7 +1448,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1495,7 +1495,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1539,7 +1539,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( dpOrig.getDescription(), dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1583,7 +1583,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( "changed", dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1633,7 +1633,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertEquals( "changed again", dp.getDescription() ); assertEquals( dpOrig.getX(), dp.getX() ); assertEquals( dpOrig.getY(), dp.getY() ); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1664,7 +1664,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { finally { s = openSession( scope ); s.beginTransaction(); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1698,7 +1698,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { finally { s = openSession( scope ); s.beginTransaction(); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1730,7 +1730,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertFalse( ( (HibernateProxy) dp ).getHibernateLazyInitializer().isReadOnlySettingAvailable() ); } finally { - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1760,7 +1760,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertFalse( ( (HibernateProxy) dp ).getHibernateLazyInitializer().isReadOnlySettingAvailable() ); } finally { - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1792,7 +1792,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { finally { s = openSession( scope ); s.beginTransaction(); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1826,7 +1826,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { finally { s = openSession( scope ); s.beginTransaction(); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1861,7 +1861,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { finally { s = openSession( scope ); s.beginTransaction(); - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1893,7 +1893,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertFalse( ( (HibernateProxy) dp ).getHibernateLazyInitializer().isReadOnlySettingAvailable() ); } finally { - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1923,7 +1923,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { assertFalse( ( (HibernateProxy) dp ).getHibernateLazyInitializer().isReadOnlySettingAvailable() ); } finally { - s.delete( dp ); + s.remove( dp ); s.getTransaction().commit(); s.close(); } @@ -1941,7 +1941,7 @@ public class ReadOnlyProxyTest extends AbstractReadOnlyTest { dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setDescription( "original" ); - s.save( dp ); + s.persist( dp ); s.getTransaction().commit(); s.close(); return dp; 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 8ec535e009..012bfd2387 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 @@ -78,7 +78,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Session s = openSession(scope); assertFalse( s.isDefaultReadOnly() ); Transaction t = s.beginTransaction(); - s.save( cOrig ); + s.persist( cOrig ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); @@ -175,7 +175,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Session s = openSession(scope); assertFalse( s.isDefaultReadOnly() ); Transaction t = s.beginTransaction(); - s.save( cOrig ); + s.persist( cOrig ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); @@ -265,7 +265,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Session s = openSession(scope); assertFalse( s.isDefaultReadOnly() ); Transaction t = s.beginTransaction(); - s.save( cOrig ); + s.persist( cOrig ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); @@ -356,7 +356,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Session s = openSession(scope); assertFalse( s.isDefaultReadOnly() ); Transaction t = s.beginTransaction(); - s.save( cOrig ); + s.persist( cOrig ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); @@ -450,7 +450,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Session s = openSession(scope); assertFalse( s.isDefaultReadOnly() ); Transaction t = s.beginTransaction(); - s.save( cOrig ); + s.persist( cOrig ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); @@ -541,7 +541,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Session s = openSession(scope); assertFalse( s.isDefaultReadOnly() ); Transaction t = s.beginTransaction(); - s.save( cOrig ); + s.persist( cOrig ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); @@ -634,7 +634,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Session s = openSession(scope); assertFalse( s.isDefaultReadOnly() ); Transaction t = s.beginTransaction(); - s.save( cOrig ); + s.persist( cOrig ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); @@ -721,7 +721,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Session s = openSession(scope); assertFalse( s.isDefaultReadOnly() ); Transaction t = s.beginTransaction(); - s.save( cOrig ); + s.persist( cOrig ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); @@ -796,7 +796,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Session s = openSession(scope); assertFalse( s.isDefaultReadOnly() ); Transaction t = s.beginTransaction(); - s.save( cOrig ); + s.persist( cOrig ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); @@ -884,7 +884,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Session s = openSession(scope); assertFalse( s.isDefaultReadOnly() ); Transaction t = s.beginTransaction(); - s.save( cOrig ); + s.persist( cOrig ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); @@ -958,7 +958,7 @@ public class ReadOnlySessionLazyNonLazyTest extends AbstractReadOnlyTest { Session s = openSession(scope); assertFalse( s.isDefaultReadOnly() ); Transaction t = s.beginTransaction(); - s.save( cOrig ); + s.persist( cOrig ); checkContainer( cOrig, expectedInitializedObjects, expectedReadOnlyObjects, s ); s.setDefaultReadOnly( true ); assertTrue( s.isDefaultReadOnly() ); 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 e46e1d5381..f7c7472e21 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 @@ -59,7 +59,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setDescription( "original" ); - s.save( dp ); + s.persist( dp ); long dpId = dp.getId(); s.getTransaction().commit(); s.close(); @@ -99,7 +99,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); } t.commit(); s.close(); @@ -139,7 +139,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); } t.commit(); s.close(); @@ -179,7 +179,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); } t.commit(); s.close(); @@ -219,7 +219,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); } t.commit(); s.close(); @@ -261,7 +261,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { dp = new DataPoint(); dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); } t.commit(); s.close(); @@ -338,7 +338,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { dp = new DataPoint(); dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); } t.commit(); s.close(); @@ -413,7 +413,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { dp.setDescription( "original" ); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -441,9 +441,9 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.clear(); t = s.beginTransaction(); - dp = (DataPoint) s.get( DataPoint.class, dp.getId() ); + dp = s.get( DataPoint.class, dp.getId() ); assertEquals( "original", dp.getDescription() ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -457,7 +457,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { dp.setDescription( "original" ); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -488,9 +488,9 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.clear(); t = s.beginTransaction(); - dp = (DataPoint) s.get( DataPoint.class, dp.getId() ); + dp = s.get( DataPoint.class, dp.getId() ); assertEquals( "original", dp.getDescription() ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -504,7 +504,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { dp.setDescription( "original" ); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -544,9 +544,9 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.clear(); t = s.beginTransaction(); - dp = (DataPoint) s.get( DataPoint.class, dp.getId() ); + dp = s.get( DataPoint.class, dp.getId() ); assertEquals( "original", dp.getDescription() ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); @@ -561,7 +561,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { dp.setDescription( "original" ); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -604,9 +604,9 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.clear(); t = s.beginTransaction(); - dp = (DataPoint) s.get( DataPoint.class, dp.getId() ); + dp = s.get( DataPoint.class, dp.getId() ); assertEquals( "original", dp.getDescription() ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); } @@ -619,7 +619,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -627,10 +627,10 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.setDefaultReadOnly( true ); s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); - dp = (DataPoint) s.get( DataPoint.class, dp.getId() ); + dp = s.get( DataPoint.class, dp.getId() ); s.setDefaultReadOnly( false ); assertTrue( s.isReadOnly( dp ) ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); @@ -651,7 +651,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -659,10 +659,10 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.setDefaultReadOnly( true ); s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); - dp = (DataPoint) s.get( DataPoint.class, dp.getId() ); + dp = s.get( DataPoint.class, dp.getId() ); s.setDefaultReadOnly( true ); dp.setDescription( "a DataPoint" ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); @@ -684,7 +684,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { dp = new DataPoint(); dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); } t.commit(); s.close(); @@ -736,7 +736,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { dp = new DataPoint(); dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); } t.commit(); s.close(); @@ -745,7 +745,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); s.setDefaultReadOnly( true ); - DataPoint dpLast = (DataPoint) s.get( DataPoint.class, dp.getId() ); + DataPoint dpLast = s.get( DataPoint.class, dp.getId() ); assertTrue( s.isReadOnly( dpLast ) ); int i = 0; int nExpectedChanges = 0; @@ -787,7 +787,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.beginTransaction(); s.setCacheMode( CacheMode.IGNORE ); TextHolder holder = new TextHolder( origText ); - s.save( holder ); + s.persist( holder ); Long id = holder.getId(); s.getTransaction().commit(); s.close(); @@ -796,7 +796,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.beginTransaction(); s.setDefaultReadOnly( true ); s.setCacheMode( CacheMode.IGNORE ); - holder = (TextHolder) s.get( TextHolder.class, id ); + holder = s.get( TextHolder.class, id ); s.setDefaultReadOnly( false ); holder.setTheText( newText ); s.flush(); @@ -805,9 +805,9 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s = openSession( scope ); s.beginTransaction(); - holder = (TextHolder) s.get( TextHolder.class, id ); + holder = s.get( TextHolder.class, id ); assertEquals( origText, holder.getTheText() , "change written to database"); - s.delete( holder ); + s.remove( holder ); s.getTransaction().commit(); s.close(); } @@ -820,7 +820,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -830,17 +830,17 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); s.setDefaultReadOnly( true ); - DataPoint dpManaged = (DataPoint) s.get( DataPoint.class, new Long( dp.getId() ) ); - DataPoint dpMerged = (DataPoint) s.merge( dp ); + DataPoint dpManaged = s.get( DataPoint.class, new Long( dp.getId() ) ); + DataPoint dpMerged = s.merge( dp ); assertSame( dpManaged, dpMerged ); t.commit(); s.close(); s = openSession( scope ); t = s.beginTransaction(); - dpManaged = (DataPoint) s.get( DataPoint.class, new Long( dp.getId() ) ); + dpManaged = s.get( DataPoint.class, new Long( dp.getId() ) ); assertNull( dpManaged.getDescription() ); - s.delete( dpManaged ); + s.remove( dpManaged ); t.commit(); s.close(); @@ -854,7 +854,7 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -864,24 +864,24 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s.setCacheMode( CacheMode.IGNORE ); t = s.beginTransaction(); s.setDefaultReadOnly( true ); - DataPoint dpProxy = (DataPoint) s.load( DataPoint.class, new Long( dp.getId() ) ); + DataPoint dpProxy = s.load( DataPoint.class, new Long( dp.getId() ) ); assertTrue( s.isReadOnly( dpProxy ) ); assertFalse( Hibernate.isInitialized( dpProxy ) ); s.evict( dpProxy ); - dpProxy = (DataPoint) s.merge( dpProxy ); + dpProxy = s.merge( dpProxy ); assertTrue( s.isReadOnly( dpProxy ) ); assertFalse( Hibernate.isInitialized( dpProxy ) ); - dpProxy = (DataPoint) s.merge( dp ); + dpProxy = s.merge( dp ); assertTrue( s.isReadOnly( dpProxy ) ); assertTrue( Hibernate.isInitialized( dpProxy ) ); assertEquals( "description", dpProxy.getDescription() ); s.evict( dpProxy ); - dpProxy = (DataPoint) s.merge( dpProxy ); + dpProxy = s.merge( dpProxy ); assertTrue( s.isReadOnly( dpProxy ) ); assertTrue( Hibernate.isInitialized( dpProxy ) ); assertEquals( "description", dpProxy.getDescription() ); dpProxy.setDescription( null ); - dpProxy = (DataPoint) s.merge( dp ); + dpProxy = s.merge( dp ); assertTrue( s.isReadOnly( dpProxy ) ); assertTrue( Hibernate.isInitialized( dpProxy ) ); assertEquals( "description", dpProxy.getDescription() ); @@ -890,9 +890,9 @@ public class ReadOnlySessionTest extends AbstractReadOnlyTest { s = openSession( scope ); t = s.beginTransaction(); - dp = (DataPoint) s.get( DataPoint.class, new Long( dp.getId() ) ); + dp = s.get( DataPoint.class, new Long( dp.getId() ) ); assertNull( dp.getDescription() ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); 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 26961e2d48..4efe8c5fdc 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 @@ -50,7 +50,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { BigDecimal.ROUND_DOWN ) ); dp.setDescription( "original" ); - session.save( dp ); + session.persist( dp ); return dp.getId(); } ); @@ -101,7 +101,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { 19, BigDecimal.ROUND_DOWN ) ); - session.save( dp ); + session.persist( dp ); } } ); @@ -167,7 +167,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { 19, BigDecimal.ROUND_DOWN ) ); - session.save( dp ); + session.persist( dp ); } assertInsertCount( 0, scope ); @@ -184,7 +184,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { while ( sr.next() ) { DataPoint dp = (DataPoint) sr.get(); assertFalse( session.isReadOnly( dp ) ); - session.delete( dp ); + session.remove( dp ); } } } @@ -207,7 +207,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { 19, BigDecimal.ROUND_DOWN ) ); - session.save( d ); + session.persist( d ); session.setReadOnly( d, true ); d.setDescription( "different" ); } @@ -239,7 +239,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { session.beginTransaction(); dp = session.get( DataPoint.class, dp.getId() ); assertEquals( "original", dp.getDescription() ); - session.delete( dp ); + session.remove( dp ); session.getTransaction().commit(); } finally { @@ -268,7 +268,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { 19, BigDecimal.ROUND_DOWN ) ); - session.save( d ); + session.persist( d ); } ); @@ -299,7 +299,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { session.beginTransaction(); dp = session.get( DataPoint.class, dp.getId() ); assertEquals( "original", dp.getDescription() ); - session.delete( dp ); + session.remove( dp ); session.getTransaction().commit(); } finally { @@ -325,7 +325,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { dp.setDescription( "original" ); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -356,7 +356,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { t = s.beginTransaction(); dp = (DataPoint) s.get( DataPoint.class, dp.getId() ); assertEquals( "original", dp.getDescription() ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); @@ -373,7 +373,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -383,9 +383,9 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { s = openSession( scope ); t = s.beginTransaction(); - dp = (DataPoint) s.get( DataPoint.class, dp.getId() ); + dp = s.get( DataPoint.class, dp.getId() ); s.setReadOnly( dp, true ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); @@ -410,7 +410,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -420,10 +420,10 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { s = openSession( scope ); t = s.beginTransaction(); - dp = (DataPoint) s.get( DataPoint.class, dp.getId() ); + dp = s.get( DataPoint.class, dp.getId() ); s.setReadOnly( dp, true ); dp.setDescription( "a DataPoint" ); - s.delete( dp ); + s.remove( dp ); t.commit(); s.close(); @@ -450,7 +450,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { dp = new DataPoint(); dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); } t.commit(); s.close(); @@ -512,7 +512,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { dp = new DataPoint(); dp.setX( new BigDecimal( i * 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); } t.commit(); s.close(); @@ -578,7 +578,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { Session s = openSession( scope ); s.beginTransaction(); TextHolder holder = new TextHolder( origText ); - s.save( holder ); + s.persist( holder ); Long id = holder.getId(); s.getTransaction().commit(); s.close(); @@ -589,7 +589,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { s = openSession( scope ); s.beginTransaction(); - holder = (TextHolder) s.get( TextHolder.class, id ); + holder = s.get( TextHolder.class, id ); s.setReadOnly( holder, true ); holder.setTheText( newText ); s.flush(); @@ -600,9 +600,9 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { s = openSession( scope ); s.beginTransaction(); - holder = (TextHolder) s.get( TextHolder.class, id ); + holder = s.get( TextHolder.class, id ); assertEquals( origText, holder.getTheText(), "change written to database" ); - s.delete( holder ); + s.remove( holder ); s.getTransaction().commit(); s.close(); @@ -619,7 +619,7 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { DataPoint dp = new DataPoint(); dp.setX( new BigDecimal( 0.1d ).setScale( 19, BigDecimal.ROUND_DOWN ) ); dp.setY( new BigDecimal( Math.cos( dp.getX().doubleValue() ) ).setScale( 19, BigDecimal.ROUND_DOWN ) ); - s.save( dp ); + s.persist( dp ); t.commit(); s.close(); @@ -631,9 +631,9 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { s = openSession( scope ); t = s.beginTransaction(); - DataPoint dpManaged = (DataPoint) s.get( DataPoint.class, new Long( dp.getId() ) ); + DataPoint dpManaged = s.get( DataPoint.class, new Long( dp.getId() ) ); s.setReadOnly( dpManaged, true ); - DataPoint dpMerged = (DataPoint) s.merge( dp ); + DataPoint dpMerged = s.merge( dp ); assertSame( dpManaged, dpMerged ); t.commit(); s.close(); @@ -642,9 +642,9 @@ public class ReadOnlyTest extends AbstractReadOnlyTest { s = openSession( scope ); t = s.beginTransaction(); - dpManaged = (DataPoint) s.get( DataPoint.class, new Long( dp.getId() ) ); + dpManaged = s.get( DataPoint.class, new Long( dp.getId() ) ); assertNull( dpManaged.getDescription() ); - s.delete( dpManaged ); + s.remove( dpManaged ); t.commit(); s.close(); 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 5951eb164b..4c3d8e5744 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 @@ -30,7 +30,7 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { scope.inTransaction( session -> { session.createQuery( "select v from VersionedNode v" ).list() - .forEach( node -> session.delete( node ) ); + .forEach( node -> session.remove( node ) ); } ); } @@ -104,7 +104,7 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { assertEquals( "diff-node-name", node.getName() ); assertEquals( 1, node.getVersion() ); session.setReadOnly( node, true ); - session.delete( node ); + session.remove( node ); } ); @@ -136,7 +136,7 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { assertEquals( "node", node.getName() ); assertEquals( 0, node.getVersion() ); session.setReadOnly( node, true ); - session.delete( node ); + session.remove( node ); } ); @@ -168,7 +168,7 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { assertEquals( "node-name", node.getName() ); assertEquals( 1, node.getVersion() ); session.setReadOnly( node, true ); - session.delete( node ); + session.remove( node ); } ); @@ -220,7 +220,7 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { VersionedNode node = session.get( VersionedNode.class, n.getId() ); assertEquals( "node-name", node.getName() ); assertEquals( 1, node.getVersion() ); - session.delete( node ); + session.remove( node ); } ); } @@ -249,7 +249,7 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { VersionedNode node = session.get( VersionedNode.class, n.getId() ); assertEquals( "node-name", node.getName() ); assertEquals( 1, node.getVersion() ); - session.delete( node ); + session.remove( node ); } ); } @@ -282,7 +282,7 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { assertEquals( 1, parent.getVersion() ); VersionedNode child = session.get( VersionedNode.class, c.getId() ); assertNotNull( child ); - session.delete( parent ); + session.remove( parent ); } ); } @@ -299,8 +299,8 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { scope.inTransaction( session -> { - session.update( p ); - session.setReadOnly( p, true ); + VersionedNode v = session.merge( p ); + session.setReadOnly( v, true ); } ); @@ -320,8 +320,8 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { assertEquals( 0, child.getVersion() ); session.setReadOnly( parent, true ); session.setReadOnly( child, true ); - session.delete( parent ); - session.delete( child ); + session.remove( parent ); + session.remove( child ); } ); @@ -362,8 +362,8 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { assertEquals( 0, child.getVersion() ); session.setReadOnly( parent, true ); session.setReadOnly( child, true ); - session.delete( parent ); - session.delete( child ); + session.remove( parent ); + session.remove( child ); } ); @@ -404,8 +404,8 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { assertSame( parent, child.getParent() ); assertSame( child, parent.getChildren().iterator().next() ); assertEquals( 0, child.getVersion() ); - session.delete( parent ); - session.delete( child ); + session.remove( parent ); + session.remove( child ); } ); @@ -467,8 +467,8 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { assertSame( parent_, child.getParent() ); assertSame( child, parent_.getChildren().iterator().next() ); assertEquals( 0, child.getVersion() ); - session.delete( parent_ ); - session.delete( child ); + session.remove( parent_ ); + session.remove( child ); } ); @@ -504,7 +504,7 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { VersionedNode parent = session.get( VersionedNode.class, p.getId() ); assertNotNull( parent ); session.setReadOnly( child, true ); - session.delete( child ); + session.remove( child ); } ); @@ -525,12 +525,12 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { scope.inTransaction( session -> { - session.update( c ); - session.setReadOnly( c, true ); + VersionedNode merged = session.merge( c ); + session.setReadOnly( merged, true ); } ); - assertUpdateCount( 0, scope ); + assertUpdateCount( 1, scope ); assertInsertCount( 1, scope ); clearCounts( scope ); @@ -543,11 +543,11 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { assertEquals( 0, child.getVersion() ); assertNotNull( parent ); assertEquals( 0, parent.getChildren().size() ); - assertEquals( 0, parent.getVersion() ); + assertEquals( 1, parent.getVersion() ); session.setReadOnly( parent, true ); session.setReadOnly( child, true ); - session.delete( parent ); - session.delete( child ); + session.remove( parent ); + session.remove( child ); } ); @@ -588,8 +588,8 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { assertEquals( 1, parent.getVersion() ); // hmmm, why was version updated? session.setReadOnly( parent, true ); session.setReadOnly( child, true ); - session.delete( parent ); - session.delete( child ); + session.remove( parent ); + session.remove( child ); } ); @@ -632,8 +632,8 @@ public class ReadOnlyVersionedNodesTest extends AbstractReadOnlyTest { assertEquals( 1, parent.getVersion() ); // / hmmm, why was version updated? session.setReadOnly( parent, true ); session.setReadOnly( child, true ); - session.delete( parent ); - session.delete( child ); + session.remove( parent ); + session.remove( child ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java index 97b4d30d95..9c673173e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/reattachment/CollectionReattachmentTest.java @@ -40,7 +40,7 @@ public class CollectionReattachmentTest { session -> { Parent p = new Parent( "p" ); p.getChildren().add( new Child( "c" ) ); - session.save( p ); + session.persist( p ); } ); @@ -50,14 +50,13 @@ public class CollectionReattachmentTest { // clear... session.clear(); // now try to reattach... - session.update( p ); - return p; + return session.merge( p ); } ); scope.inTransaction( session -> - session.delete( parent ) + session.remove( parent ) ); } @@ -67,7 +66,7 @@ public class CollectionReattachmentTest { session -> { Parent p = new Parent( "p" ); p.getChildren().add( new Child( "c" ) ); - session.save( p ); + session.persist( p ); } ); @@ -77,14 +76,13 @@ public class CollectionReattachmentTest { // evict... session.evict( p ); // now try to reattach... - session.update( p ); - return p; + return session.merge( p ); } ); scope.inTransaction( session -> - session.delete( parent ) + session.remove( 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 13777a6485..d6f6ec07a9 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 @@ -39,7 +39,7 @@ public class ProxyReattachmentTest { scope.inTransaction( session -> { Parent p = new Parent( "p" ); - session.save( p ); + session.persist( p ); } ); @@ -49,14 +49,13 @@ public class ProxyReattachmentTest { // evict... session.evict( p ); // now try to reattach... - session.update( p ); - return p; + return session.merge( p ); } ); scope.inTransaction( session -> - session.delete( parent ) + session.remove( parent ) ); } @@ -65,7 +64,7 @@ public class ProxyReattachmentTest { scope.inTransaction( session -> { Parent p = new Parent( "p" ); - session.save( p ); + session.persist( p ); } ); @@ -75,14 +74,13 @@ public class ProxyReattachmentTest { // clear... session.clear(); // now try to reattach... - session.update( p ); - return p; + return session.merge( p ); } ); scope.inTransaction( session -> - session.delete( parent ) + session.remove( parent ) ); } @@ -100,7 +98,7 @@ public class ProxyReattachmentTest { scope.inTransaction( session -> { Parent parent = session.load( Parent.class, p.getName() ); - session.delete( parent ); + session.remove( parent ); // re-attach session.persist( parent ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java index 9328db6313..4e43f6617d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsAllowedTest.java @@ -32,7 +32,7 @@ public class RefreshDetachedInstanceWhenIsAllowedTest { testEntity = new TestEntity(); scope.inTransaction( session -> - session.save( testEntity ) + session.persist( testEntity ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java index cc341028b3..f8235a25e6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshDetachedInstanceWhenIsNotAllowedTest.java @@ -37,7 +37,7 @@ public class RefreshDetachedInstanceWhenIsNotAllowedTest { testEntity = new TestEntity(); scope.inTransaction( session -> - session.save( testEntity ) + session.persist( testEntity ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshUsingEntityNameTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshUsingEntityNameTest.java index bab068d825..74c1c14e38 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshUsingEntityNameTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/refresh/RefreshUsingEntityNameTest.java @@ -30,7 +30,7 @@ public class RefreshUsingEntityNameTest { customer = new Customer(); scope.inTransaction( session -> - session.save( "CustomName", customer ) + session.persist( "CustomName", customer ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java index ffb17bd757..bbec307641 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/resource/transaction/jta/NonJpaComplianceAlreadyStartedTransactionTest.java @@ -7,26 +7,28 @@ package org.hibernate.orm.test.resource.transaction.jta; import java.util.Map; + +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.cfg.AvailableSettings; + +import org.hibernate.testing.jta.TestingJtaBootstrap; +import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; +import org.hibernate.testing.orm.junit.JiraKey; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.transaction.Status; import jakarta.transaction.TransactionManager; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.cfg.AvailableSettings; - -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.jta.TestingJtaBootstrap; -import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.junit.Before; -import org.junit.Test; - /** * @author Andrea Boriero */ -@TestForIssue(jiraKey = "HHH-13076") +@JiraKey("HHH-13076") public class NonJpaComplianceAlreadyStartedTransactionTest extends BaseNonConfigCoreFunctionalTestCase { private TransactionManager tm; @@ -53,7 +55,7 @@ public class NonJpaComplianceAlreadyStartedTransactionTest extends BaseNonConfig try (Session s = openSession()) { Transaction tx = s.beginTransaction(); try { - s.saveOrUpdate( new TestEntity( "ABC" ) ); + s.persist( new TestEntity( "ABC" ) ); tx.commit(); } catch (Exception e) { @@ -83,6 +85,9 @@ public class NonJpaComplianceAlreadyStartedTransactionTest extends BaseNonConfig private String stringAttribute; + public TestEntity() { + } + public TestEntity(String stringAttribute) { this.stringAttribute = stringAttribute; } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java index 01c1c796fb..dc43181ce7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/serialization/EntityProxySerializationTest.java @@ -77,9 +77,9 @@ public class EntityProxySerializationTest { c2.setId( 2L ); c2.setParent( entity ); - s.save( entity ); - s.save( c1 ); - s.save( c2 ); + s.persist( entity ); + s.persist( c1 ); + s.persist( c2 ); } ); } 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 8fbd214a6c..77ddfef4dc 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 @@ -59,8 +59,8 @@ public class MapProxySerializationTest { c1.put( "id", 1L ); c1.put( "parent", entity ); - s.save( "SimpleEntity", entity ); - s.save( "ChildEntity", c1 ); + s.persist( "SimpleEntity", entity ); + s.persist( "ChildEntity", c1 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java index 6d6219bfd1..272b62f5fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/session/AssociateEntityWithTwoSessionsTest.java @@ -12,6 +12,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; +import org.hibernate.LockMode; import org.hibernate.Session; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.proxy.AbstractLazyInitializer; @@ -67,7 +68,7 @@ public class AssociateEntityWithTwoSessionsTest { try { scope.inTransaction( _entityManager -> { - _entityManager.unwrap( Session.class ).update( location1 ); + _entityManager.unwrap( Session.class ).lock( location1, LockMode.NONE ); } ); fail("Should have thrown a HibernateException"); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java index 5ca734acdd..43d8ac1cc7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/set/SetOperationJpaCriteriaTest.java @@ -40,9 +40,9 @@ public class SetOperationJpaCriteriaTest { public void createTestData(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( new EntityOfLists( 1, "first" ) ); - session.save( new EntityOfLists( 2, "second" ) ); - session.save( new EntityOfLists( 3, "third" ) ); + session.persist( new EntityOfLists( 1, "first" ) ); + session.persist( new EntityOfLists( 2, "second" ) ); + session.persist( new EntityOfLists( 3, "third" ) ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java index 869bcdc6e4..b0bdab8d91 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sharedSession/SessionWithSharedConnectionTest.java @@ -169,7 +169,9 @@ public class SessionWithSharedConnectionTest { // assertTrue( ((SessionImplementor) secondSession).isFlushBeforeCompletionEnabled() ); // now try it out - Integer id = (Integer) secondSession.save( new IrrelevantEntity() ); + IrrelevantEntity irrelevantEntity = new IrrelevantEntity(); + secondSession.persist( irrelevantEntity ); + Integer id = irrelevantEntity.getId(); session.getTransaction().commit(); assertFalse( ((SessionImplementor) session).isClosed() ); assertTrue( ((SessionImplementor) secondSession).isClosed() ); @@ -182,7 +184,7 @@ public class SessionWithSharedConnectionTest { session.getTransaction().begin(); IrrelevantEntity it = session.byId( IrrelevantEntity.class ).load( id ); assertNotNull( it ); - session.delete( it ); + session.remove( it ); session.getTransaction().commit(); session.close(); } @@ -215,7 +217,7 @@ public class SessionWithSharedConnectionTest { IrrelevantEntity irrelevantEntityMainSession = new IrrelevantEntity(); irrelevantEntityMainSession.setName( "main session" ); - session.save( irrelevantEntityMainSession ); + session.persist( irrelevantEntityMainSession ); //open secondary session to also insert an entity Session secondSession = session.sessionWithOptions() @@ -226,7 +228,7 @@ public class SessionWithSharedConnectionTest { IrrelevantEntity irrelevantEntitySecondarySession = new IrrelevantEntity(); irrelevantEntitySecondarySession.setName( "secondary session" ); - secondSession.save( irrelevantEntitySecondarySession ); + secondSession.persist( irrelevantEntitySecondarySession ); session.getTransaction().commit(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java index 1b156cdeab..15f7f7112e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java @@ -54,8 +54,8 @@ public class AutoDiscoveryTest extends BaseCoreFunctionalTestCase { public void testAutoDiscoveryWithDuplicateColumnLabels() { Session session = openSession(); session.beginTransaction(); - session.save( new User( "steve" ) ); - session.save( new User( "stliu" ) ); + session.persist( new User( "steve" ) ); + session.persist( new User( "stliu" ) ); session.getTransaction().commit(); session.close(); @@ -95,9 +95,9 @@ public class AutoDiscoveryTest extends BaseCoreFunctionalTestCase { User u = new User( "steve" ); Group g = new Group( "developer" ); Membership m = new Membership( u, g ); - session.save( u ); - session.save( g ); - session.save( m ); + session.persist( u ); + session.persist( g ); + session.persist( m ); session.getTransaction().commit(); session.close(); @@ -107,9 +107,9 @@ public class AutoDiscoveryTest extends BaseCoreFunctionalTestCase { Object[] row = (Object[]) result.get( 0 ); Assert.assertEquals( "steve", row[0] ); Assert.assertEquals( "developer", row[1] ); - session.delete( m ); - session.delete( u ); - session.delete( g ); + session.remove( m ); + session.remove( u ); + session.remove( g ); session.getTransaction().commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ResultCheckStyleTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ResultCheckStyleTest.java index 6cdfc596f3..5615bdfdfc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ResultCheckStyleTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ResultCheckStyleTest.java @@ -28,7 +28,7 @@ public abstract class ResultCheckStyleTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); ExceptionCheckingEntity e = new ExceptionCheckingEntity(); e.setName( "dummy" ); - s.save( e ); + s.persist( e ); try { s.flush(); fail( "expection flush failure!" ); @@ -47,7 +47,7 @@ public abstract class ResultCheckStyleTest extends BaseCoreFunctionalTestCase { s.beginTransaction(); ParamCheckingEntity e = new ParamCheckingEntity(); e.setName( "dummy" ); - s.save( e ); + s.persist( e ); try { s.flush(); fail( "expection flush failure!" ); @@ -61,14 +61,14 @@ public abstract class ResultCheckStyleTest extends BaseCoreFunctionalTestCase { } @Test - public void testUpdateFailureWithExceptionChecking() { + public void testMergeFailureWithExceptionChecking() { Session s = openSession(); s.beginTransaction(); ExceptionCheckingEntity e = new ExceptionCheckingEntity(); e.setId( Long.valueOf( 1 ) ); e.setName( "dummy" ); - s.update( e ); try { + s.merge( e ); s.flush(); fail( "expection flush failure!" ); } @@ -87,8 +87,8 @@ public abstract class ResultCheckStyleTest extends BaseCoreFunctionalTestCase { ParamCheckingEntity e = new ParamCheckingEntity(); e.setId( Long.valueOf( 1 ) ); e.setName( "dummy" ); - s.update( e ); try { + s.merge( e ); s.flush(); fail( "expection flush failure!" ); } @@ -107,7 +107,7 @@ public abstract class ResultCheckStyleTest extends BaseCoreFunctionalTestCase { ExceptionCheckingEntity e = new ExceptionCheckingEntity(); e.setId( Long.valueOf( 1 ) ); e.setName( "dummy" ); - s.delete( e ); + s.remove( e ); try { s.flush(); fail( "expection flush failure!" ); @@ -127,7 +127,7 @@ public abstract class ResultCheckStyleTest extends BaseCoreFunctionalTestCase { ParamCheckingEntity e = new ParamCheckingEntity(); e.setId( Long.valueOf( 1 ) ); e.setName( "dummy" ); - s.delete( e ); + s.remove( e ); try { s.flush(); fail( "expection flush failure!" ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java index 7bfb76f24d..0bf7be6ba6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedIdEntityTest.java @@ -46,7 +46,7 @@ public class EmbeddedIdEntityTest { session -> { entity.setId( entityId ); entity.setData( "test" ); - session.save( entity ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java index 205ad2be6b..1365accf8b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EmbeddedWithManyToOneTest.java @@ -55,8 +55,8 @@ public class EmbeddedWithManyToOneTest { PK userKey = new PK( subsystem, "Fab" ); SystemUser user = new SystemUser( 1, userKey, "Fab" ); - session.save( subsystem ); - session.save( user ); + session.persist( subsystem ); + session.persist( user ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java index 675c968cf0..1e8f1b6c3c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithEmbeddedIdTest.java @@ -42,7 +42,7 @@ public class EntityWithEmbeddedIdTest { session -> { entity.setId( entityId ); entity.setData( "test" ); - session.save( entity ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java index 9c1f4a94f8..274cc662d6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/EntityWithNotAggregateIdTest.java @@ -42,7 +42,7 @@ public class EntityWithNotAggregateIdTest { session -> { entity.setId( entityId ); entity.setData( "test" ); - session.save( entity ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlDeleteExecutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlDeleteExecutionTests.java index 281e4ff454..7b9aadfc1e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlDeleteExecutionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlDeleteExecutionTests.java @@ -74,7 +74,7 @@ public class HqlDeleteExecutionTests { public void testSimpleMultiTableRestrictedDeleteResults(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( + session.persist( new SecondaryTableTests.SimpleEntityWithSecondaryTables( 1, "first", @@ -82,7 +82,7 @@ public class HqlDeleteExecutionTests { "1 - cfdjdjvokfobkofbvovoijjbvoijofjdbiof" ) ); - session.save( + session.persist( new SecondaryTableTests.SimpleEntityWithSecondaryTables( 2, "second", @@ -90,7 +90,7 @@ public class HqlDeleteExecutionTests { "2 - s3o2rj9 fcojv9j gj9jfv943jv29j9j4" ) ); - session.save( + session.persist( new SecondaryTableTests.SimpleEntityWithSecondaryTables( 3, "third", @@ -132,10 +132,10 @@ public class HqlDeleteExecutionTests { public void testJoinedSubclassRootRestrictedDeleteResults(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( + session.persist( new JoinedInheritanceTest.ForeignCustomer( 1, "Adventures Abroad", "123" ) ); - session.save( + session.persist( new JoinedInheritanceTest.DomesticCustomer( 2, "Domestic Wonders", "456" ) ); } @@ -188,10 +188,10 @@ public class HqlDeleteExecutionTests { public void testJoinedSubclassLeafRestrictedDeleteResult(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( + session.persist( new JoinedInheritanceTest.ForeignCustomer( 1, "Adventures Abroad", "123" ) ); - session.save( + session.persist( new JoinedInheritanceTest.DomesticCustomer( 2, "Domestic Wonders", "456" ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java index 52d3954d7a..b03b26eaea 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/HqlUpdateExecutionTests.java @@ -74,8 +74,8 @@ public class HqlUpdateExecutionTests { public void testSimpleUpdateWithData(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( new BasicEntity( 1, "abc" ) ); - session.save( new BasicEntity( 2, "def" ) ); + session.persist( new BasicEntity( 1, "abc" ) ); + session.persist( new BasicEntity( 2, "def" ) ); } ); @@ -117,8 +117,8 @@ public class HqlUpdateExecutionTests { public void testSimpleRestrictedUpdateWithData(SessionFactoryScope scope) { scope.inTransaction( session -> { - session.save( new BasicEntity( 1, "abc" ) ); - session.save( new BasicEntity( 2, "def" ) ); + session.persist( new BasicEntity( 1, "abc" ) ); + session.persist( new BasicEntity( 2, "def" ) ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java index 4da4f635cc..32f467ffc6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/SmokeTests.java @@ -73,11 +73,11 @@ public class SmokeTests { simpleEntity.setName( "Fab" ); simpleEntity.setGender2( Gender.MALE ); simpleEntity.setComponent( new Component( "a1", "a2" ) ); - session.save( simpleEntity ); + session.persist( simpleEntity ); OtherEntity otherEntity = new OtherEntity(); otherEntity.setId( 2 ); otherEntity.setName( "Bar" ); - session.save( otherEntity ); + session.persist( otherEntity ); } ); } @@ -236,7 +236,7 @@ public class SmokeTests { simpleEntity.setName( "Andrea" ); simpleEntity.setGender2( Gender.FEMALE ); simpleEntity.setComponent( new Component( "b1", "b2" ) ); - session.save( simpleEntity ); + session.persist( simpleEntity ); } ); @@ -271,7 +271,7 @@ public class SmokeTests { simpleEntity.setName( "Andrea" ); simpleEntity.setGender2( Gender.FEMALE ); simpleEntity.setComponent( new Component( "b1", "b2" ) ); - session.save( simpleEntity ); + session.persist( simpleEntity ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java index ef1db9bac8..4d6118938e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithEagerManyToOneTest.java @@ -44,15 +44,15 @@ public class EntityWithEagerManyToOneTest { public void setUp(SessionFactoryScope scope) { scope.inTransaction( session -> { ConcreteEntity entity = new ConcreteEntity(); - session.save( entity ); + session.persist( entity ); LazyAbstractEntityReference reference = new LazyAbstractEntityReference( entity ); - session.save( reference ); + session.persist( reference ); this.abstractEntityReferenceId = reference.getId(); LazyConcreteEntityReference concreteReference = new LazyConcreteEntityReference( entity ); - session.save( concreteReference ); + session.persist( concreteReference ); this.concreteEntityReferenceId = concreteReference.getId(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java index 3f573ff458..11bd655dc7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneSelfReferenceTest.java @@ -56,8 +56,8 @@ public class EntityWithLazyManyToOneSelfReferenceTest { ); scope.inTransaction( session -> { - session.save( entity1 ); - session.save( entity2 ); + session.persist( entity1 ); + session.persist( entity2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java index 298541fd3d..ec051d7067 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithLazyManyToOneTest.java @@ -46,15 +46,15 @@ public class EntityWithLazyManyToOneTest { public void setUp(SessionFactoryScope scope) { scope.inTransaction( session -> { ConcreteEntity entity = new ConcreteEntity(); - session.save( entity ); + session.persist( entity ); LazyAbstractEntityReference reference = new LazyAbstractEntityReference( entity ); - session.save( reference ); + session.persist( reference ); this.abstractEntityReferenceId = reference.getId(); LazyConcreteEntityReference concreteReference = new LazyConcreteEntityReference( entity ); - session.save( concreteReference ); + session.persist( concreteReference ); this.concreteEntityReferenceId = concreteReference.getId(); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java index 5b1190a4d6..1bacc963fe 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneJoinTableTest.java @@ -63,8 +63,8 @@ public class EntityWithManyToOneJoinTableTest { entity.setOther( other ); scope.inTransaction( session -> { - session.save( entity ); - session.save( other ); + session.persist( entity ); + session.persist( other ); } ); } @@ -95,11 +95,11 @@ public class EntityWithManyToOneJoinTableTest { entity.setOther( other ); scope.inTransaction( session -> { - session.save( other ); + session.persist( other ); } ); scope.inTransaction( session -> { - session.save( entity ); + session.persist( entity ); } ); scope.inTransaction( @@ -153,7 +153,7 @@ public class EntityWithManyToOneJoinTableTest { result.setLazyOther( basicEntity ); - session.save( basicEntity ); + session.persist( basicEntity ); } ); @@ -284,7 +284,7 @@ public class EntityWithManyToOneJoinTableTest { result.setLazyOther( basicEntity ); - session.save( basicEntity ); + session.persist( basicEntity ); } ); @@ -334,8 +334,8 @@ public class EntityWithManyToOneJoinTableTest { entity.setOther( other ); scope.inTransaction( session -> { - session.save( other ); - session.save( entity ); + session.persist( other ); + session.persist( entity ); } ); SimpleEntity anOther = new SimpleEntity( @@ -351,7 +351,7 @@ public class EntityWithManyToOneJoinTableTest { session -> { final EntityWithManyToOneJoinTable loaded = session.get( EntityWithManyToOneJoinTable.class, 2 ); assert loaded != null; - session.save( anOther ); + session.persist( anOther ); loaded.setOther( anOther ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java index d525dd558a..f155158068 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/EntityWithManyToOneSelfReferenceTest.java @@ -56,8 +56,8 @@ public class EntityWithManyToOneSelfReferenceTest { ); scope.inTransaction( session -> { - session.save( entity1 ); - session.save( entity2 ); + session.persist( entity1 ); + session.persist( entity2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java index 2bd5c7c72d..0aa477f087 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/manytoone/ManyToOneTest.java @@ -82,7 +82,7 @@ public class ManyToOneTest { AnotherSimpleEntity anotherSimpleEntity = new AnotherSimpleEntity(); anotherSimpleEntity.setId( 3 ); anotherSimpleEntity.setName( "other" ); - session.save( anotherSimpleEntity ); + session.persist( anotherSimpleEntity ); otherEntity.setAnotherSimpleEntity( anotherSimpleEntity ); } ); @@ -145,7 +145,7 @@ public class ManyToOneTest { AnotherSimpleEntity anotherSimpleEntity = new AnotherSimpleEntity(); anotherSimpleEntity.setId( 3 ); anotherSimpleEntity.setName( "other" ); - session.save( anotherSimpleEntity ); + session.persist( anotherSimpleEntity ); otherEntity.setAnotherSimpleEntity( anotherSimpleEntity ); } ); @@ -241,7 +241,7 @@ public class ManyToOneTest { AnotherSimpleEntity anotherSimpleEntity = new AnotherSimpleEntity(); anotherSimpleEntity.setId( 3 ); anotherSimpleEntity.setName( "other" ); - session.save( anotherSimpleEntity ); + session.persist( anotherSimpleEntity ); otherEntity.setAnotherSimpleEntity( anotherSimpleEntity ); } ); @@ -311,12 +311,12 @@ public class ManyToOneTest { SimpleEntity simpleEntity = new SimpleEntity(); simpleEntity.setId( 1 ); simpleEntity.setName( "Fab" ); - session.save( simpleEntity ); + session.persist( simpleEntity ); OtherEntity otherEntity = new OtherEntity(); otherEntity.setId( 2 ); otherEntity.setName( "Bar" ); otherEntity.setSimpleEntity( simpleEntity ); - session.save( otherEntity ); + session.persist( otherEntity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java index 90e67eae60..d0173480de 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithLazyBidirectionalOneToOneTest.java @@ -60,8 +60,8 @@ public class EntityWithLazyBidirectionalOneToOneTest { ); entity.setOther( other ); - session.save( other ); - session.save( entity ); + session.persist( other ); + session.persist( entity ); } ); EntityWithLazyOneToOne entity = new EntityWithLazyOneToOne( 3, "second", Integer.MAX_VALUE ); @@ -78,8 +78,8 @@ public class EntityWithLazyBidirectionalOneToOneTest { ); entity.setOther( other ); - session.save( other ); - session.save( entity ); + session.persist( other ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java index 4cd2fa73bb..3c3f255983 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneJoinTableTest.java @@ -56,10 +56,10 @@ public class EntityWithOneToOneJoinTableTest { entity.setOther( other ); scope.inTransaction( session -> { - session.save( other ); + session.persist( other ); } ); scope.inTransaction( session -> { - session.save( entity ); + session.persist( entity ); } ); scope.inTransaction( @@ -80,8 +80,8 @@ public class EntityWithOneToOneJoinTableTest { ); entity2.setOther( other2 ); - session.save( other2 ); - session.save( entity2 ); + session.persist( other2 ); + session.persist( entity2 ); } ); } @@ -247,8 +247,8 @@ public class EntityWithOneToOneJoinTableTest { scope.inTransaction( session -> { - session.save( other ); - session.save( entity ); + session.persist( other ); + session.persist( entity ); } ); @@ -264,7 +264,7 @@ public class EntityWithOneToOneJoinTableTest { scope.inTransaction( session -> { EntityWithOneToOneJoinTable loaded = session.get( EntityWithOneToOneJoinTable.class, 3 ); - session.save( anOther ); + session.persist( anOther ); loaded.setOther( anOther ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java index 4651477773..e697d686c0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneSharingPrimaryKeyTest.java @@ -61,8 +61,8 @@ public class EntityWithOneToOneSharingPrimaryKeyTest { scope.inTransaction( session -> { - session.save( other ); - session.save( entity ); + session.persist( other ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneTest.java index a4c4a55120..356a914100 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/EntityWithOneToOneTest.java @@ -58,8 +58,8 @@ public class EntityWithOneToOneTest { entity.setOther( other ); scope.inTransaction( session -> { - session.save( other ); - session.save( entity ); + session.persist( other ); + session.persist( entity ); } ); } @@ -116,9 +116,9 @@ public class EntityWithOneToOneTest { assertThat( loaded.getName(), equalTo( "first" ) ); assert loaded.getOther() != null; assertThat( loaded.getOther().getId(), equalTo( 2 ) ); - session.delete( loaded.getOther() ); + session.remove( loaded.getOther() ); loaded.setOther( other ); - session.save( other ); + session.persist( other ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java index 56f23af3cc..cc4b223cf2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest.java @@ -60,9 +60,9 @@ public class EntityWithBidirectionalAssociationsOneOfWhichIsAJoinTableTest { Female daughter = new Female( 3, parent ); daughter.setName( "Fab" ); - session.save( parent ); - session.save( son ); - session.save( daughter ); + session.persist( parent ); + session.persist( son ); + session.persist( daughter ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java index d1951fad39..c7a716d979 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithBidirectionalOneToOneTest.java @@ -59,9 +59,9 @@ public class EntityWithBidirectionalOneToOneTest { AdoptedChild adoptedChild = new AdoptedChild( 3, "Fab", mother ); - session.save( mother ); - session.save( child ); - session.save( adoptedChild ); + session.persist( mother ); + session.persist( child ); + session.persist( adoptedChild ); } ); } @@ -135,9 +135,9 @@ public class EntityWithBidirectionalOneToOneTest { adoptedChild.setBiologicalMother( mother ); - session.save( mother ); - session.save( child ); - session.save( adoptedChild ); + session.persist( mother ); + session.persist( child ); + session.persist( adoptedChild ); } ); SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); @@ -186,11 +186,11 @@ public class EntityWithBidirectionalOneToOneTest { Child anotherChild = new Child( 8, "Igor", biologicalMother ); - session.save( mother ); - session.save( biologicalMother ); - session.save( child ); - session.save( adoptedChild ); - session.save( anotherChild ); + session.persist( mother ); + session.persist( biologicalMother ); + session.persist( child ); + session.persist( adoptedChild ); + session.persist( anotherChild ); } ); SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); @@ -288,7 +288,7 @@ public class EntityWithBidirectionalOneToOneTest { scope.inTransaction( session -> { Mother mother = new Mother( 10, "Strange mom" ); - session.save( mother ); + session.persist( mother ); session.get( AdoptedChild.class, 3 ).setBiologicalMother( mother ); } ); @@ -399,11 +399,11 @@ public class EntityWithBidirectionalOneToOneTest { Child child3 = new Child( 8, "Carla", biologicalMother ); - session.save( mother ); - session.save( biologicalMother ); - session.save( child ); - session.save( child2 ); - session.save( child3 ); + session.persist( mother ); + session.persist( biologicalMother ); + session.persist( child ); + session.persist( child2 ); + session.persist( child3 ); } ); SQLStatementInspector statementInspector = scope.getCollectingStatementInspector(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java index d038ebaad2..774370fb5a 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithOneBidirectionalJoinTableAssociationTest.java @@ -49,8 +49,8 @@ public class EntityWithOneBidirectionalJoinTableAssociationTest { Parent parent = new Parent( 1, "Hibernate" ); Child child = new Child( 2, parent ); child.setName( "Acme" ); - session.save( parent ); - session.save( child ); + session.persist( parent ); + session.persist( child ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java index 7b00d239b4..ada80aba2d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/exec/onetoone/bidirectional/EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest.java @@ -52,9 +52,9 @@ public class EntityWithTwoBidirectionalAssociationsOneWithJoinTableTest { child.setName( "Acme" ); Child2 child2 = new Child2( 3, parent ); child2.setName( "Fab" ); - session.save( parent ); - session.save( child ); - session.save( child2 ); + session.persist( parent ); + session.persist( child ); + session.persist( child2 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomSQLTestSupport.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomSQLTestSupport.java index c99ca3f709..6f89ca68b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomSQLTestSupport.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomSQLTestSupport.java @@ -46,17 +46,18 @@ public abstract class CustomSQLTestSupport extends BaseCoreFunctionalTestCase { Organization jboss = new Organization( "JBoss" ); Person gavin = new Person( "Gavin" ); Employment emp = new Employment( gavin, jboss, "AU" ); - Object orgId = s.save( jboss ); - s.save( ifa ); - s.save( gavin ); - s.save( emp ); + s.persist( jboss ); + Object orgId = jboss.getId(); + s.persist( ifa ); + s.persist( gavin ); + s.persist( emp ); t.commit(); t = s.beginTransaction(); Person christian = new Person( "Christian" ); - s.save( christian ); + s.persist( christian ); Employment emp2 = new Employment( christian, jboss, "EU" ); - s.save( emp2 ); + s.persist( emp2 ); t.commit(); s.close(); @@ -75,7 +76,7 @@ public abstract class CustomSQLTestSupport extends BaseCoreFunctionalTestCase { assertEquals( LockMode.PESSIMISTIC_WRITE , s.getCurrentLockMode( gavin )); emp.setEndDate( new Date() ); Employment emp3 = new Employment( gavin, jboss, "US" ); - s.save( emp3 ); + s.persist( emp3 ); t.commit(); s.close(); @@ -88,16 +89,16 @@ public abstract class CustomSQLTestSupport extends BaseCoreFunctionalTestCase { Iterator itr2 = o.getEmployments().iterator(); while ( itr2.hasNext() ) { Employment e = ( Employment ) itr2.next(); - s.delete( e ); + s.remove( e ); } itr2 = o.getEmployments().iterator(); while ( itr2.hasNext() ) { Employment e = ( Employment ) itr2.next(); - s.delete( e.getEmployee() ); + s.remove( e.getEmployee() ); } - s.delete( o ); + s.remove( o ); assertFalse( itr.hasNext() ); - s.delete( ifa ); + s.remove( ifa ); t.commit(); s.close(); } @@ -108,25 +109,25 @@ public abstract class CustomSQLTestSupport extends BaseCoreFunctionalTestCase { Transaction t = s.beginTransaction(); String description = buildLongString( 15000, 'a' ); TextHolder holder = new TextHolder( description ); - s.save( holder ); + s.persist( holder ); t.commit(); s.close(); s = openSession(); t = s.beginTransaction(); - holder = ( TextHolder ) s.get( TextHolder.class, holder.getId() ); + holder = s.get( TextHolder.class, holder.getId() ); assertEquals( description, holder.getDescription() ); description = buildLongString( 15000, 'b' ); holder.setDescription( description ); - s.save( holder ); + s.persist( holder ); t.commit(); s.close(); s = openSession(); t = s.beginTransaction(); - holder = ( TextHolder ) s.get( TextHolder.class, holder.getId() ); + holder = s.get( TextHolder.class, holder.getId() ); assertEquals( description, holder.getDescription() ); - s.delete( holder ); + s.remove( holder ); t.commit(); s.close(); } @@ -138,25 +139,25 @@ public abstract class CustomSQLTestSupport extends BaseCoreFunctionalTestCase { // Make sure the last byte is non-zero as Sybase cuts that off byte[] photo = buildLongByteArray( 14999, true ); ImageHolder holder = new ImageHolder( photo ); - s.save( holder ); + s.persist( holder ); t.commit(); s.close(); s = openSession(); t = s.beginTransaction(); - holder = ( ImageHolder ) s.get( ImageHolder.class, holder.getId() ); + holder = s.get( ImageHolder.class, holder.getId() ); assertTrue( Arrays.equals( photo, holder.getPhoto() ) ); photo = buildLongByteArray( 15000, false ); holder.setPhoto( photo ); - s.save( holder ); + s.persist( holder ); t.commit(); s.close(); s = openSession(); t = s.beginTransaction(); - holder = ( ImageHolder ) s.get( ImageHolder.class, holder.getId() ); + holder = s.get( ImageHolder.class, holder.getId() ); assertTrue( Arrays.equals( photo, holder.getPhoto() ) ); - s.delete( holder ); + s.remove( holder ); t.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java index d48425b35f..1efa02f970 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java @@ -105,10 +105,10 @@ public abstract class CustomStoredProcTestSupport extends CustomSQLTestSupport { ProcedureCall namedQuery = s.createNamedStoredProcedureQuery( "selectAllEmployments" ); List list = namedQuery.getResultList(); assertTrue( list.get( 0 ) instanceof Employment ); - s.delete( emp ); - s.delete( ifa ); - s.delete( jboss ); - s.delete( gavin ); + s.remove( emp ); + s.remove( ifa ); + s.remove( jboss ); + s.remove( gavin ); t.commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java index 933efa5459..1143203ea1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java @@ -41,8 +41,8 @@ public class CustomInsertSQLWithIdentityColumnTest extends BaseCoreFunctionalTes session.beginTransaction(); Organization org = new Organization( "hola!" ); try { - session.save( org ); - session.delete( org ); + session.persist( org ); + session.remove( org ); fail( "expecting bad custom insert statement to fail" ); } catch( JDBCException e ) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java index 3017f9597b..83084b5682 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java @@ -176,7 +176,7 @@ public class NativeSQLQueriesTest { assertEquals( 1, session.getSessionFactory().getStatistics().getEntityInsertCount() ); // clean up - session.delete( jboss ); + session.remove( jboss ); } ); } @@ -240,10 +240,10 @@ public class NativeSQLQueriesTest { scope.inTransaction( session -> { - session.delete(emp); - session.delete(gavin); - session.delete(ifa); - session.delete(jboss); + session.remove(emp); + session.remove(gavin); + session.remove(ifa); + session.remove(jboss); } ); } @@ -269,10 +269,10 @@ public class NativeSQLQueriesTest { l = session.createNativeQuery( getOrgEmpPersonSQL(), "org-emp-person" ).list(); assertEquals( 1, l.size() ); - session.delete(emp); - session.delete(gavin); - session.delete(ifa); - session.delete(jboss); + session.remove(emp); + session.remove(gavin); + session.remove(ifa); + session.remove(jboss); } ); } @@ -298,10 +298,10 @@ public class NativeSQLQueriesTest { l = session.createNativeQuery( getOrgEmpPersonSQL(), "org-emp-person", Object[].class ).list(); assertEquals( 1, l.size() ); - session.delete(emp); - session.delete(gavin); - session.delete(ifa); - session.delete(jboss); + session.remove(emp); + session.remove(gavin); + session.remove(ifa); + session.remove(jboss); } ); } @@ -311,8 +311,15 @@ public class NativeSQLQueriesTest { Organization ifa = new Organization( "IFA" ); Organization jboss = new Organization( "JBoss" ); - Object idIfa = scope.fromTransaction( session -> session.save( ifa ) ); - Object idJBoss = scope.fromTransaction( session -> session.save( jboss ) ); + Object idIfa = scope.fromTransaction( session -> { + session.persist( ifa ); + return ifa.getId(); + } ); + Object idJBoss = scope.fromTransaction( session -> { + session.persist( jboss ); + return jboss.getId(); + + } ); scope.inTransaction( session -> { @@ -370,8 +377,8 @@ public class NativeSQLQueriesTest { assertEquals( o[1], "JBoss" ); assertEquals( o[0], idJBoss ); - session.delete( ifa ); - session.delete( jboss ); + session.remove( ifa ); + session.remove( jboss ); } ); } @@ -386,10 +393,10 @@ public class NativeSQLQueriesTest { scope.inTransaction( session -> { - Object orgId = session.save(jboss); - Object orgId2 = session.save(ifa); - session.save(gavin); - session.save(emp); + session.persist(jboss); + session.persist(ifa); + session.persist(gavin); + session.persist(emp); } ); @@ -450,10 +457,10 @@ public class NativeSQLQueriesTest { assertEquals(2, objs.length); Employment emp2 = (Employment) objs[0]; Person _gavin = (Person) objs[1]; - session.delete(emp2); - session.delete(jboss); - session.delete(_gavin); - session.delete(ifa); + session.remove(emp2); + session.remove(jboss); + session.remove(_gavin); + session.remove(ifa); } ); } @@ -482,9 +489,9 @@ public class NativeSQLQueriesTest { order.setProduct( product ); order.setPerson( person ); - session.save( product ); - session.save( order); - session.save( person ); + session.persist( product ); + session.persist( order); + session.persist( person ); } ); @@ -537,10 +544,10 @@ public class NativeSQLQueriesTest { scope.inTransaction( session -> { - Object orgId = session.save(jboss); - Object orgId2 = session.save(ifa); - session.save(gavin); - session.save(emp); + session.persist(jboss); + session.persist(ifa); + session.persist(gavin); + session.persist(emp); } ); @@ -630,20 +637,20 @@ public class NativeSQLQueriesTest { scope.inTransaction( session -> { - session.delete(emp2); + session.remove(emp2); - session.delete(jboss); - session.delete(gavin); - session.delete(ifa); + session.remove(jboss); + session.remove(gavin); + session.remove(ifa); } ); scope.inTransaction( session -> { Dimension dim = new Dimension( 3, 30 ); - session.save( dim ); + session.persist( dim ); List list = session.createNativeQuery( "select d_len * d_width as surface, d_len * d_width * 10 as volume from Dimension" ).list(); - session.delete( dim ); + session.remove( dim ); } ); @@ -655,7 +662,7 @@ public class NativeSQLQueriesTest { enterprise.setSpeed( 50d ); Dimension d = new Dimension(45, 10); enterprise.setDimensions( d ); - session.save( enterprise ); + session.persist( enterprise ); session.flush(); Object[] result = (Object[]) session.getNamedQuery( "spaceship" ).uniqueResult(); assertEquals( 3, result.length, "expecting 3 result values" ); @@ -663,7 +670,7 @@ public class NativeSQLQueriesTest { assertTrue(50d == enterprise.getSpeed() ); assertTrue( 450d == extractDoubleValue( result[1] ) ); assertTrue( 4500d == extractDoubleValue( result[2] ) ); - session.delete( enterprise ); + session.remove( enterprise ); } ); } @@ -677,9 +684,9 @@ public class NativeSQLQueriesTest { scope.inTransaction( session -> { - Object jbossId = session.save( jboss ); - session.save( me ); - session.save( emp ); + session.persist( jboss ); + session.persist( me ); + session.persist( emp ); } ); @@ -740,9 +747,9 @@ public class NativeSQLQueriesTest { scope.inTransaction( session -> { - session.delete( emp ); - session.delete( jboss ); - session.delete( me ); + session.remove( emp ); + session.remove( jboss ); + session.remove( me ); } ); } @@ -827,11 +834,11 @@ public class NativeSQLQueriesTest { hibernate.getPersons().remove( gavin ); hibernate.getPersons().remove( max ); - session.delete( seam ); - session.delete( hibernate ); - session.delete( gavin ); - session.delete( max ); - session.delete( pete ); + session.remove( seam ); + session.remove( hibernate ); + session.remove( gavin ); + session.remove( max ); + session.remove( pete ); } ); } @@ -863,7 +870,7 @@ public class NativeSQLQueriesTest { } } assertEquals( description, descriptionRead ); - session.delete( holder ); + session.remove( holder ); } ); } @@ -895,7 +902,7 @@ public class NativeSQLQueriesTest { } } assertTrue( Arrays.equals( photo, photoRead ) ); - session.delete( holder ); + session.remove( holder ); } ); } @@ -927,7 +934,7 @@ public class NativeSQLQueriesTest { .setResultTransformer( Transformers.aliasToBean( HashMap.class ) ) .uniqueResult(); assertEquals( "Gavin", result.get( "NAME" ) == null ? result.get( "name" ) : result.get( "NAME" ) ); - session.delete( gavin ); + session.remove( gavin ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java index 60d9195afd..0cfa6acfdc 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java @@ -45,7 +45,7 @@ public class NativeSqlAndQuotedIdentifiersTest extends BaseCoreFunctionalTestCas if( sessionFactory()==null)return; Session session = sessionFactory().openSession(); session.beginTransaction(); - session.save( new Person( "me" ) ); + session.persist( new Person( "me" ) ); session.getTransaction().commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java index 44243e115d..a56336a29d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java @@ -6,24 +6,26 @@ */ package org.hibernate.orm.test.sql.syncSpace; -import java.util.Map; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.hibernate.cache.spi.CacheImplementor; +import org.hibernate.cfg.AvailableSettings; + +import org.hibernate.testing.orm.junit.DomainModel; +import org.hibernate.testing.orm.junit.ServiceRegistry; +import org.hibernate.testing.orm.junit.SessionFactory; +import org.hibernate.testing.orm.junit.SessionFactoryScope; +import org.hibernate.testing.orm.junit.Setting; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import jakarta.persistence.Cacheable; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import org.hibernate.Session; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.cfg.AvailableSettings; - -import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; /** * Tests of how sync-spaces for a native query affect caching @@ -31,115 +33,123 @@ import static org.junit.Assert.assertTrue; * @author Samuel Fung * @author Steve Ebersole */ -public class NativeQuerySyncSpaceCachingTest extends BaseNonConfigCoreFunctionalTestCase { - @Override - protected void addSettings(Map settings) { - super.addSettings( settings ); - settings.put( AvailableSettings.USE_SECOND_LEVEL_CACHE, true ); +@DomainModel( + annotatedClasses = { + NativeQuerySyncSpaceCachingTest.Customer.class, + NativeQuerySyncSpaceCachingTest.Address.class + } +) +@SessionFactory() +@ServiceRegistry( + settings = @Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true") +) +public class NativeQuerySyncSpaceCachingTest { + + @BeforeEach + public void before(SessionFactoryScope scope) { + scope.inTransaction( + session -> { + Customer customer = new Customer( 1, "Samuel" ); + session.persist( customer ); + } + ); } - @Override - protected Class[] getAnnotatedClasses() { - return new Class[] { Customer.class, Address.class }; - } - - @Before - public void before() { - Session session = sessionFactory().openSession(); - session.beginTransaction(); - Customer customer = new Customer( 1, "Samuel" ); - session.saveOrUpdate( customer ); - session.getTransaction().commit(); - session.close(); - } - - @After - public void after() { - Session session = sessionFactory().openSession(); - session.beginTransaction(); - session.createQuery( "delete Customer" ).executeUpdate(); - session.getTransaction().commit(); - session.close(); + @AfterEach + public void after(SessionFactoryScope scope) { + scope.inTransaction( + session -> + session.createQuery( "delete Customer" ).executeUpdate() + ); } @Test - public void testSelectAnotherEntityWithNoSyncSpaces() { - assertTrue( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + public void testSelectAnotherEntityWithNoSyncSpaces(SessionFactoryScope scope) { + final CacheImplementor cache = scope.getSessionFactory().getCache(); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isTrue(); - Session session = openSession(); - session.createNativeQuery( "select * from Address" ).list(); - session.close(); + scope.inSession( + session -> + session.createNativeQuery( "select * from Address" ).list() + ); - assertTrue( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isTrue(); } @Test - public void testUpdateAnotherEntityWithNoSyncSpaces() { - assertTrue( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + public void testUpdateAnotherEntityWithNoSyncSpaces(SessionFactoryScope scope) { + final CacheImplementor cache = scope.getSessionFactory().getCache(); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isTrue(); - Session session = openSession(); - session.beginTransaction(); - session.createNativeQuery( "update Address set id = id" ).executeUpdate(); - session.getTransaction().commit(); - session.close(); + scope.inTransaction( + session -> + session.createNativeQuery( "update Address set id = id" ).executeUpdate() + ); // NOTE false here because executeUpdate is different than selects - assertFalse( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isFalse(); } @Test - public void testUpdateAnotherEntityWithSyncSpaces() { - assertTrue( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + public void testUpdateAnotherEntityWithSyncSpaces(SessionFactoryScope scope) { + final CacheImplementor cache = scope.getSessionFactory().getCache(); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isTrue(); - Session session = openSession(); - session.beginTransaction(); - session.createNativeQuery( "update Address set id = id" ).addSynchronizedEntityClass( Address.class ).executeUpdate(); - session.getTransaction().commit(); - session.close(); + scope.inTransaction( + session -> + session.createNativeQuery( "update Address set id = id" ) + .addSynchronizedEntityClass( Address.class ) + .executeUpdate() + ); - assertTrue( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isTrue(); } @Test - public void testSelectCachedEntityWithNoSyncSpaces() { - assertTrue( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + public void testSelectCachedEntityWithNoSyncSpaces(SessionFactoryScope scope) { + final CacheImplementor cache = scope.getSessionFactory().getCache(); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isTrue(); - Session session = openSession(); - session.createNativeQuery( "select * from Customer" ).list(); - session.close(); + scope.inSession( + session -> + session.createNativeQuery( "select * from Customer" ).list() + ); - assertTrue( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isTrue(); } @Test - public void testUpdateCachedEntityWithNoSyncSpaces() { - assertTrue( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + public void testUpdateCachedEntityWithNoSyncSpaces(SessionFactoryScope scope) { + final CacheImplementor cache = scope.getSessionFactory().getCache(); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isTrue(); - Session session = openSession(); - session.beginTransaction(); - session.createNativeQuery( "update Customer set id = id" ).executeUpdate(); - session.getTransaction().commit(); - session.close(); + scope.inTransaction( + session -> + session.createNativeQuery( "update Customer set id = id" ).executeUpdate() + + ); // NOTE false here because executeUpdate is different than selects - assertFalse( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isFalse(); } @Test - public void testUpdateCachedEntityWithSyncSpaces() { - assertTrue( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + public void testUpdateCachedEntityWithSyncSpaces(SessionFactoryScope scope) { + final CacheImplementor cache = scope.getSessionFactory().getCache(); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isTrue(); - Session session = openSession(); - session.beginTransaction(); - session.createNativeQuery( "update Customer set id = id" ).addSynchronizedEntityClass( Customer.class ).executeUpdate(); - session.getTransaction().commit(); - session.close(); + scope.inTransaction( + session -> + session.createNativeQuery( "update Customer set id = id" ) + .addSynchronizedEntityClass( Customer.class ) + .executeUpdate() + ); - assertFalse( sessionFactory().getCache().containsEntity( Customer.class, 1 ) ); + assertThat( cache.containsEntity( Customer.class, 1 ) ).isFalse(); } - @Entity( name = "Customer" ) - @Table(name="Customer") + @Entity(name = "Customer") + @Table(name = "Customer") @Cacheable @Cache(usage = CacheConcurrencyStrategy.READ_ONLY) public static class Customer { @@ -173,8 +183,8 @@ public class NativeQuerySyncSpaceCachingTest extends BaseNonConfigCoreFunctional } } - @Entity( name = "Address" ) - @Table(name="Address") + @Entity(name = "Address") + @Table(name = "Address") public static class Address { @Id private int id; diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java index 3be6de36be..4a06db12b8 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessDoWorkTest.java @@ -54,7 +54,7 @@ public class StatelessDoWorkTest { scope.inTransaction( session -> { TestEntity entity = new TestEntity( PERSISTED_TEST_ENTITY_ID, EXPECTED_ENTITY_NAME ); - session.save( entity ); + session.persist( entity ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java index fd73f7c1be..2d8fb6b9d0 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/StatelessSessionQueryTest.java @@ -80,15 +80,15 @@ public class StatelessSessionQueryTest { scope.inTransaction( session -> { Country usa = new Country(); - session.save( usa ); + session.persist( usa ); list.add( usa ); Org disney = new Org(); disney.setCountry( usa ); - session.save( disney ); + session.persist( disney ); list.add( disney ); Contact waltDisney = new Contact(); waltDisney.setOrg( disney ); - session.save( waltDisney ); + session.persist( waltDisney ); list.add( waltDisney ); } ); @@ -99,7 +99,7 @@ public class StatelessSessionQueryTest { scope.inTransaction( session -> { for ( Object obj : list ) { - session.delete( obj ); + session.remove( obj ); } } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java index 356a5c67ac..90a7e630ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/fetching/StatelessSessionFetchingTest.java @@ -57,10 +57,10 @@ public class StatelessSessionFetchingTest { User you = new User( "you" ); Resource yourClock = new Resource( "clock", you ); Task task = new Task( me, "clean", yourClock, now ); // :) - session.save( me ); - session.save( you ); - session.save( yourClock ); - session.save( task ); + session.persist( me ); + session.persist( you ); + session.persist( yourClock ); + session.persist( task ); } ); @@ -89,20 +89,20 @@ public class StatelessSessionFetchingTest { Resource yourClock = new Resource( "clock", you ); Task task = new Task( me, "clean", yourClock, now ); // :) - session.save( me ); - session.save( you ); - session.save( yourClock ); - session.save( task ); + session.persist( me ); + session.persist( you ); + session.persist( yourClock ); + session.persist( task ); User u3 = new User( "U3" ); User u4 = new User( "U4" ); Resource it = new Resource( "it", u4 ); Task task2 = new Task( u3, "beat", it, now ); // :)) - session.save( u3 ); - session.save( u4 ); - session.save( it ); - session.save( task2 ); + session.persist( u3 ); + session.persist( u4 ); + session.persist( it ); + session.persist( task2 ); } ); @@ -133,20 +133,20 @@ public class StatelessSessionFetchingTest { Resource yourClock = new Resource( "clock", you ); Task task = new Task( me, "clean", yourClock, now ); // :) - session.save( me ); - session.save( you ); - session.save( yourClock ); - session.save( task ); + session.persist( me ); + session.persist( you ); + session.persist( yourClock ); + session.persist( task ); User u3 = new User( "U3" ); User u4 = new User( "U4" ); Resource it = new Resource( "it", u4 ); Task task2 = new Task( u3, "beat", it, now ); // :)) - session.save( u3 ); - session.save( u4 ); - session.save( it ); - session.save( task2 ); + session.persist( u3 ); + session.persist( u4 ); + session.persist( it ); + session.persist( task2 ); } ); @@ -173,22 +173,22 @@ public class StatelessSessionFetchingTest { Producer p1 = new Producer( 1, "Acme" ); Producer p2 = new Producer( 2, "ABC" ); - session.save( p1 ); - session.save( p2 ); + session.persist( p1 ); + session.persist( p2 ); Vendor v1 = new Vendor( 1, "v1" ); Vendor v2 = new Vendor( 2, "v2" ); - session.save( v1 ); - session.save( v2 ); + session.persist( v1 ); + session.persist( v2 ); final Product product1 = new Product( 1, "123", v1, p1 ); final Product product2 = new Product( 2, "456", v1, p1 ); final Product product3 = new Product( 3, "789", v1, p2 ); - session.save( product1 ); - session.save( product2 ); - session.save( product3 ); + session.persist( product1 ); + session.persist( product2 ); + session.persist( product3 ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java index 559535bf73..034fb9c072 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stateless/insert/StatelessSessionInsertTest.java @@ -33,7 +33,7 @@ public class StatelessSessionInsertTest { msg.setId( messageId ); msg.setContent( "message_content" ); msg.setSubject( "message_subject" ); - session.save( msg ); + session.persist( msg ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java index 293577eb33..4215b28245 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/stats/StatsTest.java @@ -128,7 +128,7 @@ public class StatsTest { // assertEquals( 1, sf.getStatistics().getCollectionLoadCount() ); // assertEquals( "Should do explicit collection load, not part of the first one", 1, sf.getStatistics().getCollectionFetchCount() ); // for ( Object o : europe2.getCountries() ) { -// s.delete( o ); +// s.remove( o ); // } // cleanDb( s ); // tx.commit(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/DiscrimSubclassFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/DiscrimSubclassFilterTest.java index 5df86a1e3c..623604f7ee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/DiscrimSubclassFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/DiscrimSubclassFilterTest.java @@ -125,9 +125,9 @@ public class DiscrimSubclassFilterTest { ups.setCompany( "UPS" ); ups.setRegion( "US" ); - s.save( john ); - s.save( cust ); - s.save( ups ); + s.persist( john ); + s.persist( cust ); + s.persist( ups ); s.flush(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/JoinedSubclassFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/JoinedSubclassFilterTest.java index b45134be6e..d7de97b1e2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/JoinedSubclassFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/JoinedSubclassFilterTest.java @@ -144,9 +144,9 @@ public class JoinedSubclassFilterTest extends BaseCoreFunctionalTestCase { ups.setCompany( "UPS" ); ups.setRegion( "US" ); - s.save( john ); - s.save( cust ); - s.save( ups ); + s.persist( john ); + s.persist( cust ); + s.persist( ups ); s.flush(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/UnionSubclassFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/UnionSubclassFilterTest.java index b39515d640..186f80fa8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/UnionSubclassFilterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subclassfilter/UnionSubclassFilterTest.java @@ -86,7 +86,7 @@ public class UnionSubclassFilterTest { scope.inTransaction( s -> { for ( Object entity : s.createQuery( "from Person" ).list() ) { - s.delete( entity ); + s.remove( entity ); } } ); @@ -126,9 +126,9 @@ public class UnionSubclassFilterTest { ups.setCompany( "UPS" ); ups.setRegion( "US" ); - s.save( john ); - s.save( cust ); - s.save( ups ); + s.persist( john ); + s.persist( cust ); + s.persist( ups ); s.flush(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java index 15db6f88b0..80d4c78282 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/CompositeIdTypeBindingTest.java @@ -35,12 +35,12 @@ public class CompositeIdTypeBindingTest extends BaseCoreFunctionalTestCase { EmployeeGroup employeegroup = new EmployeeGroup( new EmployeeGroupId( "a", "b" ) ); employeegroup.addEmployee( new Employee( "stliu" ) ); employeegroup.addEmployee( new Employee( "david" ) ); - session.save( employeegroup ); + session.persist( employeegroup ); employeegroup = new EmployeeGroup( new EmployeeGroupId( "c", "d" ) ); employeegroup.addEmployee( new Employee( "gail" ) ); employeegroup.addEmployee( new Employee( "steve" ) ); - session.save( employeegroup ); + session.persist( employeegroup ); session.getTransaction().commit(); session.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java index 50a89639e3..5193007580 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SetSubselectTest.java @@ -44,20 +44,20 @@ public class SetSubselectTest extends BaseCoreFunctionalTestCase { b.setName( "Camilleri" ); b.setId( 1 ); - s.save( b ); + s.persist( b ); Book book = new Book(); book.setId( 2 ); book.setAuthorId( 1 ); book.setTitle( "Il sognaglio" ); - s.save( book ); + s.persist( book ); Book book2 = new Book(); book2.setId( 3 ); book2.setAuthorId( 1 ); book2.setTitle( "Il casellante" ); - s.save( book2 ); + s.persist( book2 ); s.getTransaction().commit(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java index bbf560a147..d5750e67df 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/subselect/SubselectTest.java @@ -48,8 +48,8 @@ public class SubselectTest extends BaseCoreFunctionalTestCase { x23y4.setIdentity( "x23y4$$hu%3" ); x23y4.setPlanet( "Mars" ); x23y4.setSpecies( "martian" ); - s.save( gavin ); - s.save( x23y4 ); + s.persist( gavin ); + s.persist( x23y4 ); s.flush(); List beings = (List) s.createQuery( "from Being" ).list(); for ( Being being : beings ) { @@ -69,8 +69,8 @@ public class SubselectTest extends BaseCoreFunctionalTestCase { gavin.setAddress( "Atlanta, GA" ); gav = (Being) s.createQuery( "from Being b where b.location like '%GA%'" ).uniqueResult(); assertEquals( gav.getLocation(), gavin.getAddress() ); - s.delete( gavin ); - s.delete( x23y4 ); + s.remove( gavin ); + s.remove( x23y4 ); assertTrue( s.createQuery( "from Being" ).list().isEmpty() ); } @@ -95,8 +95,8 @@ public class SubselectTest extends BaseCoreFunctionalTestCase { x23y4.setPlanet( "Mars" ); x23y4.setSpecies( "martian" ); x23y4.setHeightInches( ALIEN_INCHES ); - s.save( gavin ); - s.save( x23y4 ); + s.persist( gavin ); + s.persist( x23y4 ); s.flush(); // Test value conversion during insert @@ -137,8 +137,8 @@ public class SubselectTest extends BaseCoreFunctionalTestCase { .setParameter( 2, ALIEN_INCHES + 0.01d ) .uniqueResult(); assertEquals( ALIEN_INCHES, b.getHeightInches(), 0.01d ); - s.delete( gavin ); - s.delete( x23y4 ); + s.remove( gavin ); + s.remove( x23y4 ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java index 9a59949bce..4dac2d0c01 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/MySQLTimestampPropertyTest.java @@ -86,7 +86,7 @@ public class MySQLTimestampPropertyTest { scope.inTransaction( session -> - session.delete( eQueriedWithTimestamp ) + session.remove( eQueriedWithTimestamp ) ); } @@ -133,7 +133,7 @@ public class MySQLTimestampPropertyTest { scope.inTransaction( session -> - session.delete( eQueriedWithTimestamp ) + session.remove( eQueriedWithTimestamp ) ); } @@ -180,7 +180,7 @@ public class MySQLTimestampPropertyTest { scope.inTransaction( session -> - session.delete( eQueriedWithTimestamp ) + session.remove( eQueriedWithTimestamp ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java index 5d05b42b2b..7b74a5df33 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimePropertyTest.java @@ -104,7 +104,7 @@ public class TimePropertyTest { scope.inTransaction( session -> - session.delete( eQueried ) + session.remove( eQueried ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java index c2e3cae3cf..5f6845efb7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/temporal/TimestampPropertyTest.java @@ -101,7 +101,7 @@ public class TimestampPropertyTest { scope.inTransaction( session -> - session.delete( eQueriedWithTimestamp ) + session.remove( eQueriedWithTimestamp ) ); } @@ -148,7 +148,7 @@ public class TimestampPropertyTest { scope.inTransaction( session -> - session.delete( eQueriedWithTimestamp ) + session.remove( eQueriedWithTimestamp ) ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/TernaryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/TernaryTest.java index 4adc3dfdb2..9aff2db28f 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/TernaryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/ternary/TernaryTest.java @@ -111,10 +111,10 @@ public class TernaryTest extends BaseCoreFunctionalTestCase { while ( itr.hasNext() ) { Employee emp = ( Employee ) itr.next(); emp.setManagerBySite( new HashMap() ); - s.delete( emp ); + s.remove( emp ); } for ( Object entity : s.createQuery( "from Site" ).list() ) { - s.delete( entity ); + s.remove( entity ); } t.commit(); s.close(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/TimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/TimestampTest.java index 8e8759f84b..4b1d51238c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/TimestampTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timestamp/TimestampTest.java @@ -54,7 +54,7 @@ public class TimestampTest { session -> { User u = session.get( User.class, "gavin" ); assertEquals( u.getPerson().getName(), "Gavin King" ); - session.delete( u ); + session.remove( u ); } ); @@ -83,7 +83,7 @@ public class TimestampTest { session -> { User u = session.get( User.class, "gavin" ); assertEquals( u.getPassword(), "$ecret" ); - session.delete( u ); + session.remove( u ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java index 23e2e19a61..d951e9882b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java @@ -436,7 +436,7 @@ public class CMTTest { s = sessionFactory.openSession(); item = (Map) s.createQuery( "from Item" ).uniqueResult(); assertNotNull( item ); - s.delete( item ); + s.remove( item ); transactionManager.commit(); assertFalse( s.isOpen() ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java index ee42c42726..912931973d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/InterceptorTransactionTest.java @@ -174,7 +174,7 @@ public class InterceptorTransactionTest extends BaseJpaOrNativeBootstrapFunction assertNull( interceptor.afterTransactionCompletionAssertionPassed ); SimpleEntity entity = new SimpleEntity( "Hello World" ); - session.save( entity ); + session.persist( entity ); interceptor.reset(); @@ -205,7 +205,7 @@ public class InterceptorTransactionTest extends BaseJpaOrNativeBootstrapFunction assertNull( interceptor.afterTransactionCompletionAssertionPassed ); SimpleEntity entity = new SimpleEntity( "Hello World" ); - session.save( entity ); + session.persist( entity ); interceptor.reset(); @@ -248,7 +248,7 @@ public class InterceptorTransactionTest extends BaseJpaOrNativeBootstrapFunction assertNull( interceptor.afterTransactionCompletionAssertionPassed ); SimpleEntity entity = new SimpleEntity( "Hello World" ); - session.save( entity ); + session.persist( entity ); interceptor.reset(); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java index 5297c1bfc6..ac8f5e839b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaAfterCompletionTest.java @@ -72,7 +72,7 @@ public class JtaAfterCompletionTest extends BaseSessionFactoryFunctionalTest { session = sessionFactory.openSession(); SimpleEntity entity = new SimpleEntity( "Hello World" ); - session.save( entity ); + session.persist( entity ); // Register before and after callback handlers // The before causes the original thread to wait until Reaper aborts the transaction diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java index 43d6a83a46..6e9c0a870b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/tm/JtaBeforeCompletionFailureTest.java @@ -49,7 +49,7 @@ public class JtaBeforeCompletionFailureTest extends BaseSessionFactoryFunctional public void setUp() { inTransaction( session -> - session.save( newEntity( 1 ) ) + session.persist( newEntity( 1 ) ) ); } @@ -73,7 +73,7 @@ public class JtaBeforeCompletionFailureTest extends BaseSessionFactoryFunctional try (Session session = sessionFactory().openSession()) { - session.save( newEntity( 2 ) ); + session.persist( newEntity( 2 ) ); // complete the transaction ("CMT" style) - this leads to the managed flush // which should lead to the UK violation diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java index 198ff92932..f3c92953b7 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BigDecimalTypeTest.java @@ -44,7 +44,7 @@ public class BigDecimalTypeTest extends BaseNonConfigCoreFunctionalTestCase { account.id = 1L; account.balance = balance; - s.save( account ); + s.persist( account ); s.getTransaction().commit(); } catch (Exception e) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BinaryTypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BinaryTypeTest.java index 8f9ea93edf..6ed04a58b3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/BinaryTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/BinaryTypeTest.java @@ -37,7 +37,7 @@ public class BinaryTypeTest extends BaseNonConfigCoreFunctionalTestCase { image.id = 1L; image.content = new byte[] {1, 2, 3}; - s.save( image ); + s.persist( image ); s.getTransaction().commit(); } catch (Exception e) { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/type/Java8DateTimeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/type/Java8DateTimeTests.java index 5ccf1a7845..45d5223d0b 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/type/Java8DateTimeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/type/Java8DateTimeTests.java @@ -56,7 +56,7 @@ public class Java8DateTimeTests extends BaseNonConfigCoreFunctionalTestCase { Session s = openSession(); s.beginTransaction(); - s.save( theEntity ); + s.persist( theEntity ); s.getTransaction().commit(); s.close(); @@ -65,7 +65,7 @@ public class Java8DateTimeTests extends BaseNonConfigCoreFunctionalTestCase { theEntity = s.get( TheEntity.class, 1 ); dump( entityBinding, theEntity ); assertNotNull( theEntity ); - s.delete( theEntity ); + s.remove( theEntity ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java index 071f247bb4..ffa056f20e 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedescriptor/ByteTest.java @@ -61,7 +61,7 @@ public class ByteTest { assertNotNull( entity ); assertEquals( TEST_VALUE, entity.getByteData() ); entity.setByteData( Byte.MIN_VALUE ); - session.update( entity ); + session.persist( entity ); } ); @@ -75,7 +75,7 @@ public class ByteTest { assertNotNull( entity ); assertEquals( Byte.MIN_VALUE, entity.getByteData() ); entity.setByteData( Byte.MAX_VALUE ); - session.update( entity ); + session.merge( entity ); } ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/TypedOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/TypedOneToOneTest.java index ca8828462d..b1f860f2a6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/TypedOneToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typedonetoone/TypedOneToOneTest.java @@ -73,7 +73,7 @@ public class TypedOneToOneTest { assertEquals( "30326", cust.getShippingAddress().getZip() ); assertEquals( "BILLING", cust.getBillingAddress().getAddressId().getType() ); assertEquals( "SHIPPING", cust.getShippingAddress().getAddressId().getType() ); - session.delete( cust ); + session.remove( cust ); } ); } @@ -101,7 +101,7 @@ public class TypedOneToOneTest { Customer cust = results.get( 0 ); assertNull( cust.getShippingAddress() ); assertNull( cust.getBillingAddress() ); - session.delete( cust ); + session.remove( cust ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java index 4fa07b1f85..ef7f7c5df6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typeoverride/TypeOverrideTest.java @@ -99,7 +99,7 @@ public class TypeOverrideTest extends BaseSessionFactoryFunctionalTest { Entity e = new Entity( "name" ); inTransaction( session -> - session.save( e ) + session.persist( e ) ); inTransaction( @@ -107,7 +107,7 @@ public class TypeOverrideTest extends BaseSessionFactoryFunctionalTest { Entity entity = session.get( Entity.class, e.getId() ); assertFalse( entity.getName().startsWith( StoredPrefixedStringType.PREFIX ) ); assertEquals( "name", entity.getName() ); - session.delete( entity ); + session.remove( entity ); } ); } @@ -118,7 +118,7 @@ public class TypeOverrideTest extends BaseSessionFactoryFunctionalTest { Entity e = new Entity( "name " ); inTransaction( session -> - session.save( e ) + session.persist( e ) ); inTransaction( @@ -131,7 +131,7 @@ public class TypeOverrideTest extends BaseSessionFactoryFunctionalTest { inTransaction( session -> - session.delete( e ) + session.remove( e ) ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java index 35fcf2c089..bfbd860741 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/typeparameters/TypeParameterTest.java @@ -53,7 +53,8 @@ public class TypeParameterTest { session -> { Widget obj = new Widget(); obj.setValueThree( 5 ); - return session.save( obj ); + session.persist( obj ); + return obj.getId(); } ); @@ -131,7 +132,7 @@ public class TypeParameterTest { obj.setValueThree( 9 ); obj.setValueFour( 10 ); obj.setString( "all-normal" ); - session.save( obj ); + session.persist( obj ); obj = new Widget(); obj.setValueOne( 1 ); @@ -139,7 +140,7 @@ public class TypeParameterTest { obj.setValueThree( -1 ); obj.setValueFour( -5 ); obj.setString( "all-default" ); - session.save( obj ); + session.persist( obj ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java index 2141e16724..9ff901d31c 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unconstrained/UnconstrainedTest.java @@ -75,7 +75,7 @@ public class UnconstrainedTest { Person p = session.get( Person.class, "gavin" ); assertTrue( Hibernate.isInitialized( p.getEmployee() ) ); assertNotNull( p.getEmployee() ); - session.delete( p ); + session.remove( p ); } ); } @@ -121,7 +121,7 @@ public class UnconstrainedTest { // .uniqueResult(); assertTrue( Hibernate.isInitialized( p.getEmployee() ) ); assertNotNull( p.getEmployee() ); - session.delete( p ); + session.remove( p ); } ); } @@ -142,7 +142,7 @@ public class UnconstrainedTest { Person p = session.get( Person.class, "gavin" ); assertTrue( Hibernate.isInitialized( p.getEmployee() ) ); assertNotNull( p.getEmployee() ); - session.delete( p ); + session.remove( p ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java index ef504361af..14cf8de558 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/UnionSubclassTest.java @@ -63,7 +63,7 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { inTransaction( s -> { Location mel = new Location( "Earth" ); - s.save( mel ); + s.persist( mel ); Human gavin = new Human(); gavin.setIdentity( "gavin" ); @@ -83,8 +83,8 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { criteria.from( Human.class ); Human gavin = s.createQuery( criteria ).uniqueResult(); assertEquals( 2, gavin.getInfo().size() ); - s.delete( gavin ); - s.delete( gavin.getLocation() ); + s.remove( gavin ); + s.remove( gavin.getLocation() ); } ); } @@ -94,7 +94,7 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { inTransaction( s -> { Location mel = new Location( "Earth" ); - s.save( mel ); + s.persist( mel ); Human gavin = new Human(); gavin.setIdentity( "gavin" ); @@ -123,9 +123,9 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { for ( Human h : list ) { assertTrue( Hibernate.isInitialized( h.getLocation() ) ); assertTrue( Hibernate.isInitialized( h.getLocation().getBeings() ) ); - s.delete( h ); + s.remove( h ); } - s.delete( s.get( Location.class, mel.getId() ) ); + s.remove( s.get( Location.class, mel.getId() ) ); } ); } @@ -136,8 +136,8 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { s -> { Location mel = new Location( "Melbourne, Australia" ); Location mars = new Location( "Mars" ); - s.save( mel ); - s.save( mars ); + s.persist( mel ); + s.persist( mars ); Human gavin = new Human(); gavin.setIdentity( "gavin" ); @@ -203,9 +203,9 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { criteria.orderBy( criteriaBuilder.asc( root.get( "identity" ) ) ); x23y4 = s.createQuery( criteria ).list().get( 0 ); // x23y4 = (Alien) s.createCriteria( Alien.class ).addOrder( Order.asc( "identity" ) ).list().get( 0 ); - s.delete( x23y4.getHive() ); - s.delete( s.get( Location.class, mel.getId() ) ); - s.delete( s.get( Location.class, mars.getId() ) ); + s.remove( x23y4.getHive() ); + s.remove( s.get( Location.class, mel.getId() ) ); + s.remove( s.get( Location.class, mars.getId() ) ); assertTrue( s.createQuery( "from Being" ).list().isEmpty() ); } ); @@ -217,8 +217,8 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { s -> { Location mel = new Location( "Melbourne, Australia" ); Location mars = new Location( "Mars" ); - s.save( mel ); - s.save( mars ); + s.persist( mel ); + s.persist( mars ); Human gavin = new Human(); gavin.setIdentity( "gavin" ); @@ -242,7 +242,7 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { thing.setDescription( "some thing" ); thing.setOwner( gavin ); gavin.getThings().add( thing ); - s.save( thing ); + s.persist( thing ); s.flush(); s.clear(); @@ -303,14 +303,14 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { assertEquals( "x23y4$$hu%3", thing.getOwner().getIdentity() ); - s.delete( thing ); + s.remove( thing ); CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder(); CriteriaQuery criteria = criteriaBuilder.createQuery( Alien.class ); criteria.from( Alien.class ); x23y4 = s.createQuery( criteria ).uniqueResult(); - s.delete( x23y4.getHive() ); - s.delete( s.get( Location.class, mel.getId() ) ); - s.delete( s.get( Location.class, mars.getId() ) ); + s.remove( x23y4.getHive() ); + s.remove( s.get( Location.class, mel.getId() ) ); + s.remove( s.get( Location.class, mars.getId() ) ); assertTrue( s.createQuery( "from Being" ).list().isEmpty() ); } @@ -324,9 +324,9 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { Location mel = new Location( "Melbourne, Australia" ); Location atl = new Location( "Atlanta, GA" ); Location mars = new Location( "Mars" ); - s.save( mel ); - s.save( atl ); - s.save( mars ); + s.persist( mel ); + s.persist( atl ); + s.persist( mars ); Human gavin = new Human(); gavin.setIdentity( "gavin" ); @@ -417,14 +417,14 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { atl.addBeing( gavin ); assertEquals( 1, s.createQuery( "from Human h where h.location.name like '%GA'" ).list().size() ); - s.delete( gavin ); + s.remove( gavin ); CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder(); CriteriaQuery criteria = criteriaBuilder.createQuery( Alien.class ); criteria.from( Alien.class ); x23y4 = s.createQuery( criteria ).uniqueResult(); - s.delete( x23y4.getHive() ); + s.remove( x23y4.getHive() ); assertTrue( s.createQuery( "from Being" ).list().isEmpty() ); s.createQuery( "delete from Location" ).executeUpdate(); @@ -458,9 +458,9 @@ public class UnionSubclassTest extends BaseSessionFactoryFunctionalTest { q.setParameter( "name2", "steve" ); final List result = q.list(); assertEquals( 2, result.size() ); - s.delete( result.get( 0 ) ); - s.delete( result.get( 1 ) ); - s.delete( ( (Human) result.get( 0 ) ).getLocation() ); + s.remove( result.get( 0 ) ); + s.remove( result.get( 1 ) ); + s.remove( ( (Human) result.get( 0 ) ).getLocation() ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java index c4bc068066..eb66d374f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass/alias/SellCarTest.java @@ -49,7 +49,7 @@ public class SellCarTest extends BaseCoreFunctionalTestCase { private void prepareData() { Session session = openSession(); Transaction tx = session.beginTransaction(); - session.save( createData() ); + session.persist( createData() ); tx.commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java index 2196315d7b..9eaa8b7872 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/unionsubclass2/UnionSubclassTest.java @@ -65,9 +65,9 @@ public class UnionSubclassTest { yomomma.setName( "mum" ); yomomma.setSex( 'F' ); - s.save( yomomma ); - s.save( mark ); - s.save( joe ); + s.persist( yomomma ); + s.persist( mark ); + s.persist( joe ); try { assertEquals( s.createQuery( "from java.io.Serializable" ).list().size(), 0 ); @@ -131,9 +131,9 @@ public class UnionSubclassTest { // s.createCriteria( Person.class ).add( // Restrictions.in( "address", new Address[] { mark.getAddress(), joe.getAddress()} ) ).list(); - s.delete( mark ); - s.delete( joe ); - s.delete( yomomma ); + s.remove( mark ); + s.remove( joe ); + s.remove( yomomma ); assertTrue( s.createQuery( "from Person" ).list().isEmpty() ); } @@ -179,8 +179,8 @@ public class UnionSubclassTest { assertEquals( result.size(), 1 ); assertEquals( ( (BigDecimal) result.get( 0 ) ).intValue(), 1000 ); - s.delete( p ); - s.delete( q ); + s.remove( p ); + s.remove( q ); } ); } @@ -293,8 +293,8 @@ public class UnionSubclassTest { .uniqueResult() ).doubleValue(); assertEquals( 1d, expiryViaSql, 0.01d ); - s.delete( p ); - s.delete( e ); + s.remove( p ); + s.remove( e ); } ); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java index cefa7708cb..1324844879 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/InstantVersionTest.java @@ -36,7 +36,7 @@ public class InstantVersionTest extends BaseNonConfigCoreFunctionalTestCase { Session session = openSession(); session.getTransaction().begin(); TheEntity e = new TheEntity( 1 ); - session.save( e ); + session.persist( e ); session.getTransaction().commit(); session.close(); @@ -50,7 +50,7 @@ public class InstantVersionTest extends BaseNonConfigCoreFunctionalTestCase { session = openSession(); session.getTransaction().begin(); e = session.byId( TheEntity.class ).load( 1 ); - session.delete( e ); + session.remove( e ); session.getTransaction().commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java index 10455f657b..d9b8d36865 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/LocalDateTimeVersionTest.java @@ -37,7 +37,7 @@ public class LocalDateTimeVersionTest extends BaseNonConfigCoreFunctionalTestCas Session session = openSession(); session.getTransaction().begin(); TheEntity e = new TheEntity( 1 ); - session.save( e ); + session.persist( e ); session.getTransaction().commit(); session.close(); @@ -51,7 +51,7 @@ public class LocalDateTimeVersionTest extends BaseNonConfigCoreFunctionalTestCas session = openSession(); session.getTransaction().begin(); e = session.byId( TheEntity.class ).load( 1 ); - session.delete( e ); + session.remove( e ); session.getTransaction().commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java index c68eceea5e..a197a4ad49 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/OffsetDateTimeVersionTest.java @@ -37,7 +37,7 @@ public class OffsetDateTimeVersionTest extends BaseNonConfigCoreFunctionalTestCa Session session = openSession(); session.getTransaction().begin(); TheEntity e = new TheEntity( 1 ); - session.save( e ); + session.persist( e ); session.getTransaction().commit(); session.close(); @@ -51,7 +51,7 @@ public class OffsetDateTimeVersionTest extends BaseNonConfigCoreFunctionalTestCa session = openSession(); session.getTransaction().begin(); e = session.byId( TheEntity.class ).load( 1 ); - session.delete( e ); + session.remove( e ); session.getTransaction().commit(); session.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java index 69c0fbc1fb..b2d7988bba 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/VersionTest.java @@ -109,7 +109,7 @@ public class VersionTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.delete(gavin); + s.remove(gavin); t.commit(); s.close(); } @@ -148,7 +148,7 @@ public class VersionTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.delete(gavin); + s.remove(gavin); t.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java index 1ac75f4767..ba334e7871 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/ZonedDateTimeVersionTest.java @@ -37,7 +37,7 @@ public class ZonedDateTimeVersionTest extends BaseNonConfigCoreFunctionalTestCas Session session = openSession(); session.getTransaction().begin(); TheEntity e = new TheEntity( 1 ); - session.save( e ); + session.persist( e ); session.getTransaction().commit(); session.close(); @@ -51,7 +51,7 @@ public class ZonedDateTimeVersionTest extends BaseNonConfigCoreFunctionalTestCas session = openSession(); session.getTransaction().begin(); e = session.byId( TheEntity.class ).load( 1 ); - session.delete( e ); + session.remove( e ); session.getTransaction().commit(); session.close(); } 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 b5d2409252..59b54f46e2 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.delete( s.load( User.class, steve.getId() ) ); - s.delete( s.load( Group.class, admin.getId() ) ); + s.remove( s.load( User.class, steve.getId() ) ); + s.remove( s.load( Group.class, admin.getId() ) ); t.commit(); s.close(); } @@ -120,8 +120,8 @@ public class DbVersionTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.delete( s.load( User.class, steve.getId() ) ); - s.delete( s.load( Permission.class, perm.getId() ) ); + s.remove( s.load( User.class, steve.getId() ) ); + s.remove( s.load( Permission.class, perm.getId() ) ); t.commit(); s.close(); } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java index 8915dee57a..69a2c049c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/version/sybase/SybaseTimestampComparisonAnnotationsTest.java @@ -71,7 +71,7 @@ public class SybaseTimestampComparisonAnnotationsTest extends BaseCoreFunctional s = openSession(); s.getTransaction().begin(); - s.delete( thing ); + s.remove( thing ); s.getTransaction().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 f5dfa425b9..8925ae4f18 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.delete( s.load( User.class, steve.getId() ) ); + s.remove( s.load( User.class, steve.getId() ) ); t.commit(); s.close(); } @@ -191,8 +191,8 @@ public class SybaseTimestampVersioningTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.delete( s.load( User.class, steve.getId() ) ); - s.delete( s.load( Group.class, admin.getId() ) ); + s.remove( s.load( User.class, steve.getId() ) ); + s.remove( s.load( Group.class, admin.getId() ) ); t.commit(); s.close(); } @@ -245,8 +245,8 @@ public class SybaseTimestampVersioningTest extends BaseCoreFunctionalTestCase { s = openSession(); t = s.beginTransaction(); - s.delete( s.load( User.class, steve.getId() ) ); - s.delete( s.load( Permission.class, perm.getId() ) ); + s.remove( s.load( User.class, steve.getId() ) ); + s.remove( s.load( Permission.class, perm.getId() ) ); t.commit(); s.close(); } @@ -297,7 +297,7 @@ public class SybaseTimestampVersioningTest extends BaseCoreFunctionalTestCase { s = openSession(); s.getTransaction().begin(); - s.delete( user ); + s.remove( user ); s.getTransaction().commit(); s.close(); } diff --git a/hibernate-core/src/test/resources/hibernate.properties b/hibernate-core/src/test/resources/hibernate.properties index 4ab2ce2226..1caa65b433 100644 --- a/hibernate-core/src/test/resources/hibernate.properties +++ b/hibernate-core/src/test/resources/hibernate.properties @@ -29,3 +29,5 @@ jakarta.persistence.validation.mode=NONE hibernate.service.allow_crawling=false hibernate.session.events.log=true hibernate.query.mutation_strategy.global_temporary.drop_tables=true + +#hibernate.transform_hbm_xml.enabled=true \ No newline at end of file diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml index f2dc19dc6f..90b03a06ea 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/DiscriminatorSubclassPerson.hbm.xml @@ -13,7 +13,7 @@ - + diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml index 7594619d5e..99d832e24d 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/JoinedSubclassPerson.hbm.xml @@ -13,7 +13,7 @@ - + diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.hbm.xml index 80306215cb..60dcc52fac 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cache/hhh13179/UnionSubclassPerson.hbm.xml @@ -13,7 +13,7 @@ - + diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/CascadeManagedAndTransient.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/CascadeManagedAndTransient.hbm.xml index 6a26979d43..4aee93bbde 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/CascadeManagedAndTransient.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/CascadeManagedAndTransient.hbm.xml @@ -81,7 +81,7 @@ column="routeID" unique="false" not-null="false" - cascade="merge,refresh,persist,save-update,save-update" + cascade="merge,refresh,persist,save-update" lazy="false"/> diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml index 7b6f6be615..796d60b2e3 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml @@ -15,7 +15,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -43,14 +43,14 @@ column="pickupNodeID" unique="true" not-null="true" - cascade="merge,save-update,refresh" + cascade="merge,persist,refresh" lazy="false"/> @@ -60,12 +60,12 @@ - + - + @@ -81,7 +81,7 @@ column="tourID" unique="false" not-null="false" - cascade="merge,save-update,refresh" + cascade="merge,persist,refresh" lazy="false"/> diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml index 5dca1a2d2f..28bc97409c 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml @@ -15,7 +15,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -43,14 +43,14 @@ column="pickupNodeID" unique="true" not-null="true" - cascade="save-update,merge,refresh" + cascade="persist,merge,refresh" lazy="false"/> @@ -60,12 +60,12 @@ - + - + @@ -81,7 +81,7 @@ column="tourID" unique="false" not-null="false" - cascade="save-update,merge,refresh" + cascade="persist,merge,refresh" lazy="false"/> diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/model/Part.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/model/Part.hbm.xml index 146bdbeee1..617738155c 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/model/Part.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/jpa/model/Part.hbm.xml @@ -16,7 +16,7 @@ - + diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/legacy/ABC.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/legacy/ABC.hbm.xml index 19cd6ba9ed..318f898d9e 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/legacy/ABC.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/legacy/ABC.hbm.xml @@ -38,7 +38,7 @@ - + diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritance.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritance.hbm.xml index 47d2850c50..0259fc5e38 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritance.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritance.hbm.xml @@ -25,8 +25,7 @@ discriminator-value="P"> + column="person_id"> diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/propertyref/basic/Person.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/propertyref/basic/Person.hbm.xml index 4dd7b392f4..a9e770c83e 100644 --- a/hibernate-core/src/test/resources/org/hibernate/orm/test/propertyref/basic/Person.hbm.xml +++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/propertyref/basic/Person.hbm.xml @@ -63,7 +63,7 @@ - + diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java index 3feb5a42ea..443d288b6c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/UnspecifiedEnumTypeTest.java @@ -64,10 +64,10 @@ public class UnspecifiedEnumTypeTest extends BaseEnversFunctionalTestCase { // Revision 2 session.getTransaction().begin(); - entity = (UnspecifiedEnumTypeEntity) session.get( UnspecifiedEnumTypeEntity.class, entity.getId() ); + entity = session.get( UnspecifiedEnumTypeEntity.class, entity.getId() ); entity.setEnum1( UnspecifiedEnumTypeEntity.E1.Y ); entity.setEnum2( UnspecifiedEnumTypeEntity.E2.B ); - session.update( entity ); + session.merge( entity ); session.getTransaction().commit(); session.close(); 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 59ee66ee0f..15c5295ea8 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 @@ -130,10 +130,10 @@ public class AuditedDynamicComponentsAdvancedCasesTest extends BaseEnversFunctio //rev 1 Session session = openSession(); session.getTransaction().begin(); - session.save( manyToOne ); - session.save( oneToOne ); - session.save( manyToManyEntity ); - session.save( advancedEntity ); + session.persist( manyToOne ); + session.persist( oneToOne ); + session.persist( manyToManyEntity ); + session.persist( advancedEntity ); session.getTransaction().commit(); //rev 2 @@ -141,21 +141,21 @@ public class AuditedDynamicComponentsAdvancedCasesTest extends BaseEnversFunctio InternalComponent internalComponent = (InternalComponent) advancedEntity.getDynamicConfiguration() .get( INTERNAL_COMPONENT ); internalComponent.setProperty( "new value" ); - session.save( advancedEntity ); + session.persist( advancedEntity ); session.getTransaction().commit(); //rev 3 session.getTransaction().begin(); List internalList = (List) advancedEntity.getDynamicConfiguration().get( INTERNAL_LIST ); internalList.add( "four" ); - session.save( advancedEntity ); + session.persist( advancedEntity ); session.getTransaction().commit(); //rev 4 session.getTransaction().begin(); Map map = (Map) advancedEntity.getDynamicConfiguration().get( INTERNAL_MAP ); map.put( "three", "3" ); - session.save( advancedEntity ); + session.persist( advancedEntity ); session.getTransaction().commit(); //rev 5 @@ -164,15 +164,15 @@ public class AuditedDynamicComponentsAdvancedCasesTest extends BaseEnversFunctio .get( INTERNAL_MAP_WITH_MANY_TO_MANY ); ManyToManyEntity manyToManyEntity2 = new ManyToManyEntity( 2L, "new value" ); mapWithManyToMany.put( "entity2", manyToManyEntity2 ); - session.save( manyToManyEntity2 ); - session.save( advancedEntity ); + session.persist( manyToManyEntity2 ); + session.persist( advancedEntity ); session.getTransaction().commit(); //rev 6 session.getTransaction().begin(); mapWithManyToMany = (Map) advancedEntity.getDynamicConfiguration().get( INTERNAL_MAP_WITH_MANY_TO_MANY ); mapWithManyToMany.clear(); - session.save( advancedEntity ); + session.persist( advancedEntity ); session.getTransaction().commit(); //rev 7 @@ -180,20 +180,20 @@ public class AuditedDynamicComponentsAdvancedCasesTest extends BaseEnversFunctio Set internalComponentSet = (Set) advancedEntity.getDynamicConfiguration() .get( INTERNAL_SET_OF_COMPONENTS ); internalComponentSet.add( new InternalComponent( "drei" ) ); - session.save( advancedEntity ); + session.persist( advancedEntity ); session.getTransaction().commit(); //rev 8 session.getTransaction().begin(); advancedEntity.getDynamicConfiguration().put( AGE_USER_TYPE, new Age( 19 ) ); - session.save( advancedEntity ); + session.persist( advancedEntity ); session.getTransaction().commit(); //rev 9 session.getTransaction().begin(); List ages = (List) advancedEntity.getDynamicConfiguration().get( INTERNAL_LIST_OF_USER_TYPES ); ages.add( new Age( 4 ) ); - session.save( advancedEntity ); + session.persist( advancedEntity ); session.getTransaction().commit(); //rev this, should not create revision diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java index 38e5e175ed..00a2588116 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/OutsideTransactionTest.java @@ -53,7 +53,7 @@ public class OutsideTransactionTest extends BaseEnversFunctionalTestCase { } @Test(expected = TransactionRequiredException.class) - public void testUpdateOutsideActiveTransaction() { + public void testMergeOutsideActiveTransaction() { Session session = openSession(); // Revision 1 @@ -64,7 +64,7 @@ public class OutsideTransactionTest extends BaseEnversFunctionalTestCase { // Illegal modification of entity state outside of active transaction. entity.setStr( "modified data" ); - session.update( entity ); + session.merge( entity ); session.flush(); session.close(); @@ -81,7 +81,7 @@ public class OutsideTransactionTest extends BaseEnversFunctionalTestCase { session.getTransaction().commit(); // Illegal removal of entity outside of active transaction. - session.delete( entity ); + session.remove( entity ); session.flush(); session.close(); @@ -97,12 +97,12 @@ public class OutsideTransactionTest extends BaseEnversFunctionalTestCase { Name name = new Name(); name.setName( "Name" ); person.getNames().add( name ); - session.saveOrUpdate( person ); + session.persist( person ); session.getTransaction().commit(); // Illegal collection update outside of active transaction. person.getNames().remove( name ); - session.saveOrUpdate( person ); + session.merge( person ); session.flush(); session.close(); @@ -118,12 +118,12 @@ public class OutsideTransactionTest extends BaseEnversFunctionalTestCase { Name name = new Name(); name.setName( "Name" ); person.getNames().add( name ); - session.saveOrUpdate( person ); + session.persist( person ); session.getTransaction().commit(); // Illegal collection removal outside of active transaction. person.setNames( null ); - session.saveOrUpdate( person ); + session.merge( person ); session.flush(); session.close(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java index c12a7e2c16..bd51735b9d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java @@ -44,7 +44,7 @@ public class RegisterUserEventListenersTest extends BaseEnversFunctionalTestCase Session session = openSession(); session.getTransaction().begin(); StrTestEntity entity = new StrTestEntity( "str1" ); - session.save( entity ); + session.persist( entity ); session.getTransaction().commit(); session.close(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java index 0b941601b6..73ae0d6e60 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/collection/norevision/AbstractCollectionChangeTest.java @@ -54,13 +54,13 @@ public abstract class AbstractCollectionChangeTest extends BaseEnversFunctionalT Name n = new Name(); n.setName( "name1" ); p.getNames().add( n ); - session.saveOrUpdate( p ); + session.persist( p ); session.getTransaction().commit(); // Rev 2 session.getTransaction().begin(); n.setName( "Changed name" ); - session.saveOrUpdate( p ); + session.merge( p ); session.getTransaction().commit(); // Rev 3 @@ -79,8 +79,8 @@ public abstract class AbstractCollectionChangeTest extends BaseEnversFunctionalT parent.setName( "P1" ); child1.setParent( parent ); parent.getChildren().add( child1 ); - session.saveOrUpdate( child1 ); - session.saveOrUpdate( parent ); + session.persist( child1 ); + session.persist( parent ); session.getTransaction().commit(); // Rev 5 @@ -88,8 +88,8 @@ public abstract class AbstractCollectionChangeTest extends BaseEnversFunctionalT Child child2 = new Child(); parent.getChildren().add( child2 ); child2.setParent( parent ); - session.saveOrUpdate( child2 ); - session.saveOrUpdate( parent ); + session.persist( child2 ); + session.persist( parent ); session.getTransaction().commit(); parentId = parent.getId(); @@ -98,13 +98,13 @@ public abstract class AbstractCollectionChangeTest extends BaseEnversFunctionalT session.getTransaction().begin(); House house = new House(); house.getColors().add( "Red" ); - session.saveOrUpdate( house ); + session.persist( house ); session.getTransaction().commit(); // Rev 7 session.getTransaction().begin(); house.getColors().add( "Blue" ); - session.saveOrUpdate( house ); + session.merge( house ); session.getTransaction().commit(); houseId = house.getId(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentTest.java index f1c74decf3..04483519de 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/AuditedDynamicComponentTest.java @@ -23,7 +23,7 @@ import org.hibernate.orm.test.envers.Priority; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.ServiceRegistryBuilder; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import junit.framework.Assert; @@ -31,7 +31,7 @@ import junit.framework.Assert; * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) * @author Lukasz Zuchowski (author at zuchos dot com) */ -@TestForIssue(jiraKey = "HHH-8049") +@JiraKey("HHH-8049") public class AuditedDynamicComponentTest extends BaseEnversFunctionalTestCase { @Override @@ -78,7 +78,7 @@ public class AuditedDynamicComponentTest extends BaseEnversFunctionalTestCase { // Revision 1 session.getTransaction().begin(); - session.save( simpleEntity ); + session.persist( simpleEntity ); session.getTransaction().commit(); // Revision 2 @@ -88,44 +88,44 @@ public class AuditedDynamicComponentTest extends BaseEnversFunctionalTestCase { entity.getCustomFields().put( "prop2", 0.1f ); entity.getCustomFields().put( "prop3", simpleEntity ); entity.getCustomFields().put( "prop4", true ); - session.save( entity ); + session.persist( entity ); session.getTransaction().commit(); // revision 3 session.getTransaction().begin(); SimpleEntity simpleEntity2 = new SimpleEntity( 2L, "Not so simple entity" ); - session.save( simpleEntity2 ); - entity = (AuditedDynamicComponentEntity) session.get( AuditedDynamicComponentEntity.class, entity.getId() ); + session.persist( simpleEntity2 ); + entity = session.get( AuditedDynamicComponentEntity.class, entity.getId() ); entity.getCustomFields().put( "prop3", simpleEntity2 ); - session.update( entity ); + session.merge( entity ); session.getTransaction().commit(); // Revision 4 session.getTransaction().begin(); - entity = (AuditedDynamicComponentEntity) session.get( AuditedDynamicComponentEntity.class, entity.getId() ); + entity = session.get( AuditedDynamicComponentEntity.class, entity.getId() ); entity.getCustomFields().put( "prop1", 2 ); entity.getCustomFields().put( "prop4", false ); - session.update( entity ); + session.merge( entity ); session.getTransaction().commit(); // Revision 5 session.getTransaction().begin(); - entity = (AuditedDynamicComponentEntity) session.load( AuditedDynamicComponentEntity.class, entity.getId() ); + entity = session.getReference( AuditedDynamicComponentEntity.class, entity.getId() ); entity.getCustomFields().remove( "prop2" ); - session.update( entity ); + session.merge( entity ); session.getTransaction().commit(); // Revision 6 session.getTransaction().begin(); - entity = (AuditedDynamicComponentEntity) session.load( AuditedDynamicComponentEntity.class, entity.getId() ); + entity = session.getReference( AuditedDynamicComponentEntity.class, entity.getId() ); entity.getCustomFields().clear(); - session.update( entity ); + session.merge( entity ); session.getTransaction().commit(); // Revision 7 session.getTransaction().begin(); - entity = (AuditedDynamicComponentEntity) session.load( AuditedDynamicComponentEntity.class, entity.getId() ); - session.delete( entity ); + entity = session.getReference( AuditedDynamicComponentEntity.class, entity.getId() ); + session.remove( entity ); session.getTransaction().commit(); session.close(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicComponentTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicComponentTest.java index eaa82ab9a1..115e67664a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicComponentTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/components/dynamic/NotAuditedDynamicComponentTest.java @@ -12,14 +12,14 @@ import org.hibernate.Session; import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.junit.Test; import junit.framework.Assert; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -@TestForIssue(jiraKey = "HHH-8049") +@JiraKey("HHH-8049") public class NotAuditedDynamicComponentTest extends BaseEnversFunctionalTestCase { @Override protected String[] getMappings() { @@ -36,27 +36,27 @@ public class NotAuditedDynamicComponentTest extends BaseEnversFunctionalTestCase NotAuditedDynamicMapComponent entity = new NotAuditedDynamicMapComponent( 1L, "static field value" ); entity.getCustomFields().put( "prop1", 13 ); entity.getCustomFields().put( "prop2", 0.1f ); - session.save( entity ); + session.persist( entity ); session.getTransaction().commit(); // No revision session.getTransaction().begin(); - entity = (NotAuditedDynamicMapComponent) session.get( NotAuditedDynamicMapComponent.class, entity.getId() ); + entity = session.get( NotAuditedDynamicMapComponent.class, entity.getId() ); entity.getCustomFields().put( "prop1", 0 ); - session.update( entity ); + session.merge( entity ); session.getTransaction().commit(); // Revision 2 session.getTransaction().begin(); - entity = (NotAuditedDynamicMapComponent) session.get( NotAuditedDynamicMapComponent.class, entity.getId() ); + entity = session.get( NotAuditedDynamicMapComponent.class, entity.getId() ); entity.setNote( "updated note" ); - session.update( entity ); + session.merge( entity ); session.getTransaction().commit(); // Revision 3 session.getTransaction().begin(); - entity = (NotAuditedDynamicMapComponent) session.load( NotAuditedDynamicMapComponent.class, entity.getId() ); - session.delete( entity ); + entity = session.getReference( NotAuditedDynamicMapComponent.class, entity.getId() ); + session.remove( entity ); session.getTransaction().commit(); session.close(); 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 4669dae2ae..6267f945c7 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 @@ -40,10 +40,10 @@ public class SanityCheckTest extends BaseEnversFunctionalTestCase { PlainEntity plainEntity = getPlainEntity( manyToOne, manyToMany, oneToOne ); - session.save( manyToMany ); - session.save( manyToOne ); - session.save( oneToOne ); - session.save( plainEntity ); + session.persist( manyToMany ); + session.persist( manyToOne ); + session.persist( oneToOne ); + session.persist( plainEntity ); session.getTransaction().commit(); session.getTransaction().begin(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java index 6635e05115..6e6bfff8df 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/manytoone/DetachedUpdateTest.java @@ -21,7 +21,7 @@ import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.junit.Assert.assertEquals; @@ -32,7 +32,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11859") +@JiraKey("HHH-11859") public class DetachedUpdateTest extends BaseEnversFunctionalTestCase { private Bank bank1; private Bank bank2; @@ -50,24 +50,24 @@ public class DetachedUpdateTest extends BaseEnversFunctionalTestCase { doInHibernate( this::sessionFactory, session -> { bank1 = new Bank(); bank1.setDescription( "Bank of Italy" ); - session.save( bank1 ); + session.persist( bank1 ); bank2 = new Bank(); bank2.setDescription( "Bradesco Bank" ); - session.save( bank2 ); + session.persist( bank2 ); contact = new BankContact(); contact.setBank( bank1 ); contact.setPhoneNumber( "1234" ); contact.setName( "Test" ); - session.save( contact ); + session.persist( contact ); } ); // Revision 2 doInHibernate( this::sessionFactory, session -> { contact.setName( "Other" ); contact.setBank( bank2 ); - session.update( contact ); + session.merge( contact ); } ); // Revision 3 @@ -75,8 +75,8 @@ public class DetachedUpdateTest extends BaseEnversFunctionalTestCase { // within the same transaction to make sure the audit history flushes properly. doInHibernate( this::sessionFactory, session -> { contact.setBank( bank1 ); - session.delete( bank2 ); - session.update( contact ); + session.remove( bank2 ); + session.merge( contact ); } ); } diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java index 7c401b2f21..ab8fb2fa03 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/merge/AddDelTest.java @@ -40,17 +40,17 @@ public class AddDelTest extends BaseEnversFunctionalTestCase { // Revision 2 session.getTransaction().begin(); session.persist( new StrTestEntity( "another data" ) ); // Just to create second revision. - entity = (GivenIdStrEntity) session.get( GivenIdStrEntity.class, 1 ); - session.delete( entity ); // First try to remove the entity. - session.save( entity ); // Then save it. + entity = session.get( GivenIdStrEntity.class, 1 ); + session.remove( entity ); // First try to remove the entity. + session.persist( entity ); // Then save it. session.getTransaction().commit(); // Revision 3 session.getTransaction().begin(); - entity = (GivenIdStrEntity) session.get( GivenIdStrEntity.class, 1 ); - session.delete( entity ); // First try to remove the entity. + entity = session.get( GivenIdStrEntity.class, 1 ); + session.remove( entity ); // First try to remove the entity. entity.setData( "modified data" ); // Then change it's state. - session.save( entity ); // Finally save it. + session.persist( entity ); // Finally save it. session.getTransaction().commit(); session.close(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java index e80517cd3f..4cb2665dc9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/modifiedflags/DetachedEntityTest.java @@ -19,7 +19,7 @@ import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; import org.junit.Test; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import static org.junit.Assert.assertEquals; @@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals; * * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-8973") +@JiraKey("HHH-8973") public class DetachedEntityTest extends BaseEnversFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { @@ -55,7 +55,7 @@ public class DetachedEntityTest extends BaseEnversFunctionalTestCase { for( int i = 0; i < 5; ++i ) { s.getTransaction().begin(); project.setName( "fooName" + ( i + 2 ) ); - s.update( project ); + s.merge( project ); s.getTransaction().commit(); s.clear(); } diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java index fe36b824b5..12326f905a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/onetomany/detached/DetachedTest.java @@ -40,9 +40,9 @@ public class DetachedTest extends BaseEnversFunctionalTestCase { session.getTransaction().begin(); ListRefCollEntity parent = new ListRefCollEntity( 1, "initial data" ); StrTestEntity child = new StrTestEntity( "data" ); - session.save( child ); + session.persist( child ); parent.setCollection( Arrays.asList( child ) ); - session.save( parent ); + session.persist( parent ); session.getTransaction().commit(); session.close(); @@ -51,7 +51,7 @@ public class DetachedTest extends BaseEnversFunctionalTestCase { // Revision 2 - updating detached entity session.getTransaction().begin(); parent.setData( "modified data" ); - session.update( parent ); + session.merge( parent ); session.getTransaction().commit(); session.close(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java index 2f5f4cb260..24878eac92 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/query/AssociationRevisionsOfEntitiesQueryTest.java @@ -25,11 +25,12 @@ import org.hibernate.orm.test.envers.Priority; import org.junit.Test; import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; /** * @author Chris Cranford */ -@TestForIssue( jiraKey = "HHH-13817" ) +@JiraKey( "HHH-13817" ) public class AssociationRevisionsOfEntitiesQueryTest extends BaseEnversFunctionalTestCase { @Override protected Class[] getAnnotatedClasses() { @@ -42,11 +43,11 @@ public class AssociationRevisionsOfEntitiesQueryTest extends BaseEnversFunctiona doInHibernate( this::sessionFactory, session -> { final TemplateType type1 = new TemplateType( 1, "Type1" ); final TemplateType type2 = new TemplateType( 2, "Type2" ); - session.save( type1 ); - session.save( type2 ); + session.persist( type1 ); + session.persist( type2 ); final Template template = new Template( 1, "Template1", type1 ); - session.save( template ); + session.persist( template ); } ); doInHibernate( this::sessionFactory, session -> { @@ -54,7 +55,7 @@ public class AssociationRevisionsOfEntitiesQueryTest extends BaseEnversFunctiona final Template template = session.find( Template.class, 1 ); template.setName( "Template1-Updated" ); template.setTemplateType( type ); - session.update( template ); + session.merge( template ); } ); doInHibernate( this::sessionFactory, session -> { diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java index 59e4da60cc..9c29c51e0f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/tools/SchemaExportTest.java @@ -36,7 +36,7 @@ public class SchemaExportTest extends BaseEnversFunctionalTestCase { Session session = getSession(); session.getTransaction().begin(); StrTestEntity entity = new StrTestEntity( "data" ); - session.save( entity ); + session.persist( entity ); session.getTransaction().commit(); id = entity.getId(); diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/update/SelectBeforeUpdateTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/update/SelectBeforeUpdateTest.java index e761ffb8c8..9a40d24d3d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/update/SelectBeforeUpdateTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/update/SelectBeforeUpdateTest.java @@ -15,7 +15,7 @@ import org.hibernate.annotations.SelectBeforeUpdate; import org.hibernate.envers.Audited; import org.hibernate.orm.test.envers.BaseEnversFunctionalTestCase; import org.hibernate.orm.test.envers.Priority; -import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.orm.junit.JiraKey; import org.hibernate.testing.transaction.TransactionUtil; import org.junit.Test; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals; /** * @author Chris Cranford */ -@TestForIssue(jiraKey = "HHH-11056") +@JiraKey("HHH-11056") public class SelectBeforeUpdateTest extends BaseEnversFunctionalTestCase { @Override @@ -40,13 +40,13 @@ public class SelectBeforeUpdateTest extends BaseEnversFunctionalTestCase { // Revision 1 - insert new entities. TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.save( author ); - session.save( book ); + session.persist( author ); + session.persist( book ); } ); // Revision 2 - update detached with no changes. TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.update( book ); + session.merge( book ); } ); } @@ -58,14 +58,14 @@ public class SelectBeforeUpdateTest extends BaseEnversFunctionalTestCase { // Revision 1 - insert new entities. TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.save( author ); - session.save( book ); + session.persist( author ); + session.persist( book ); } ); // Revision 2 - update detached with changes. TransactionUtil.doInHibernate( this::sessionFactory, session -> { book.setName( "Book2Updated" ); - session.update( book ); + session.merge( book ); } ); } @@ -77,19 +77,19 @@ public class SelectBeforeUpdateTest extends BaseEnversFunctionalTestCase { // Revision 1 - insert new entities. TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.save( author ); - session.save( book ); + session.persist( author ); + session.persist( book ); } ); // Revision 2 - update detached with no changes. TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.update( book ); + session.merge( book ); } ); // Revision 3 - update detached with changes. TransactionUtil.doInHibernate( this::sessionFactory, session -> { book.setName( "Book3Updated" ); - session.update( book ); + session.merge( book ); } ); } @@ -101,19 +101,19 @@ public class SelectBeforeUpdateTest extends BaseEnversFunctionalTestCase { // Revision 1 - insert new entities. TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.save( author ); - session.save( book ); + session.persist( author ); + session.persist( book ); } ); // Revision 2 - update detached with changes. TransactionUtil.doInHibernate( this::sessionFactory, session -> { book.setName( "Book4Updated" ); - session.update( book ); + session.merge( book ); } ); // Revision 3 - update detached with no changes. TransactionUtil.doInHibernate( this::sessionFactory, session -> { - session.update( book ); + session.merge( book ); } ); } diff --git a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java index 6816398002..b2cdad4e05 100644 --- a/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java +++ b/hibernate-integrationtest-java-modules/src/test/java/org/hibernate/orm/integrationtest/java/module/test/service/AuthorService.java @@ -36,7 +36,7 @@ public class AuthorService implements AutoCloseable { Author entity = new Author(); entity.setName( name ); entity.setFavoriteNumber( favoriteNumber ); - session.save( entity ); + session.persist( entity ); session.getTransaction().commit(); } catch (Throwable e) { diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java index d1f2a0ac88..84ce207c8d 100644 --- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java +++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java @@ -93,7 +93,7 @@ public class HibernateCacheTest extends BaseFunctionalTest { // cleanup s = sessionFactory().openSession(); t = s.beginTransaction(); - s.delete( i ); + s.remove( i ); t.commit(); s.close(); } @@ -115,7 +115,7 @@ public class HibernateCacheTest extends BaseFunctionalTest { VersionedItem item = new VersionedItem(); item.setName( "steve" ); item.setDescription( "steve's item" ); - s.save( item ); + s.persist( item ); txn.commit(); s.close(); @@ -127,7 +127,7 @@ public class HibernateCacheTest extends BaseFunctionalTest { try { s = sessionFactory().openSession(); txn = s.beginTransaction(); - s.update( item ); + s.merge( item ); txn.commit(); s.close(); fail( "expected stale write to fail" ); @@ -191,8 +191,8 @@ public class HibernateCacheTest extends BaseFunctionalTest { // cleanup s = sessionFactory().openSession(); txn = s.beginTransaction(); - item = s.load( VersionedItem.class, item.getId() ); - s.delete( item ); + item = s.getReference( VersionedItem.class, item.getId() ); + s.remove( item ); txn.commit(); s.close(); diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/InsertedDataTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/InsertedDataTest.java index 1fea3bfeee..a9b9550dcf 100644 --- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/InsertedDataTest.java +++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/InsertedDataTest.java @@ -91,7 +91,7 @@ public class InsertedDataTest { sessionFactory, s -> { CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); } ); @@ -108,7 +108,7 @@ public class InsertedDataTest { sessionFactory, s -> { CacheableEmbeddedIdItem item = new CacheableEmbeddedIdItem( new PK( 2l ), "data" ); - s.save( item ); + s.persist( item ); } ); @@ -124,7 +124,7 @@ public class InsertedDataTest { sessionFactory, s -> { CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.getTransaction().markRollbackOnly(); } @@ -142,7 +142,7 @@ public class InsertedDataTest { sessionFactory, s -> { CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); item.setName( "new data" ); } @@ -161,7 +161,7 @@ public class InsertedDataTest { sessionFactory, s -> { CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); item.setName( "new data" ); s.getTransaction().markRollbackOnly(); @@ -180,7 +180,7 @@ public class InsertedDataTest { sessionFactory, s -> { CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.refresh( item ); } @@ -199,7 +199,7 @@ public class InsertedDataTest { sessionFactory, s -> { CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.refresh( item ); s.getTransaction().markRollbackOnly(); @@ -243,7 +243,7 @@ public class InsertedDataTest { sessionFactory, s -> { CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.clear(); } @@ -261,7 +261,7 @@ public class InsertedDataTest { sessionFactory, s -> { CacheableEmbeddedIdItem item = new CacheableEmbeddedIdItem( new PK( 2l ), "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.clear(); } @@ -279,7 +279,7 @@ public class InsertedDataTest { sessionFactory, s -> { CacheableItem item = new CacheableItem( "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.clear(); item = s.get( CacheableItem.class, item.getId() ); @@ -307,7 +307,7 @@ public class InsertedDataTest { sessionFactory, s -> { CacheableEmbeddedIdItem item = new CacheableEmbeddedIdItem( new PK( 2l ), "data" ); - s.save( item ); + s.persist( item ); s.flush(); s.clear(); item = s.get( CacheableEmbeddedIdItem.class, item.getId() ); diff --git a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java index e058df893a..fe40bfbd06 100644 --- a/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java +++ b/hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java @@ -190,10 +190,10 @@ public class RefreshUpdatedDataTest { inTransaction( sessionFactory, s -> { - s.delete( s.getReference( ReadWriteCacheableItem.class, 1L ) ); - s.delete( s.getReference( ReadWriteVersionedCacheableItem.class, 1L ) ); - s.delete( s.getReference( NonStrictReadWriteCacheableItem.class, 1L ) ); - s.delete( s.getReference( NonStrictReadWriteVersionedCacheableItem.class, 1L ) ); + s.remove( s.getReference( ReadWriteCacheableItem.class, 1L ) ); + s.remove( s.getReference( ReadWriteVersionedCacheableItem.class, 1L ) ); + s.remove( s.getReference( NonStrictReadWriteCacheableItem.class, 1L ) ); + s.remove( s.getReference( NonStrictReadWriteVersionedCacheableItem.class, 1L ) ); } ); } 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 ae8d09e99e..caf3c4926d 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 @@ -53,10 +53,10 @@ public class EventManager { theEvent.setDate(theDate); theEvent.setOrganizer(organizer); - Long eventId = (Long)session.save(theEvent); + session.persist( theEvent ); session.getTransaction().commit(); - return eventId; + return theEvent.getId(); } public Long createAndStorePerson(String firstName, String lastName) { @@ -69,10 +69,10 @@ public class EventManager { person.setFirstname(firstName); person.setLastname(lastName); - Long personId = (Long)session.save(person); + session.persist(person); session.getTransaction().commit(); - return personId; + return person.getId(); } public Long createAndStorePerson(Person person) { @@ -81,10 +81,10 @@ public class EventManager { session.beginTransaction(); - Long personId = (Long)session.save(person); + session.persist(person); session.getTransaction().commit(); - return personId; + return person.getId(); } public List listEvents() { @@ -178,10 +178,10 @@ public class EventManager { Person aPerson = (Person)session.load(Person.class, personId); account.setPerson(aPerson); - Long accountId = (Long)session.save(account); + session.persist(account); session.getTransaction().commit(); - return accountId; + return account.getId(); } public Account getAccount(Long accountId) { @@ -238,16 +238,16 @@ public class EventManager { // delete all existing calendars List calendars = session.createQuery("from HolidayCalendar").setCacheable(true).list(); for (ListIterator li = calendars.listIterator(); li.hasNext(); ) { - session.delete(li.next()); + session.remove(li.next()); } HolidayCalendar calendar = new HolidayCalendar(); calendar.init(); - Long calendarId = (Long)session.save(calendar); + session.persist(calendar); session.getTransaction().commit(); - return calendarId; + return calendar.getId(); } public HolidayCalendar getHolidayCalendar() { diff --git a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java index 0b32d78f94..fa4bee9a05 100644 --- a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java +++ b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerCacheStatisticsTest.java @@ -144,7 +144,7 @@ public class MicrometerCacheStatisticsTest extends BaseNonConfigCoreFunctionalTe Session session = openSession(); session.beginTransaction(); Person person = new Person( 1, "testAcct"); - session.save( person ); + session.persist( person ); session.getTransaction().commit(); session.close(); @@ -171,7 +171,7 @@ public class MicrometerCacheStatisticsTest extends BaseNonConfigCoreFunctionalTe // clean up session = openSession(); session.beginTransaction(); - session.delete( person ); + session.remove( person ); session.getTransaction().commit(); session.close(); diff --git a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerStatisticsTest.java b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerStatisticsTest.java index 43965841e1..2fbc27c655 100644 --- a/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerStatisticsTest.java +++ b/hibernate-micrometer/src/test/java/org/hibernate/test/stat/MicrometerStatisticsTest.java @@ -115,7 +115,7 @@ public class MicrometerStatisticsTest extends BaseCoreFunctionalTestCase { Session session = openSession(); session.beginTransaction(); Account account = new Account( new AccountId( 1), "testAcct"); - session.save( account ); + session.persist( account ); session.getTransaction().commit(); session.close(); @@ -127,7 +127,7 @@ public class MicrometerStatisticsTest extends BaseCoreFunctionalTestCase { // clean up session = openSession(); session.beginTransaction(); - session.delete( account ); + session.remove( account ); session.getTransaction().commit(); session.close(); diff --git a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/StoreAndRetrieveTests.java b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/StoreAndRetrieveTests.java index 83bfb15332..1ed606c02e 100644 --- a/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/StoreAndRetrieveTests.java +++ b/hibernate-spatial/src/test/java/org/hibernate/spatial/integration/StoreAndRetrieveTests.java @@ -83,7 +83,7 @@ public class StoreAndRetrieveTests extends SpatialSessionFactoryAware { for ( TestDataElement element : testData ) { GeomEntityLike entity = createFrom( element, entityClass, session.getJdbcServices().getDialect() ); stored.put( entity.getId(), entity ); - session.save( entity ); + session.persist( entity ); } } @@ -100,7 +100,7 @@ public class StoreAndRetrieveTests extends SpatialSessionFactoryAware { GeomEntity entity = new GeomEntity(); entity.setId( 1 ); entity.setType( "NULL Test" ); - session.save( entity ); + session.persist( entity ); } private void retrieveAndCompareNullGeometry(SessionImplementor session) { diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java index e10debcb29..adaa64cc5f 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseNonConfigCoreFunctionalTestCase.java @@ -501,7 +501,7 @@ public class BaseNonConfigCoreFunctionalTestCase extends BaseUnitTestCase { protected void cleanupTestData() throws Exception { doInHibernate(this::sessionFactory, s -> { - s.createQuery( "from java.lang.Object" ).getResultList().forEach( s::delete ); + s.createQuery( "from java.lang.Object" ).getResultList().forEach( s::remove ); }); }