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

HHH-8159 - Apply fixups indicated by analysis tools

This commit is contained in:
Steve Ebersole 2013-05-01 09:23:31 -05:00
parent fe9e2798de
commit a1d190d674
13 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/action/internal/BulkOperationCleanupAction.java
View File

@ -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 SoftLock cacheLock;

2
hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java
View File

@ -561,7 +561,7 @@ public abstract class AbstractQueryImpl implements Query {
}
public Query setCharacter(int position, char val) {
setParameter(position, new Character(val), StandardBasicTypes.CHARACTER);
setParameter( position, Character.valueOf( val ), StandardBasicTypes.CHARACTER );
return this;
}

10
hibernate-core/src/main/java/org/hibernate/sql/OracleJoinFragment.java
View File

@ -129,8 +129,8 @@ public class OracleJoinFragment extends JoinFragment {
StringBuilder buf = new StringBuilder( on );
for ( int i = 0; i < buf.length(); i++ ) {
char character = buf.charAt( i );
boolean isInsertPoint = OPERATORS.contains( new Character( character ) ) ||
( character == ' ' && buf.length() > i + 3 && "is ".equals( buf.substring( i + 1, i + 4 ) ) );
final boolean isInsertPoint = OPERATORS.contains( Character.valueOf( character ) )
|| ( character == ' ' && buf.length() > i + 3 && "is ".equals( buf.substring( i + 1, i + 4 ) ) );
if ( isInsertPoint ) {
buf.insert( i, "(+)" );
i += 3;
@ -142,8 +142,8 @@ public class OracleJoinFragment extends JoinFragment {
private static final Set OPERATORS = new HashSet();
static {
OPERATORS.add( new Character( '=' ) );
OPERATORS.add( new Character( '<' ) );
OPERATORS.add( new Character( '>' ) );
OPERATORS.add( Character.valueOf( '=' ) );
OPERATORS.add( Character.valueOf( '<' ) );
OPERATORS.add( Character.valueOf( '>' ) );
}
}

2
hibernate-core/src/test/java/org/hibernate/dialect/Mocks.java
View File

@ -135,7 +135,7 @@ public class Mocks {
}
if ( "hashCode".equals( methodName ) ) {
return new Integer( this.hashCode() );
return Integer.valueOf( this.hashCode() );
}
if ( canThrowSQLException( method ) ) {

4
hibernate-core/src/test/java/org/hibernate/event/internal/EventCacheTest.java
View File

@ -127,10 +127,10 @@ public class EventCacheTest extends BaseCoreFunctionalTestCase {
Map<Object,Object> input = new HashMap<Object,Object>();
Object entity1 = new Simple( 1 );
//
Object copy1 = new Integer( 2 );
Object copy1 = Integer.valueOf( 2 );
input.put(entity1, copy1);
Object entity2 = new Simple( 3 );
Object copy2 = new Integer( 2 );
Object copy2 = Integer.valueOf( 2 );
input.put(entity2, copy2);
cache.putAll(input);

64
hibernate-core/src/test/java/org/hibernate/test/annotations/EntityTest.java
View File

@ -62,7 +62,7 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
Session s = openSession();
Transaction tx = s.beginTransaction();
Flight firstOne = new Flight();
firstOne.setId( new Long( 1 ) );
firstOne.setId( Long.valueOf( 1 ) );
firstOne.setName( "AF3202" );
firstOne.setDuration( new Long( 1000000 ) );
firstOne.setDurationInSec( 2000 );
@ -74,11 +74,11 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
//read it
s = openSession();
tx = s.beginTransaction();
firstOne = (Flight) s.get( Flight.class, new Long( 1 ) );
firstOne = (Flight) s.get( Flight.class, Long.valueOf( 1 ) );
assertNotNull( firstOne );
assertEquals( new Long( 1 ), firstOne.getId() );
assertEquals( Long.valueOf( 1 ), firstOne.getId() );
assertEquals( "AF3202", firstOne.getName() );
assertEquals( new Long( 1000000 ), firstOne.getDuration() );
assertEquals( Long.valueOf( 1000000 ), firstOne.getDuration() );
assertFalse( "Transient is not working", 2000l == firstOne.getDurationInSec() );
tx.commit();
s.close();
@ -90,9 +90,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
Session s = openSession();
Transaction tx = s.beginTransaction();
Flight firstOne = new Flight();
firstOne.setId( new Long( 1 ) );
firstOne.setId( Long.valueOf( 1 ) );
firstOne.setName( "AF3202" );
firstOne.setDuration( new Long( 1000000 ) );
firstOne.setDuration( Long.valueOf( 1000000 ) );
firstOne.setDurationInSec( 2000 );
s.save( firstOne );
s.flush();
@ -103,7 +103,7 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
s = openSession();
tx = s.beginTransaction();
firstOne = new Flight();
firstOne.setId( new Long( 1 ) );
firstOne.setId( Long.valueOf( 1 ) );
firstOne.setName( null );
try {
@ -122,7 +122,7 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
s = openSession();
tx = s.beginTransaction();
firstOne = new Flight();
firstOne.setId( new Long( 1 ) );
firstOne.setId( Long.valueOf( 1 ) );
firstOne.setName( "AF3202" );
firstOne.setTriggeredData( "should not be insertable" );
tx.commit();
@ -130,9 +130,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
s = openSession();
tx = s.beginTransaction();
firstOne = (Flight) s.get( Flight.class, new Long( 1 ) );
firstOne = (Flight) s.get( Flight.class, Long.valueOf( 1 ) );
assertNotNull( firstOne );
assertEquals( new Long( 1 ), firstOne.getId() );
assertEquals( Long.valueOf( 1 ), firstOne.getId() );
assertEquals( "AF3202", firstOne.getName() );
assertFalse( "should not be insertable".equals( firstOne.getTriggeredData() ) );
firstOne.setName( "BA1234" );
@ -142,9 +142,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
s = openSession();
tx = s.beginTransaction();
firstOne = (Flight) s.get( Flight.class, new Long( 1 ) );
firstOne = (Flight) s.get( Flight.class, Long.valueOf( 1 ) );
assertNotNull( firstOne );
assertEquals( new Long( 1 ), firstOne.getId() );
assertEquals( Long.valueOf( 1 ), firstOne.getId() );
assertEquals( "AF3202", firstOne.getName() );
assertFalse( "should not be updatable".equals( firstOne.getTriggeredData() ) );
tx.commit();
@ -158,13 +158,13 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
s = openSession();
tx = s.beginTransaction();
Sky sky = new Sky();
sky.id = new Long( 2 );
sky.id = Long.valueOf( 2 );
sky.color = "blue";
sky.day = "monday";
sky.month = "January";
Sky sameSky = new Sky();
sameSky.id = new Long( 3 );
sameSky.id = Long.valueOf( 3 );
sameSky.color = "blue";
sky.day = "tuesday";
sky.month = "January";
@ -193,19 +193,19 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
s = openSession();
tx = s.beginTransaction();
Sky sky = new Sky();
sky.id = new Long( id++ );
sky.id = Long.valueOf( id++ );
sky.color = "green";
sky.day = "monday";
sky.month = "March";
Sky otherSky = new Sky();
otherSky.id = new Long( id++ );
otherSky.id = Long.valueOf( id++ );
otherSky.color = "red";
otherSky.day = "friday";
otherSky.month = "March";
Sky sameSky = new Sky();
sameSky.id = new Long( id++ );
sameSky.id = Long.valueOf( id++ );
sameSky.color = "green";
sameSky.day = "monday";
sameSky.month = "March";
@ -239,9 +239,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
Session s = openSession();
Transaction tx = s.beginTransaction();
Flight firstOne = new Flight();
firstOne.setId( new Long( 2 ) );
firstOne.setId( Long.valueOf( 2 ) );
firstOne.setName( "AF3202" );
firstOne.setDuration( new Long( 500 ) );
firstOne.setDuration( Long.valueOf( 500 ) );
s.save( firstOne );
s.flush();
tx.commit();
@ -250,15 +250,15 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
//read it
s = openSession();
tx = s.beginTransaction();
firstOne = (Flight) s.get( Flight.class, new Long( 2 ) );
firstOne = (Flight) s.get( Flight.class, Long.valueOf( 2 ) );
tx.commit();
s.close();
//read it again
s = openSession();
tx = s.beginTransaction();
Flight concurrentOne = (Flight) s.get( Flight.class, new Long( 2 ) );
concurrentOne.setDuration( new Long( 1000 ) );
Flight concurrentOne = (Flight) s.get( Flight.class, Long.valueOf( 2 ) );
concurrentOne.setDuration( Long.valueOf( 1000 ) );
s.update( concurrentOne );
tx.commit();
s.close();
@ -290,22 +290,22 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
s = openSession();
tx = s.beginTransaction();
Sky sky = new Sky();
sky.id = new Long( 1 );
sky.id = Long.valueOf( 1 );
sky.color = "black";
Sky.area = "Paris";
sky.area = "Paris";
sky.day = "23";
sky.month = "1";
s.save( sky );
tx.commit();
s.close();
Sky.area = "London";
sky.area = "London";
s = openSession();
tx = s.beginTransaction();
sky = (Sky) s.get( Sky.class, sky.id );
assertNotNull( sky );
assertEquals( "black", sky.color );
assertFalse( "Paris".equals( Sky.area ) );
assertFalse( "Paris".equals( sky.area ) );
tx.commit();
s.close();
}
@ -336,9 +336,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
Session s = openSession();
Transaction tx = s.beginTransaction();
Flight airFrance = new Flight();
airFrance.setId( new Long( 747 ) );
airFrance.setId( Long.valueOf( 747 ) );
airFrance.setName( "Paris-Amsterdam" );
airFrance.setDuration( new Long( 10 ) );
airFrance.setDuration( Long.valueOf( 10 ) );
airFrance.setFactor( 25 );
s.persist( airFrance );
tx.commit();
@ -348,7 +348,7 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
tx = s.beginTransaction();
airFrance = (Flight) s.get( Flight.class, airFrance.getId() );
assertNotNull( airFrance );
assertEquals( new Long( 10 ), airFrance.getDuration() );
assertEquals( Long.valueOf( 10 ), airFrance.getDuration() );
assertFalse( 25 == airFrance.getFactor( false ) );
s.delete( airFrance );
tx.commit();
@ -360,9 +360,9 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
Session s = openSession();
Transaction tx = s.beginTransaction();
Flight airFrance = new Flight();
airFrance.setId( new Long( 747 ) );
airFrance.setId( Long.valueOf( 747 ) );
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.setAlternativeDepartureDate( new GregorianCalendar( 2006, 02, 03, 10, 00 ) );
airFrance.getAlternativeDepartureDate().setTimeZone( TimeZone.getTimeZone( "GMT" ) );
@ -394,7 +394,7 @@ public class EntityTest extends BaseCoreFunctionalTestCase {
Session s = openSession();
Transaction tx = s.beginTransaction();
Flight airFrance = new Flight();
airFrance.setId( new Long( 747 ) );
airFrance.setId( Long.valueOf( 747 ) );
airFrance.setName( "Paris-Amsterdam" );
airFrance.setDuration( null );
try {

2
hibernate-core/src/test/java/org/hibernate/test/annotations/Sky.java
View File

@ -23,5 +23,5 @@ public class Sky implements Serializable {
protected String day;
@Column(name = "MONTH", nullable = false)
protected String month;
static protected String area;
protected String area;
}

6
hibernate-core/src/test/java/org/hibernate/test/annotations/collectionelement/CollectionElementTest.java
View File

@ -63,8 +63,8 @@ public class CollectionElementTest extends BaseCoreFunctionalTestCase {
boy.setLastName( "Doe" );
boy.getNickNames().add( "Johnny" );
boy.getNickNames().add( "Thing" );
boy.getScorePerNickName().put( "Johnny", new Integer( 3 ) );
boy.getScorePerNickName().put( "Thing", new Integer( 5 ) );
boy.getScorePerNickName().put( "Johnny", Integer.valueOf( 3 ) );
boy.getScorePerNickName().put( "Thing", Integer.valueOf( 5 ) );
int[] favNbrs = new int[4];
for (int index = 0; index < favNbrs.length - 1; index++) {
favNbrs[index] = index * 3;
@ -87,7 +87,7 @@ public class CollectionElementTest extends BaseCoreFunctionalTestCase {
assertTrue( boy.getNickNames().contains( "Thing" ) );
assertNotNull( boy.getScorePerNickName() );
assertTrue( boy.getScorePerNickName().containsKey( "Thing" ) );
assertEquals( new Integer( 5 ), boy.getScorePerNickName().get( "Thing" ) );
assertEquals( Integer.valueOf( 5 ), boy.getScorePerNickName().get( "Thing" ) );
assertNotNull( boy.getFavoriteNumbers() );
assertEquals( 3, boy.getFavoriteNumbers()[1] );
assertTrue( boy.getCharacters().contains( Character.CRAFTY ) );

2
hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/EntityManagerTest.java
View File

@ -186,7 +186,7 @@ public class EntityManagerTest extends BaseEntityManagerFunctionalTestCase {
public void testContains() throws Exception {
EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Integer nonManagedObject = new Integer( 4 );
Integer nonManagedObject = Integer.valueOf( 4 );
try {
em.contains( nonManagedObject );
fail( "Should have raised an exception" );

6
hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/callbacks/CallbackAndDirtyTest.java
View File

@ -96,9 +96,9 @@ public class CallbackAndDirtyTest extends BaseEntityManagerFunctionalTestCase {
manager.getTransaction().commit();
manager.getTransaction().begin();
mark = manager.find( Employee.class, new Long( ids[0] ) );
joe = manager.find( Customer.class, new Long( ids[1] ) );
yomomma = manager.find( Person.class, new Long( ids[2] ) );
mark = manager.find( Employee.class, Long.valueOf( ids[0] ) );
joe = manager.find( Customer.class, Long.valueOf( ids[1] ) );
yomomma = manager.find( Person.class, Long.valueOf( ids[2] ) );
mark.setZip( "30306" );
assertEquals( 1, manager.createQuery( "select p from Person p where p.zip = '30306'" ).getResultList().size() );

2
hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/packaging/PackagedEntityManagerTest.java
View File

@ -460,7 +460,7 @@ public class PackagedEntityManagerTest extends PackagingTestCase {
em = emf.createEntityManager();
em.getTransaction().begin();
s = em.find( Scooter.class, s.getModel() );
assertEquals( new Long( 85 ), s.getSpeed() );
assertEquals( Long.valueOf( 85 ), s.getSpeed() );
em.remove( s );
em.getTransaction().commit();
em.close();

24
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/IndexedJoinColumnBidirectionalList.java
View File

@ -204,10 +204,10 @@ public class IndexedJoinColumnBidirectionalList extends BaseEnversJPAFunctionalT
assertTrue(rev3.getOwner().equals(ing1));
assertTrue(rev4.getOwner().equals(ing1));
assertEquals(rev1.getPosition(), new Integer(0));
assertEquals(rev2.getPosition(), new Integer(0));
assertEquals(rev3.getPosition(), new Integer(1));
assertEquals(rev4.getPosition(), new Integer(2));
assertEquals( rev1.getPosition(), Integer.valueOf( 0 ) );
assertEquals( rev2.getPosition(), Integer.valueOf( 0 ) );
assertEquals( rev3.getPosition(), Integer.valueOf( 1 ) );
assertEquals( rev4.getPosition(), Integer.valueOf( 2 ) );
}
@Test
@ -225,10 +225,10 @@ public class IndexedJoinColumnBidirectionalList extends BaseEnversJPAFunctionalT
assertTrue(rev3.getOwner().equals(ing2));
assertTrue(rev4.getOwner().equals(ing1));
assertEquals(rev1.getPosition(), new Integer(1));
assertEquals(rev2.getPosition(), new Integer(0));
assertEquals(rev3.getPosition(), new Integer(0));
assertEquals(rev4.getPosition(), new Integer(0));
assertEquals( rev1.getPosition(), Integer.valueOf( 1 ) );
assertEquals( rev2.getPosition(), Integer.valueOf( 0 ) );
assertEquals( rev3.getPosition(), Integer.valueOf( 0 ) );
assertEquals( rev4.getPosition(), Integer.valueOf( 0 ) );
}
@Test
@ -245,9 +245,9 @@ public class IndexedJoinColumnBidirectionalList extends BaseEnversJPAFunctionalT
assertTrue(rev3.getOwner().equals(ing1));
assertTrue(rev4.getOwner().equals(ing1));
assertEquals(rev1.getPosition(), new Integer(2));
assertEquals(rev2.getPosition(), new Integer(1));
assertEquals(rev3.getPosition(), new Integer(0));
assertEquals(rev4.getPosition(), new Integer(1));
assertEquals( rev1.getPosition(), Integer.valueOf( 2 ) );
assertEquals( rev2.getPosition(), Integer.valueOf( 1 ) );
assertEquals( rev3.getPosition(), Integer.valueOf( 0 ) );
assertEquals( rev4.getPosition(), Integer.valueOf( 1 ) );
}
}

24
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/InheritanceIndexedJoinColumnBidirectionalList.java
View File

@ -209,10 +209,10 @@ public class InheritanceIndexedJoinColumnBidirectionalList extends BaseEnversJPA
assertTrue(rev3.getOwner().equals(ing1));
assertTrue(rev4.getOwner().equals(ing1));
assertEquals(rev1.getPosition(), new Integer(0));
assertEquals(rev2.getPosition(), new Integer(0));
assertEquals(rev3.getPosition(), new Integer(1));
assertEquals(rev4.getPosition(), new Integer(2));
assertEquals( rev1.getPosition(), Integer.valueOf( 0 ) );
assertEquals( rev2.getPosition(), Integer.valueOf( 0 ) );
assertEquals( rev3.getPosition(), Integer.valueOf( 1 ) );
assertEquals( rev4.getPosition(), Integer.valueOf( 2 ) );
}
@Test
@ -230,10 +230,10 @@ public class InheritanceIndexedJoinColumnBidirectionalList extends BaseEnversJPA
assertTrue(rev3.getOwner().equals(ing2));
assertTrue(rev4.getOwner().equals(ing1));
assertEquals(rev1.getPosition(), new Integer(1));
assertEquals(rev2.getPosition(), new Integer(0));
assertEquals(rev3.getPosition(), new Integer(0));
assertEquals(rev4.getPosition(), new Integer(0));
assertEquals( rev1.getPosition(), Integer.valueOf( 1 ) );
assertEquals( rev2.getPosition(), Integer.valueOf( 0 ) );
assertEquals( rev3.getPosition(), Integer.valueOf( 0 ) );
assertEquals( rev4.getPosition(), Integer.valueOf( 0 ) );
}
@Test
@ -250,9 +250,9 @@ public class InheritanceIndexedJoinColumnBidirectionalList extends BaseEnversJPA
assertTrue(rev3.getOwner().equals(ing1));
assertTrue(rev4.getOwner().equals(ing1));
assertEquals(rev1.getPosition(), new Integer(2));
assertEquals(rev2.getPosition(), new Integer(1));
assertEquals(rev3.getPosition(), new Integer(0));
assertEquals(rev4.getPosition(), new Integer(1));
assertEquals( rev1.getPosition(), Integer.valueOf( 2 ) );
assertEquals( rev2.getPosition(), Integer.valueOf( 1 ) );
assertEquals( rev3.getPosition(), Integer.valueOf( 0 ) );
assertEquals( rev4.getPosition(), Integer.valueOf( 1 ) );
}
}