[hibernate-commits] Hibernate SVN: r19984 - in core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate: collection and 7 other directories.

Author: stliu Date: 2010-07-21 01:29:34 -0400 (Wed, 21 Jul 2010) New Revision: 19984 Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/AbstractPersistentCollection.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/BatchFetchQueue.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/WhereParser.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IntegerType.java Log: JBPAPP-4694 use auto-box in java5 to save some time that for creating new objects Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java 2010-07-21 05:27:58 UTC (rev 19983) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/cfg/Environment.java 2010-07-21 05:29:34 UTC (rev 19984) @@ -561,11 +561,11 @@ RENAMED_PROPERTIES.put( "hibernate.cglib.use_reflection_optimizer", USE_REFLECTION_OPTIMIZER ); - ISOLATION_LEVELS.put( new Integer(Connection.TRANSACTION_NONE), "NONE" ); - ISOLATION_LEVELS.put( new Integer(Connection.TRANSACTION_READ_UNCOMMITTED), "READ_UNCOMMITTED" ); - ISOLATION_LEVELS.put( new Integer(Connection.TRANSACTION_READ_COMMITTED), "READ_COMMITTED" ); - ISOLATION_LEVELS.put( new Integer(Connection.TRANSACTION_REPEATABLE_READ), "REPEATABLE_READ" ); - ISOLATION_LEVELS.put( new Integer(Connection.TRANSACTION_SERIALIZABLE), "SERIALIZABLE" ); + ISOLATION_LEVELS.put( Connection.TRANSACTION_NONE, "NONE" ); + ISOLATION_LEVELS.put( Connection.TRANSACTION_READ_UNCOMMITTED, "READ_UNCOMMITTED" ); + ISOLATION_LEVELS.put( Connection.TRANSACTION_READ_COMMITTED, "READ_COMMITTED" ); + ISOLATION_LEVELS.put( Connection.TRANSACTION_REPEATABLE_READ, "REPEATABLE_READ" ); + ISOLATION_LEVELS.put( Connection.TRANSACTION_SERIALIZABLE, "SERIALIZABLE" ); GLOBAL_PROPERTIES = new Properties(); //Set USE_REFLECTION_OPTIMIZER to false to fix HHH-227 Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/AbstractPersistentCollection.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/AbstractPersistentCollection.java 2010-07-21 05:27:58 UTC (rev 19983) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/collection/AbstractPersistentCollection.java 2010-07-21 05:29:34 UTC (rev 19984) @@ -141,7 +141,7 @@ if ( hasQueuedOperations() ) { session.flush(); } - return new Boolean( persister.indexExists( entry.getLoadedKey(), index, session ) ); + return persister.indexExists( entry.getLoadedKey(), index, session ); } } read(); @@ -158,7 +158,7 @@ if ( hasQueuedOperations() ) { session.flush(); } - return new Boolean( persister.elementExists( entry.getLoadedKey(), element, session ) ); + return persister.elementExists( entry.getLoadedKey(), element, session ); } } read(); Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/BatchFetchQueue.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/BatchFetchQueue.java 2010-07-21 05:27:58 UTC (rev 19983) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/BatchFetchQueue.java 2010-07-21 05:29:34 UTC (rev 19984) @@ -100,7 +100,7 @@ } /** - * Adds a subselect fetch decriptor for the given entity key. + * Adds a subselect fetch descriptor for the given entity key. * * @param key The entity for which to register the subselect fetch. * @param subquery The fetch descriptor. Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java 2010-07-21 05:27:58 UTC (rev 19983) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java 2010-07-21 05:29:34 UTC (rev 19984) @@ -50,7 +50,7 @@ } else { int index = rs.findColumn( columnName ); - columnNameToIndexCache.put( columnName, new Integer(index) ); + columnNameToIndexCache.put( columnName, index ); return index; } } Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/WhereParser.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/WhereParser.java 2010-07-21 05:27:58 UTC (rev 19983) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/classic/WhereParser.java 2010-07-21 05:29:34 UTC (rev 19984) @@ -277,7 +277,7 @@ } if ( lcToken.equals( "not" ) ) { - nots.addLast( new Boolean( !( ( Boolean ) nots.removeLast() ).booleanValue() ) ); + nots.addLast( !( ( Boolean ) nots.removeLast() ).booleanValue() ); negated = !negated; return; //NOTE: early return } Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java 2010-07-21 05:27:58 UTC (rev 19983) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/jdbc/AbstractBatcher.java 2010-07-21 05:29:34 UTC (rev 19984) @@ -46,6 +46,7 @@ import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.jdbc.util.FormatStyle; import org.hibernate.util.JDBCExceptionReporter; +import org.hibernate.util.StringHelper; /** * Manages prepared statements and batching. @@ -486,7 +487,7 @@ private String getSQL(String sql) { sql = interceptor.onPrepareStatement( sql ); - if ( sql==null || sql.length() == 0 ) { + if ( StringHelper.isEmpty(sql) ) { throw new AssertionFailure( "Interceptor.onPrepareStatement() returned null or empty string." ); } return sql; Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java 2010-07-21 05:27:58 UTC (rev 19983) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java 2010-07-21 05:29:34 UTC (rev 19984) @@ -157,7 +157,7 @@ keyCols[k] = ( (Column) citer.next() ).getQuotedName( factory.getDialect() ); } keyColumns.add(keyCols); - cascadeDeletes.add( new Boolean( key.isCascadeDeleteEnabled() && factory.getDialect().supportsCascadeDelete() ) ); + cascadeDeletes.add( key.isCascadeDeleteEnabled() && factory.getDialect().supportsCascadeDelete() ); } naturalOrderTableNames = ArrayHelper.toStringArray(tables); naturalOrderTableKeyColumns = ArrayHelper.to2DStringArray(keyColumns); @@ -169,7 +169,7 @@ titer = persistentClass.getSubclassTableClosureIterator(); while ( titer.hasNext() ) { Table tab = (Table) titer.next(); - isConcretes.add( new Boolean( persistentClass.isClassOrSuperclassTable(tab) ) ); + isConcretes.add( persistentClass.isClassOrSuperclassTable(tab) ); String tabname = tab.getQualifiedName( factory.getDialect(), factory.getSettings().getDefaultCatalogName(), Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java 2010-07-21 05:27:58 UTC (rev 19983) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java 2010-07-21 05:29:34 UTC (rev 19984) @@ -250,11 +250,11 @@ joinIter = persistentClass.getSubclassJoinClosureIterator(); while ( joinIter.hasNext() ) { Join join = (Join) joinIter.next(); - isConcretes.add( new Boolean( persistentClass.isClassOrSuperclassJoin(join) ) ); - isDeferreds.add( new Boolean( join.isSequentialSelect() ) ); - isInverses.add( new Boolean( join.isInverse() ) ); - isNullables.add( new Boolean( join.isOptional() ) ); - isLazies.add( new Boolean( lazyAvailable && join.isLazy() ) ); + isConcretes.add( persistentClass.isClassOrSuperclassJoin(join) ); + isDeferreds.add( join.isSequentialSelect() ); + isInverses.add( join.isInverse() ); + isNullables.add( join.isOptional() ); + isLazies.add( lazyAvailable && join.isLazy() ); if ( join.isSequentialSelect() && !persistentClass.isClassOrSuperclassJoin(join) ) hasDeferred = true; subclassTables.add( join.getTable().getQualifiedName( factory.getDialect(), Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java 2010-07-21 05:27:58 UTC (rev 19983) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java 2010-07-21 05:29:34 UTC (rev 19984) @@ -186,7 +186,7 @@ } if ( prop.isNaturalIdentifier() ) { - naturalIdNumbers.add( new Integer(i) ); + naturalIdNumbers.add( i ); if ( prop.isUpdateable() ) { foundUpdateableNaturalIdProperty = true; } @@ -380,14 +380,14 @@ } private void mapPropertyToIndex(Property prop, int i) { - propertyIndexes.put( prop.getName(), new Integer(i) ); + propertyIndexes.put( prop.getName(), i ); if ( prop.getValue() instanceof Component ) { Iterator iter = ( (Component) prop.getValue() ).getPropertyIterator(); while ( iter.hasNext() ) { Property subprop = (Property) iter.next(); propertyIndexes.put( prop.getName() + '.' + subprop.getName(), - new Integer(i) + i ); } } Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IntegerType.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IntegerType.java 2010-07-21 05:27:58 UTC (rev 19983) +++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/type/IntegerType.java 2010-07-21 05:29:34 UTC (rev 19984) @@ -41,7 +41,7 @@ */ public class IntegerType extends PrimitiveType implements DiscriminatorType, VersionType { - private static final Integer ZERO = new Integer(0); + private static final Integer ZERO = 0; public Serializable getDefaultValue() { return ZERO;