HHH-8159 - Apply fixups indicated by analysis tools
This commit is contained in:
parent
fe9e2798de
commit
a1d190d674
|
@ -247,7 +247,7 @@ public class BulkOperationCleanupAction implements Executable, Serializable {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private class NaturalIdCleanup implements Serializable {
|
private static class NaturalIdCleanup implements Serializable {
|
||||||
private final NaturalIdRegionAccessStrategy naturalIdCacheAccessStrategy;
|
private final NaturalIdRegionAccessStrategy naturalIdCacheAccessStrategy;
|
||||||
private final SoftLock cacheLock;
|
private final SoftLock cacheLock;
|
||||||
|
|
||||||
|
|
|
@ -561,7 +561,7 @@ public abstract class AbstractQueryImpl implements Query {
|
||||||
}
|
}
|
||||||
|
|
||||||
public Query setCharacter(int position, char val) {
|
public Query setCharacter(int position, char val) {
|
||||||
setParameter(position, new Character(val), StandardBasicTypes.CHARACTER);
|
setParameter( position, Character.valueOf( val ), StandardBasicTypes.CHARACTER );
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -129,8 +129,8 @@ public class OracleJoinFragment extends JoinFragment {
|
||||||
StringBuilder buf = new StringBuilder( on );
|
StringBuilder buf = new StringBuilder( on );
|
||||||
for ( int i = 0; i < buf.length(); i++ ) {
|
for ( int i = 0; i < buf.length(); i++ ) {
|
||||||
char character = buf.charAt( i );
|
char character = buf.charAt( i );
|
||||||
boolean isInsertPoint = OPERATORS.contains( new Character( character ) ) ||
|
final boolean isInsertPoint = OPERATORS.contains( Character.valueOf( character ) )
|
||||||
( character == ' ' && buf.length() > i + 3 && "is ".equals( buf.substring( i + 1, i + 4 ) ) );
|
|| ( character == ' ' && buf.length() > i + 3 && "is ".equals( buf.substring( i + 1, i + 4 ) ) );
|
||||||
if ( isInsertPoint ) {
|
if ( isInsertPoint ) {
|
||||||
buf.insert( i, "(+)" );
|
buf.insert( i, "(+)" );
|
||||||
i += 3;
|
i += 3;
|
||||||
|
@ -142,8 +142,8 @@ public class OracleJoinFragment extends JoinFragment {
|
||||||
private static final Set OPERATORS = new HashSet();
|
private static final Set OPERATORS = new HashSet();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
OPERATORS.add( new Character( '=' ) );
|
OPERATORS.add( Character.valueOf( '=' ) );
|
||||||
OPERATORS.add( new Character( '<' ) );
|
OPERATORS.add( Character.valueOf( '<' ) );
|
||||||
OPERATORS.add( new Character( '>' ) );
|
OPERATORS.add( Character.valueOf( '>' ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -135,7 +135,7 @@ public class Mocks {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( "hashCode".equals( methodName ) ) {
|
if ( "hashCode".equals( methodName ) ) {
|
||||||
return new Integer( this.hashCode() );
|
return Integer.valueOf( this.hashCode() );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( canThrowSQLException( method ) ) {
|
if ( canThrowSQLException( method ) ) {
|
||||||
|
|
|
@ -127,10 +127,10 @@ public class EventCacheTest extends BaseCoreFunctionalTestCase {
|
||||||
Map<Object,Object> input = new HashMap<Object,Object>();
|
Map<Object,Object> input = new HashMap<Object,Object>();
|
||||||
Object entity1 = new Simple( 1 );
|
Object entity1 = new Simple( 1 );
|
||||||
//
|
//
|
||||||
Object copy1 = new Integer( 2 );
|
Object copy1 = Integer.valueOf( 2 );
|
||||||
input.put(entity1, copy1);
|
input.put(entity1, copy1);
|
||||||
Object entity2 = new Simple( 3 );
|
Object entity2 = new Simple( 3 );
|
||||||
Object copy2 = new Integer( 2 );
|
Object copy2 = Integer.valueOf( 2 );
|
||||||
input.put(entity2, copy2);
|
input.put(entity2, copy2);
|
||||||
cache.putAll(input);
|
cache.putAll(input);
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
Session s = openSession();
|
Session s = openSession();
|
||||||
Transaction tx = s.beginTransaction();
|
Transaction tx = s.beginTransaction();
|
||||||
Flight firstOne = new Flight();
|
Flight firstOne = new Flight();
|
||||||
firstOne.setId( new Long( 1 ) );
|
firstOne.setId( Long.valueOf( 1 ) );
|
||||||
firstOne.setName( "AF3202" );
|
firstOne.setName( "AF3202" );
|
||||||
firstOne.setDuration( new Long( 1000000 ) );
|
firstOne.setDuration( new Long( 1000000 ) );
|
||||||
firstOne.setDurationInSec( 2000 );
|
firstOne.setDurationInSec( 2000 );
|
||||||
|
@ -74,11 +74,11 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
//read it
|
//read it
|
||||||
s = openSession();
|
s = openSession();
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
firstOne = (Flight) s.get( Flight.class, new Long( 1 ) );
|
firstOne = (Flight) s.get( Flight.class, Long.valueOf( 1 ) );
|
||||||
assertNotNull( firstOne );
|
assertNotNull( firstOne );
|
||||||
assertEquals( new Long( 1 ), firstOne.getId() );
|
assertEquals( Long.valueOf( 1 ), firstOne.getId() );
|
||||||
assertEquals( "AF3202", firstOne.getName() );
|
assertEquals( "AF3202", firstOne.getName() );
|
||||||
assertEquals( new Long( 1000000 ), firstOne.getDuration() );
|
assertEquals( Long.valueOf( 1000000 ), firstOne.getDuration() );
|
||||||
assertFalse( "Transient is not working", 2000l == firstOne.getDurationInSec() );
|
assertFalse( "Transient is not working", 2000l == firstOne.getDurationInSec() );
|
||||||
tx.commit();
|
tx.commit();
|
||||||
s.close();
|
s.close();
|
||||||
|
@ -90,9 +90,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
Session s = openSession();
|
Session s = openSession();
|
||||||
Transaction tx = s.beginTransaction();
|
Transaction tx = s.beginTransaction();
|
||||||
Flight firstOne = new Flight();
|
Flight firstOne = new Flight();
|
||||||
firstOne.setId( new Long( 1 ) );
|
firstOne.setId( Long.valueOf( 1 ) );
|
||||||
firstOne.setName( "AF3202" );
|
firstOne.setName( "AF3202" );
|
||||||
firstOne.setDuration( new Long( 1000000 ) );
|
firstOne.setDuration( Long.valueOf( 1000000 ) );
|
||||||
firstOne.setDurationInSec( 2000 );
|
firstOne.setDurationInSec( 2000 );
|
||||||
s.save( firstOne );
|
s.save( firstOne );
|
||||||
s.flush();
|
s.flush();
|
||||||
|
@ -103,7 +103,7 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
s = openSession();
|
s = openSession();
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
firstOne = new Flight();
|
firstOne = new Flight();
|
||||||
firstOne.setId( new Long( 1 ) );
|
firstOne.setId( Long.valueOf( 1 ) );
|
||||||
firstOne.setName( null );
|
firstOne.setName( null );
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -122,7 +122,7 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
s = openSession();
|
s = openSession();
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
firstOne = new Flight();
|
firstOne = new Flight();
|
||||||
firstOne.setId( new Long( 1 ) );
|
firstOne.setId( Long.valueOf( 1 ) );
|
||||||
firstOne.setName( "AF3202" );
|
firstOne.setName( "AF3202" );
|
||||||
firstOne.setTriggeredData( "should not be insertable" );
|
firstOne.setTriggeredData( "should not be insertable" );
|
||||||
tx.commit();
|
tx.commit();
|
||||||
|
@ -130,9 +130,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
|
|
||||||
s = openSession();
|
s = openSession();
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
firstOne = (Flight) s.get( Flight.class, new Long( 1 ) );
|
firstOne = (Flight) s.get( Flight.class, Long.valueOf( 1 ) );
|
||||||
assertNotNull( firstOne );
|
assertNotNull( firstOne );
|
||||||
assertEquals( new Long( 1 ), firstOne.getId() );
|
assertEquals( Long.valueOf( 1 ), firstOne.getId() );
|
||||||
assertEquals( "AF3202", firstOne.getName() );
|
assertEquals( "AF3202", firstOne.getName() );
|
||||||
assertFalse( "should not be insertable".equals( firstOne.getTriggeredData() ) );
|
assertFalse( "should not be insertable".equals( firstOne.getTriggeredData() ) );
|
||||||
firstOne.setName( "BA1234" );
|
firstOne.setName( "BA1234" );
|
||||||
|
@ -142,9 +142,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
|
|
||||||
s = openSession();
|
s = openSession();
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
firstOne = (Flight) s.get( Flight.class, new Long( 1 ) );
|
firstOne = (Flight) s.get( Flight.class, Long.valueOf( 1 ) );
|
||||||
assertNotNull( firstOne );
|
assertNotNull( firstOne );
|
||||||
assertEquals( new Long( 1 ), firstOne.getId() );
|
assertEquals( Long.valueOf( 1 ), firstOne.getId() );
|
||||||
assertEquals( "AF3202", firstOne.getName() );
|
assertEquals( "AF3202", firstOne.getName() );
|
||||||
assertFalse( "should not be updatable".equals( firstOne.getTriggeredData() ) );
|
assertFalse( "should not be updatable".equals( firstOne.getTriggeredData() ) );
|
||||||
tx.commit();
|
tx.commit();
|
||||||
|
@ -158,13 +158,13 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
s = openSession();
|
s = openSession();
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
Sky sky = new Sky();
|
Sky sky = new Sky();
|
||||||
sky.id = new Long( 2 );
|
sky.id = Long.valueOf( 2 );
|
||||||
sky.color = "blue";
|
sky.color = "blue";
|
||||||
sky.day = "monday";
|
sky.day = "monday";
|
||||||
sky.month = "January";
|
sky.month = "January";
|
||||||
|
|
||||||
Sky sameSky = new Sky();
|
Sky sameSky = new Sky();
|
||||||
sameSky.id = new Long( 3 );
|
sameSky.id = Long.valueOf( 3 );
|
||||||
sameSky.color = "blue";
|
sameSky.color = "blue";
|
||||||
sky.day = "tuesday";
|
sky.day = "tuesday";
|
||||||
sky.month = "January";
|
sky.month = "January";
|
||||||
|
@ -193,19 +193,19 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
s = openSession();
|
s = openSession();
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
Sky sky = new Sky();
|
Sky sky = new Sky();
|
||||||
sky.id = new Long( id++ );
|
sky.id = Long.valueOf( id++ );
|
||||||
sky.color = "green";
|
sky.color = "green";
|
||||||
sky.day = "monday";
|
sky.day = "monday";
|
||||||
sky.month = "March";
|
sky.month = "March";
|
||||||
|
|
||||||
Sky otherSky = new Sky();
|
Sky otherSky = new Sky();
|
||||||
otherSky.id = new Long( id++ );
|
otherSky.id = Long.valueOf( id++ );
|
||||||
otherSky.color = "red";
|
otherSky.color = "red";
|
||||||
otherSky.day = "friday";
|
otherSky.day = "friday";
|
||||||
otherSky.month = "March";
|
otherSky.month = "March";
|
||||||
|
|
||||||
Sky sameSky = new Sky();
|
Sky sameSky = new Sky();
|
||||||
sameSky.id = new Long( id++ );
|
sameSky.id = Long.valueOf( id++ );
|
||||||
sameSky.color = "green";
|
sameSky.color = "green";
|
||||||
sameSky.day = "monday";
|
sameSky.day = "monday";
|
||||||
sameSky.month = "March";
|
sameSky.month = "March";
|
||||||
|
@ -239,9 +239,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
Session s = openSession();
|
Session s = openSession();
|
||||||
Transaction tx = s.beginTransaction();
|
Transaction tx = s.beginTransaction();
|
||||||
Flight firstOne = new Flight();
|
Flight firstOne = new Flight();
|
||||||
firstOne.setId( new Long( 2 ) );
|
firstOne.setId( Long.valueOf( 2 ) );
|
||||||
firstOne.setName( "AF3202" );
|
firstOne.setName( "AF3202" );
|
||||||
firstOne.setDuration( new Long( 500 ) );
|
firstOne.setDuration( Long.valueOf( 500 ) );
|
||||||
s.save( firstOne );
|
s.save( firstOne );
|
||||||
s.flush();
|
s.flush();
|
||||||
tx.commit();
|
tx.commit();
|
||||||
|
@ -250,15 +250,15 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
//read it
|
//read it
|
||||||
s = openSession();
|
s = openSession();
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
firstOne = (Flight) s.get( Flight.class, new Long( 2 ) );
|
firstOne = (Flight) s.get( Flight.class, Long.valueOf( 2 ) );
|
||||||
tx.commit();
|
tx.commit();
|
||||||
s.close();
|
s.close();
|
||||||
|
|
||||||
//read it again
|
//read it again
|
||||||
s = openSession();
|
s = openSession();
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
Flight concurrentOne = (Flight) s.get( Flight.class, new Long( 2 ) );
|
Flight concurrentOne = (Flight) s.get( Flight.class, Long.valueOf( 2 ) );
|
||||||
concurrentOne.setDuration( new Long( 1000 ) );
|
concurrentOne.setDuration( Long.valueOf( 1000 ) );
|
||||||
s.update( concurrentOne );
|
s.update( concurrentOne );
|
||||||
tx.commit();
|
tx.commit();
|
||||||
s.close();
|
s.close();
|
||||||
|
@ -290,22 +290,22 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
s = openSession();
|
s = openSession();
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
Sky sky = new Sky();
|
Sky sky = new Sky();
|
||||||
sky.id = new Long( 1 );
|
sky.id = Long.valueOf( 1 );
|
||||||
sky.color = "black";
|
sky.color = "black";
|
||||||
Sky.area = "Paris";
|
sky.area = "Paris";
|
||||||
sky.day = "23";
|
sky.day = "23";
|
||||||
sky.month = "1";
|
sky.month = "1";
|
||||||
s.save( sky );
|
s.save( sky );
|
||||||
tx.commit();
|
tx.commit();
|
||||||
s.close();
|
s.close();
|
||||||
Sky.area = "London";
|
sky.area = "London";
|
||||||
|
|
||||||
s = openSession();
|
s = openSession();
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
sky = (Sky) s.get( Sky.class, sky.id );
|
sky = (Sky) s.get( Sky.class, sky.id );
|
||||||
assertNotNull( sky );
|
assertNotNull( sky );
|
||||||
assertEquals( "black", sky.color );
|
assertEquals( "black", sky.color );
|
||||||
assertFalse( "Paris".equals( Sky.area ) );
|
assertFalse( "Paris".equals( sky.area ) );
|
||||||
tx.commit();
|
tx.commit();
|
||||||
s.close();
|
s.close();
|
||||||
}
|
}
|
||||||
|
@ -336,9 +336,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
Session s = openSession();
|
Session s = openSession();
|
||||||
Transaction tx = s.beginTransaction();
|
Transaction tx = s.beginTransaction();
|
||||||
Flight airFrance = new Flight();
|
Flight airFrance = new Flight();
|
||||||
airFrance.setId( new Long( 747 ) );
|
airFrance.setId( Long.valueOf( 747 ) );
|
||||||
airFrance.setName( "Paris-Amsterdam" );
|
airFrance.setName( "Paris-Amsterdam" );
|
||||||
airFrance.setDuration( new Long( 10 ) );
|
airFrance.setDuration( Long.valueOf( 10 ) );
|
||||||
airFrance.setFactor( 25 );
|
airFrance.setFactor( 25 );
|
||||||
s.persist( airFrance );
|
s.persist( airFrance );
|
||||||
tx.commit();
|
tx.commit();
|
||||||
|
@ -348,7 +348,7 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
tx = s.beginTransaction();
|
tx = s.beginTransaction();
|
||||||
airFrance = (Flight) s.get( Flight.class, airFrance.getId() );
|
airFrance = (Flight) s.get( Flight.class, airFrance.getId() );
|
||||||
assertNotNull( airFrance );
|
assertNotNull( airFrance );
|
||||||
assertEquals( new Long( 10 ), airFrance.getDuration() );
|
assertEquals( Long.valueOf( 10 ), airFrance.getDuration() );
|
||||||
assertFalse( 25 == airFrance.getFactor( false ) );
|
assertFalse( 25 == airFrance.getFactor( false ) );
|
||||||
s.delete( airFrance );
|
s.delete( airFrance );
|
||||||
tx.commit();
|
tx.commit();
|
||||||
|
@ -360,9 +360,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
Session s = openSession();
|
Session s = openSession();
|
||||||
Transaction tx = s.beginTransaction();
|
Transaction tx = s.beginTransaction();
|
||||||
Flight airFrance = new Flight();
|
Flight airFrance = new Flight();
|
||||||
airFrance.setId( new Long( 747 ) );
|
airFrance.setId( Long.valueOf( 747 ) );
|
||||||
airFrance.setName( "Paris-Amsterdam" );
|
airFrance.setName( "Paris-Amsterdam" );
|
||||||
airFrance.setDuration( new Long( 10 ) );
|
airFrance.setDuration( Long.valueOf( 10 ) );
|
||||||
airFrance.setDepartureDate( new Date( 05, 06, 21, 10, 0, 0 ) );
|
airFrance.setDepartureDate( new Date( 05, 06, 21, 10, 0, 0 ) );
|
||||||
airFrance.setAlternativeDepartureDate( new GregorianCalendar( 2006, 02, 03, 10, 00 ) );
|
airFrance.setAlternativeDepartureDate( new GregorianCalendar( 2006, 02, 03, 10, 00 ) );
|
||||||
airFrance.getAlternativeDepartureDate().setTimeZone( TimeZone.getTimeZone( "GMT" ) );
|
airFrance.getAlternativeDepartureDate().setTimeZone( TimeZone.getTimeZone( "GMT" ) );
|
||||||
|
@ -394,7 +394,7 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
|
||||||
Session s = openSession();
|
Session s = openSession();
|
||||||
Transaction tx = s.beginTransaction();
|
Transaction tx = s.beginTransaction();
|
||||||
Flight airFrance = new Flight();
|
Flight airFrance = new Flight();
|
||||||
airFrance.setId( new Long( 747 ) );
|
airFrance.setId( Long.valueOf( 747 ) );
|
||||||
airFrance.setName( "Paris-Amsterdam" );
|
airFrance.setName( "Paris-Amsterdam" );
|
||||||
airFrance.setDuration( null );
|
airFrance.setDuration( null );
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -23,5 +23,5 @@ public class Sky implements Serializable {
|
||||||
protected String day;
|
protected String day;
|
||||||
@Column(name = "MONTH", nullable = false)
|
@Column(name = "MONTH", nullable = false)
|
||||||
protected String month;
|
protected String month;
|
||||||
static protected String area;
|
protected String area;
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,8 +63,8 @@ public class CollectionElementTest extends BaseCoreFunctionalTestCase {
|
||||||
boy.setLastName( "Doe" );
|
boy.setLastName( "Doe" );
|
||||||
boy.getNickNames().add( "Johnny" );
|
boy.getNickNames().add( "Johnny" );
|
||||||
boy.getNickNames().add( "Thing" );
|
boy.getNickNames().add( "Thing" );
|
||||||
boy.getScorePerNickName().put( "Johnny", new Integer( 3 ) );
|
boy.getScorePerNickName().put( "Johnny", Integer.valueOf( 3 ) );
|
||||||
boy.getScorePerNickName().put( "Thing", new Integer( 5 ) );
|
boy.getScorePerNickName().put( "Thing", Integer.valueOf( 5 ) );
|
||||||
int[] favNbrs = new int[4];
|
int[] favNbrs = new int[4];
|
||||||
for (int index = 0; index < favNbrs.length - 1; index++) {
|
for (int index = 0; index < favNbrs.length - 1; index++) {
|
||||||
favNbrs[index] = index * 3;
|
favNbrs[index] = index * 3;
|
||||||
|
@ -87,7 +87,7 @@ public class CollectionElementTest extends BaseCoreFunctionalTestCase {
|
||||||
assertTrue( boy.getNickNames().contains( "Thing" ) );
|
assertTrue( boy.getNickNames().contains( "Thing" ) );
|
||||||
assertNotNull( boy.getScorePerNickName() );
|
assertNotNull( boy.getScorePerNickName() );
|
||||||
assertTrue( boy.getScorePerNickName().containsKey( "Thing" ) );
|
assertTrue( boy.getScorePerNickName().containsKey( "Thing" ) );
|
||||||
assertEquals( new Integer( 5 ), boy.getScorePerNickName().get( "Thing" ) );
|
assertEquals( Integer.valueOf( 5 ), boy.getScorePerNickName().get( "Thing" ) );
|
||||||
assertNotNull( boy.getFavoriteNumbers() );
|
assertNotNull( boy.getFavoriteNumbers() );
|
||||||
assertEquals( 3, boy.getFavoriteNumbers()[1] );
|
assertEquals( 3, boy.getFavoriteNumbers()[1] );
|
||||||
assertTrue( boy.getCharacters().contains( Character.CRAFTY ) );
|
assertTrue( boy.getCharacters().contains( Character.CRAFTY ) );
|
||||||
|
|
|
@ -186,7 +186,7 @@ public class EntityManagerTest extends BaseEntityManagerFunctionalTestCase {
|
||||||
public void testContains() throws Exception {
|
public void testContains() throws Exception {
|
||||||
EntityManager em = getOrCreateEntityManager();
|
EntityManager em = getOrCreateEntityManager();
|
||||||
em.getTransaction().begin();
|
em.getTransaction().begin();
|
||||||
Integer nonManagedObject = new Integer( 4 );
|
Integer nonManagedObject = Integer.valueOf( 4 );
|
||||||
try {
|
try {
|
||||||
em.contains( nonManagedObject );
|
em.contains( nonManagedObject );
|
||||||
fail( "Should have raised an exception" );
|
fail( "Should have raised an exception" );
|
||||||
|
|
|
@ -96,9 +96,9 @@ public class CallbackAndDirtyTest extends BaseEntityManagerFunctionalTestCase {
|
||||||
manager.getTransaction().commit();
|
manager.getTransaction().commit();
|
||||||
|
|
||||||
manager.getTransaction().begin();
|
manager.getTransaction().begin();
|
||||||
mark = manager.find( Employee.class, new Long( ids[0] ) );
|
mark = manager.find( Employee.class, Long.valueOf( ids[0] ) );
|
||||||
joe = manager.find( Customer.class, new Long( ids[1] ) );
|
joe = manager.find( Customer.class, Long.valueOf( ids[1] ) );
|
||||||
yomomma = manager.find( Person.class, new Long( ids[2] ) );
|
yomomma = manager.find( Person.class, Long.valueOf( ids[2] ) );
|
||||||
|
|
||||||
mark.setZip( "30306" );
|
mark.setZip( "30306" );
|
||||||
assertEquals( 1, manager.createQuery( "select p from Person p where p.zip = '30306'" ).getResultList().size() );
|
assertEquals( 1, manager.createQuery( "select p from Person p where p.zip = '30306'" ).getResultList().size() );
|
||||||
|
|
|
@ -460,7 +460,7 @@ public class PackagedEntityManagerTest extends PackagingTestCase {
|
||||||
em = emf.createEntityManager();
|
em = emf.createEntityManager();
|
||||||
em.getTransaction().begin();
|
em.getTransaction().begin();
|
||||||
s = em.find( Scooter.class, s.getModel() );
|
s = em.find( Scooter.class, s.getModel() );
|
||||||
assertEquals( new Long( 85 ), s.getSpeed() );
|
assertEquals( Long.valueOf( 85 ), s.getSpeed() );
|
||||||
em.remove( s );
|
em.remove( s );
|
||||||
em.getTransaction().commit();
|
em.getTransaction().commit();
|
||||||
em.close();
|
em.close();
|
||||||
|
|
|
@ -204,10 +204,10 @@ public class IndexedJoinColumnBidirectionalList extends BaseEnversJPAFunctionalT
|
||||||
assertTrue(rev3.getOwner().equals(ing1));
|
assertTrue(rev3.getOwner().equals(ing1));
|
||||||
assertTrue(rev4.getOwner().equals(ing1));
|
assertTrue(rev4.getOwner().equals(ing1));
|
||||||
|
|
||||||
assertEquals(rev1.getPosition(), new Integer(0));
|
assertEquals( rev1.getPosition(), Integer.valueOf( 0 ) );
|
||||||
assertEquals(rev2.getPosition(), new Integer(0));
|
assertEquals( rev2.getPosition(), Integer.valueOf( 0 ) );
|
||||||
assertEquals(rev3.getPosition(), new Integer(1));
|
assertEquals( rev3.getPosition(), Integer.valueOf( 1 ) );
|
||||||
assertEquals(rev4.getPosition(), new Integer(2));
|
assertEquals( rev4.getPosition(), Integer.valueOf( 2 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -225,10 +225,10 @@ public class IndexedJoinColumnBidirectionalList extends BaseEnversJPAFunctionalT
|
||||||
assertTrue(rev3.getOwner().equals(ing2));
|
assertTrue(rev3.getOwner().equals(ing2));
|
||||||
assertTrue(rev4.getOwner().equals(ing1));
|
assertTrue(rev4.getOwner().equals(ing1));
|
||||||
|
|
||||||
assertEquals(rev1.getPosition(), new Integer(1));
|
assertEquals( rev1.getPosition(), Integer.valueOf( 1 ) );
|
||||||
assertEquals(rev2.getPosition(), new Integer(0));
|
assertEquals( rev2.getPosition(), Integer.valueOf( 0 ) );
|
||||||
assertEquals(rev3.getPosition(), new Integer(0));
|
assertEquals( rev3.getPosition(), Integer.valueOf( 0 ) );
|
||||||
assertEquals(rev4.getPosition(), new Integer(0));
|
assertEquals( rev4.getPosition(), Integer.valueOf( 0 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -245,9 +245,9 @@ public class IndexedJoinColumnBidirectionalList extends BaseEnversJPAFunctionalT
|
||||||
assertTrue(rev3.getOwner().equals(ing1));
|
assertTrue(rev3.getOwner().equals(ing1));
|
||||||
assertTrue(rev4.getOwner().equals(ing1));
|
assertTrue(rev4.getOwner().equals(ing1));
|
||||||
|
|
||||||
assertEquals(rev1.getPosition(), new Integer(2));
|
assertEquals( rev1.getPosition(), Integer.valueOf( 2 ) );
|
||||||
assertEquals(rev2.getPosition(), new Integer(1));
|
assertEquals( rev2.getPosition(), Integer.valueOf( 1 ) );
|
||||||
assertEquals(rev3.getPosition(), new Integer(0));
|
assertEquals( rev3.getPosition(), Integer.valueOf( 0 ) );
|
||||||
assertEquals(rev4.getPosition(), new Integer(1));
|
assertEquals( rev4.getPosition(), Integer.valueOf( 1 ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -209,10 +209,10 @@ public class InheritanceIndexedJoinColumnBidirectionalList extends BaseEnversJPA
|
||||||
assertTrue(rev3.getOwner().equals(ing1));
|
assertTrue(rev3.getOwner().equals(ing1));
|
||||||
assertTrue(rev4.getOwner().equals(ing1));
|
assertTrue(rev4.getOwner().equals(ing1));
|
||||||
|
|
||||||
assertEquals(rev1.getPosition(), new Integer(0));
|
assertEquals( rev1.getPosition(), Integer.valueOf( 0 ) );
|
||||||
assertEquals(rev2.getPosition(), new Integer(0));
|
assertEquals( rev2.getPosition(), Integer.valueOf( 0 ) );
|
||||||
assertEquals(rev3.getPosition(), new Integer(1));
|
assertEquals( rev3.getPosition(), Integer.valueOf( 1 ) );
|
||||||
assertEquals(rev4.getPosition(), new Integer(2));
|
assertEquals( rev4.getPosition(), Integer.valueOf( 2 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -230,10 +230,10 @@ public class InheritanceIndexedJoinColumnBidirectionalList extends BaseEnversJPA
|
||||||
assertTrue(rev3.getOwner().equals(ing2));
|
assertTrue(rev3.getOwner().equals(ing2));
|
||||||
assertTrue(rev4.getOwner().equals(ing1));
|
assertTrue(rev4.getOwner().equals(ing1));
|
||||||
|
|
||||||
assertEquals(rev1.getPosition(), new Integer(1));
|
assertEquals( rev1.getPosition(), Integer.valueOf( 1 ) );
|
||||||
assertEquals(rev2.getPosition(), new Integer(0));
|
assertEquals( rev2.getPosition(), Integer.valueOf( 0 ) );
|
||||||
assertEquals(rev3.getPosition(), new Integer(0));
|
assertEquals( rev3.getPosition(), Integer.valueOf( 0 ) );
|
||||||
assertEquals(rev4.getPosition(), new Integer(0));
|
assertEquals( rev4.getPosition(), Integer.valueOf( 0 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
@ -250,9 +250,9 @@ public class InheritanceIndexedJoinColumnBidirectionalList extends BaseEnversJPA
|
||||||
assertTrue(rev3.getOwner().equals(ing1));
|
assertTrue(rev3.getOwner().equals(ing1));
|
||||||
assertTrue(rev4.getOwner().equals(ing1));
|
assertTrue(rev4.getOwner().equals(ing1));
|
||||||
|
|
||||||
assertEquals(rev1.getPosition(), new Integer(2));
|
assertEquals( rev1.getPosition(), Integer.valueOf( 2 ) );
|
||||||
assertEquals(rev2.getPosition(), new Integer(1));
|
assertEquals( rev2.getPosition(), Integer.valueOf( 1 ) );
|
||||||
assertEquals(rev3.getPosition(), new Integer(0));
|
assertEquals( rev3.getPosition(), Integer.valueOf( 0 ) );
|
||||||
assertEquals(rev4.getPosition(), new Integer(1));
|
assertEquals( rev4.getPosition(), Integer.valueOf( 1 ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue