HHH-8211 Checkstyle and FindBugs fix-ups

hibernate-core/src/main/java/org/hibernate/bytecode/instrumentation/internal/javassist/FieldInterceptorImpl.java

@@ -46,7 +46,6 @@ import org.hibernate.proxy.LazyInitializer;
  *
  * @author Steve Ebersole
  */
-@SuppressWarnings( {"UnnecessaryUnboxing", "UnnecessaryBoxing"})
 final class FieldInterceptorImpl extends AbstractFieldInterceptor implements FieldHandler, Serializable {
 
 	FieldInterceptorImpl(SessionImplementor session, Set uninitializedFields, String entityName) {
@@ -55,39 +54,39 @@ final class FieldInterceptorImpl extends AbstractFieldInterceptor implements Fie
 
 
 	// FieldHandler impl ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+	@Override
 	public boolean readBoolean(Object target, String name, boolean oldValue) {
-		return ( (Boolean) intercept( target, name, oldValue ) ).booleanValue();
+		return (Boolean) intercept( target, name, oldValue );
 	}
-
+	@Override
 	public byte readByte(Object target, String name, byte oldValue) {
-		return ( (Byte) intercept( target, name, Byte.valueOf( oldValue ) ) ).byteValue();
+		return (Byte) intercept( target, name, oldValue );
 	}
-
+	@Override
 	public char readChar(Object target, String name, char oldValue) {
-		return ( (Character) intercept( target, name, Character.valueOf( oldValue ) ) ).charValue();
+		return (Character) intercept( target, name, oldValue );
 	}
-
+	@Override
 	public double readDouble(Object target, String name, double oldValue) {
-		return ( (Double) intercept( target, name, Double.valueOf( oldValue ) ) ).doubleValue();
+		return (Double) intercept( target, name, oldValue );
 	}
-
+	@Override
 	public float readFloat(Object target, String name, float oldValue) {
-		return ( (Float) intercept( target, name, Float.valueOf( oldValue ) ) ).floatValue();
+		return (Float) intercept( target, name, oldValue );
 	}
-
+	@Override
 	public int readInt(Object target, String name, int oldValue) {
-		return ( (Integer) intercept( target, name, Integer.valueOf( oldValue ) ) );
+		return (Integer) intercept( target, name, oldValue );
 	}
-
+	@Override
 	public long readLong(Object target, String name, long oldValue) {
-		return ( (Long) intercept( target, name, Long.valueOf( oldValue ) ) ).longValue();
+		return (Long) intercept( target, name, oldValue );
 	}
-
+	@Override
 	public short readShort(Object target, String name, short oldValue) {
-		return ( (Short) intercept( target, name, Short.valueOf( oldValue ) ) ).shortValue();
+		return (Short) intercept( target, name, oldValue );
 	}
-
+	@Override
 	public Object readObject(Object target, String name, Object oldValue) {
 		Object value = intercept( target, name, oldValue );
 		if ( value instanceof HibernateProxy ) {
@@ -98,61 +97,61 @@ final class FieldInterceptorImpl extends AbstractFieldInterceptor implements Fie
 		}
 		return value;
 	}
-
+	@Override
 	public boolean writeBoolean(Object target, String name, boolean oldValue, boolean newValue) {
 		dirty();
 		intercept( target, name, oldValue );
 		return newValue;
 	}
-
+	@Override
 	public byte writeByte(Object target, String name, byte oldValue, byte newValue) {
 		dirty();
-		intercept( target, name, Byte.valueOf( oldValue ) );
+		intercept( target, name, oldValue );
 		return newValue;
 	}
-
+	@Override
 	public char writeChar(Object target, String name, char oldValue, char newValue) {
 		dirty();
-		intercept( target, name, Character.valueOf( oldValue ) );
+		intercept( target, name, oldValue );
 		return newValue;
 	}
-
+	@Override
 	public double writeDouble(Object target, String name, double oldValue, double newValue) {
 		dirty();
-		intercept( target, name, Double.valueOf( oldValue ) );
+		intercept( target, name, oldValue );
 		return newValue;
 	}
-
+	@Override
 	public float writeFloat(Object target, String name, float oldValue, float newValue) {
 		dirty();
-		intercept( target, name, Float.valueOf( oldValue ) );
+		intercept( target, name, oldValue );
 		return newValue;
 	}
-
+	@Override
 	public int writeInt(Object target, String name, int oldValue, int newValue) {
 		dirty();
-		intercept( target, name, Integer.valueOf( oldValue ) );
+		intercept( target, name, oldValue );
 		return newValue;
 	}
-
+	@Override
 	public long writeLong(Object target, String name, long oldValue, long newValue) {
 		dirty();
-		intercept( target, name, Long.valueOf( oldValue ) );
+		intercept( target, name, oldValue );
 		return newValue;
 	}
-
+	@Override
 	public short writeShort(Object target, String name, short oldValue, short newValue) {
 		dirty();
-		intercept( target, name, Short.valueOf( oldValue ) );
+		intercept( target, name, oldValue );
 		return newValue;
 	}
-
+	@Override
 	public Object writeObject(Object target, String name, Object oldValue, Object newValue) {
 		dirty();
 		intercept( target, name, oldValue );
 		return newValue;
 	}
-
+	@Override
 	public String toString() {
 		return "FieldInterceptorImpl(entityName=" + getEntityName() +
 				",dirty=" + isDirty() +

hibernate-core/src/main/java/org/hibernate/cache/internal/StandardQueryCache.java

@@ -153,7 +153,7 @@ public class StandardQueryCache implements QueryCache {
 			final QueryKey key,
 			final Type[] returnTypes,
 			final boolean isNaturalKeyLookup,
-			final Set spaces,
+			final Set<Serializable> spaces,
 			final SessionImplementor session) throws HibernateException {
 		if ( DEBUGGING ) {
 			LOG.debugf( "Checking cached query results in region: %s", cacheRegion.getName() );
@@ -223,7 +223,7 @@ public class StandardQueryCache implements QueryCache {
 		return result;
 	}
 
-	protected boolean isUpToDate(final Set spaces, final Long timestamp) {
+	protected boolean isUpToDate(final Set<Serializable> spaces, final Long timestamp) {
 		if ( DEBUGGING ) {
 			LOG.debugf( "Checking query spaces are up-to-date: %s", spaces );
 		}

hibernate-core/src/main/java/org/hibernate/cache/spi/QueryCache.java

@@ -23,6 +23,7 @@
  */
 package org.hibernate.cache.spi;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
 
@@ -75,7 +76,7 @@ public interface QueryCache {
 	 *
 	 * @throws HibernateException Indicates a problem delegating to the underlying cache.
 	 */
-	public List get(QueryKey key, Type[] returnTypes, boolean isNaturalKeyLookup, Set spaces, SessionImplementor session) throws HibernateException;
+	public List get(QueryKey key, Type[] returnTypes, boolean isNaturalKeyLookup, Set<Serializable> spaces, SessionImplementor session) throws HibernateException;
 
 	/**
 	 * Destroy the cache.

hibernate-core/src/main/java/org/hibernate/cache/spi/UpdateTimestampsCache.java

@@ -46,7 +46,7 @@ import org.hibernate.internal.CoreMessageLogger;
  */
 public class UpdateTimestampsCache {
 	private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, UpdateTimestampsCache.class.getName() );
-
+	private static final boolean DEBUG_ENABLED = LOG.isDebugEnabled();
 	/**
 	 * The region name of the update-timestamps cache.
 	 */
@@ -90,15 +90,13 @@ public class UpdateTimestampsCache {
 	 *
 	 * @throws CacheException Indicated problem delegating to underlying region.
 	 */
-	@SuppressWarnings({"UnnecessaryBoxing"})
 	public void preinvalidate(Serializable[] spaces) throws CacheException {
-		final boolean debug = LOG.isDebugEnabled();
 		final boolean stats = factory != null && factory.getStatistics().isStatisticsEnabled();
 
 		final Long ts = region.nextTimestamp() + region.getTimeout();
 
 		for ( Serializable space : spaces ) {
-			if ( debug ) {
+			if ( DEBUG_ENABLED ) {
 				LOG.debugf( "Pre-invalidating space [%s], timestamp: %s", space, ts );
 			}
 			//put() has nowait semantics, is this really appropriate?
@@ -117,15 +115,13 @@ public class UpdateTimestampsCache {
 	 *
 	 * @throws CacheException Indicated problem delegating to underlying region.
 	 */
-	@SuppressWarnings({"UnnecessaryBoxing"})
 	public void invalidate(Serializable[] spaces) throws CacheException {
-		final boolean debug = LOG.isDebugEnabled();
 		final boolean stats = factory != null && factory.getStatistics().isStatisticsEnabled();
 
 		final Long ts = region.nextTimestamp();
 
 		for (Serializable space : spaces) {
-			if ( debug ) {
+			if ( DEBUG_ENABLED ) {
 				LOG.debugf( "Invalidating space [%s], timestamp: %s", space, ts );
 			}
 			//put() has nowait semantics, is this really appropriate?
@@ -147,12 +143,10 @@ public class UpdateTimestampsCache {
 	 *
 	 * @throws CacheException Indicated problem delegating to underlying region.
 	 */
-	@SuppressWarnings({"unchecked", "UnnecessaryUnboxing"})
+	public boolean isUpToDate(Set<Serializable> spaces, Long timestamp) throws CacheException {
-	public boolean isUpToDate(Set spaces, Long timestamp) throws CacheException {
-		final boolean debug = LOG.isDebugEnabled();
 		final boolean stats = factory != null && factory.getStatistics().isStatisticsEnabled();
 
-		for ( Serializable space : (Set<Serializable>) spaces ) {
+		for ( Serializable space : spaces ) {
 			final Long lastUpdate = (Long) region.get( space );
 			if ( lastUpdate == null ) {
 				if ( stats ) {
@@ -164,7 +158,7 @@ public class UpdateTimestampsCache {
 				//result = false; // safer
 			}
 			else {
-				if ( debug ) {
+				if ( DEBUG_ENABLED ) {
 					LOG.debugf(
 							"[%s] last update timestamp: %s",
 							space,

hibernate-core/src/main/java/org/hibernate/cache/spi/entry/StructuredCacheEntry.java

@@ -50,10 +50,9 @@ public class StructuredCacheEntry implements CacheEntryStructure {
 	}
 
 	@Override
-	@SuppressWarnings("UnnecessaryUnboxing")
 	public Object destructure(Object structured, SessionFactoryImplementor factory) {
 		final Map map = (Map) structured;
-		final boolean lazyPropertiesUnfetched = ( (Boolean) map.get( "_lazyPropertiesUnfetched" ) ).booleanValue();
+		final boolean lazyPropertiesUnfetched = (Boolean) map.get( "_lazyPropertiesUnfetched" );
 		final String subclass = (String) map.get( "_subclass" );
 		final Object version = map.get( "_version" );
 		final EntityPersister subclassPersister = factory.getEntityPersister( subclass );

hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java

@@ -81,7 +81,6 @@ import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
-import org.hibernate.cache.spi.GeneralDataRegion;
 import org.hibernate.cfg.annotations.NamedEntityGraphDefinition;
 import org.hibernate.cfg.annotations.NamedProcedureCallDefinition;
 import org.hibernate.cfg.annotations.reflection.JPAMetadataProvider;
@@ -876,12 +875,14 @@ public class Configuration implements Serializable {
 	 */
 	public Configuration addDirectory(File dir) throws MappingException {
 		File[] files = dir.listFiles();
-		for ( File file : files ) {
+		if ( files != null ) {
-			if ( file.isDirectory() ) {
+			for ( File file : files ) {
-				addDirectory( file );
+				if ( file.isDirectory() ) {
-			}
+					addDirectory( file );
-			else if ( file.getName().endsWith( ".hbm.xml" ) ) {
+				}
-				addFile( file );
+				else if ( file.getName().endsWith( ".hbm.xml" ) ) {
+					addFile( file );
+				}
 			}
 		}
 		return this;
@@ -1527,10 +1528,8 @@ public class Configuration implements Serializable {
 		for ( FkSecondPass sp : dependencies ) {
 			String dependentTable = quotedTableName(sp.getValue().getTable());
 			if ( dependentTable.compareTo( startTable ) == 0 ) {
-				StringBuilder sb = new StringBuilder(
+				String sb = "Foreign key circularity dependency involving the following tables: ";
-						"Foreign key circularity dependency involving the following tables: "
+				throw new AnnotationException( sb );
-				);
-				throw new AnnotationException( sb.toString() );
 			}
 			buildRecursiveOrderedFkSecondPasses( orderedFkSecondPasses, isADependencyOf, startTable, dependentTable );
 			if ( !orderedFkSecondPasses.contains( sp ) ) {
@@ -3151,7 +3150,7 @@ public class Configuration implements Serializable {
 			}
 			return finalName;
 		}
-
+		@Override
 		public String getLogicalColumnName(String physicalName, Table table) throws MappingException {
 			String logical = null;
 			Table currentTable = table;
@@ -3172,7 +3171,7 @@ public class Configuration implements Serializable {
 					currentTable = null;
 				}
 			}
-			while ( logical == null && currentTable != null && description != null );
+			while ( logical == null && currentTable != null );
 			if ( logical == null ) {
 				throw new MappingException(
 						"Unable to find logical column name from physical name "
@@ -3294,41 +3293,38 @@ public class Configuration implements Serializable {
 		}
 
 		private Boolean useNewGeneratorMappings;
-
+		@Override
-		@SuppressWarnings({ "UnnecessaryUnboxing" })
 		public boolean useNewGeneratorMappings() {
 			if ( useNewGeneratorMappings == null ) {
 				final String booleanName = getConfigurationProperties()
 						.getProperty( AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS );
 				useNewGeneratorMappings = Boolean.valueOf( booleanName );
 			}
-			return useNewGeneratorMappings.booleanValue();
+			return useNewGeneratorMappings;
 		}
 
 		private Boolean useNationalizedCharacterData;
 
 		@Override
-		@SuppressWarnings( {"UnnecessaryUnboxing"})
 		public boolean useNationalizedCharacterData() {
 			if ( useNationalizedCharacterData == null ) {
 				final String booleanName = getConfigurationProperties()
 						.getProperty( AvailableSettings.USE_NATIONALIZED_CHARACTER_DATA );
 				useNationalizedCharacterData = Boolean.valueOf( booleanName );
 			}
-			return useNationalizedCharacterData.booleanValue();
+			return useNationalizedCharacterData;
 		}
 
 		private Boolean forceDiscriminatorInSelectsByDefault;
 
 		@Override
-		@SuppressWarnings( {"UnnecessaryUnboxing"})
 		public boolean forceDiscriminatorInSelectsByDefault() {
 			if ( forceDiscriminatorInSelectsByDefault == null ) {
 				final String booleanName = getConfigurationProperties()
 						.getProperty( AvailableSettings.FORCE_DISCRIMINATOR_IN_SELECTS_BY_DEFAULT );
 				forceDiscriminatorInSelectsByDefault = Boolean.valueOf( booleanName );
 			}
-			return forceDiscriminatorInSelectsByDefault.booleanValue();
+			return forceDiscriminatorInSelectsByDefault;
 		}
 
 		public IdGenerator getGenerator(String name) {
@@ -3520,7 +3516,7 @@ public class Configuration implements Serializable {
 			//Do not cache this value as we lazily set it in Hibernate Annotation (AnnotationConfiguration)
 			//TODO use a dedicated protected useQuotedIdentifier flag in Configuration (overriden by AnnotationConfiguration)
 			String setting = (String) properties.get( Environment.GLOBALLY_QUOTED_IDENTIFIERS );
-			return setting != null && Boolean.valueOf( setting ).booleanValue();
+			return setting != null && Boolean.valueOf( setting );
 		}
 
 		public NamingStrategy getNamingStrategy() {

hibernate-core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java

@@ -129,4 +129,4 @@ public class DefaultNamingStrategy implements NamingStrategy, Serializable {
 	public String logicalCollectionColumnName(String columnName, String propertyName, String referencedColumn) {
 		return StringHelper.isNotEmpty( columnName ) ? columnName : propertyName + "_" + referencedColumn;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/cfg/ExtendedMappings.java

@@ -36,4 +36,4 @@ package org.hibernate.cfg;
  */
 @Deprecated
 public interface ExtendedMappings extends Mappings {
-}
+}

hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java

@@ -1528,4 +1528,4 @@ public abstract class CollectionBinder {
 	public void setLocalGenerators(HashMap<String, IdGenerator> localGenerators) {
 		this.localGenerators = localGenerators;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentBag.java

@@ -284,10 +284,9 @@ public class PersistentBag extends AbstractPersistentCollection implements List
 	}
 
 	@Override
-	@SuppressWarnings("UnnecessaryUnboxing")
 	public boolean contains(Object object) {
 		final Boolean exists = readElementExistence( object );
-		return exists == null ? bag.contains( object ) : exists.booleanValue();
+		return exists == null ? bag.contains( object ) : exists;
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentList.java

@@ -136,12 +136,11 @@ public class PersistentList extends AbstractPersistentCollection implements List
 	}
 
 	@Override
-	@SuppressWarnings("UnnecessaryUnboxing")
 	public boolean contains(Object object) {
 		final Boolean exists = readElementExistence( object );
 		return exists == null
 				? list.contains( object )
-				: exists.booleanValue();
+				: exists;
 	}
 
 	@Override
@@ -176,7 +175,6 @@ public class PersistentList extends AbstractPersistentCollection implements List
 	}
 
 	@Override
-	@SuppressWarnings("UnnecessaryUnboxing")
 	public boolean remove(Object value) {
 		final Boolean exists = isPutQueueEnabled() ? readElementExistence( value ) : null;
 		if ( exists == null ) {
@@ -189,7 +187,7 @@ public class PersistentList extends AbstractPersistentCollection implements List
 				return false;
 			}
 		}
-		else if ( exists.booleanValue() ) {
+		else if ( exists ) {
 			queueOperation( new SimpleRemove( value ) );
 			return true;
 		}

hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentMap.java

@@ -146,19 +146,17 @@ public class PersistentMap extends AbstractPersistentCollection implements Map {
 	}
 
 	@Override
-	@SuppressWarnings("UnnecessaryUnboxing")
 	public boolean containsKey(Object key) {
 		final Boolean exists = readIndexExistence( key );
-		return exists == null ? map.containsKey( key ) :  exists.booleanValue();
+		return exists == null ? map.containsKey( key ) : exists;
 	}
 
 	@Override
-	@SuppressWarnings("UnnecessaryUnboxing")
 	public boolean containsValue(Object value) {
 		final Boolean exists = readElementExistence( value );
 		return exists == null
 				? map.containsValue( value )
-				: exists.booleanValue();
+				: exists;
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentSet.java

@@ -167,12 +167,11 @@ public class PersistentSet extends AbstractPersistentCollection implements java.
 	}
 
 	@Override
-	@SuppressWarnings({"unchecked", "UnnecessaryUnboxing"})
 	public boolean contains(Object object) {
 		final Boolean exists = readElementExistence( object );
 		return exists == null
 				? set.contains( object )
-				: exists.booleanValue();
+				: exists;
 	}
 
 	@Override
@@ -197,7 +196,6 @@ public class PersistentSet extends AbstractPersistentCollection implements java.
 	}
 
 	@Override
-	@SuppressWarnings({"unchecked", "UnnecessaryUnboxing"})
 	public boolean add(Object value) {
 		final Boolean exists = isOperationQueueEnabled() ? readElementExistence( value ) : null;
 		if ( exists == null ) {
@@ -210,7 +208,7 @@ public class PersistentSet extends AbstractPersistentCollection implements java.
 				return false;
 			}
 		}
-		else if ( exists.booleanValue() ) {
+		else if ( exists ) {
 			return false;
 		}
 		else {
@@ -220,7 +218,6 @@ public class PersistentSet extends AbstractPersistentCollection implements java.
 	}
 
 	@Override
-	@SuppressWarnings({"unchecked", "UnnecessaryUnboxing"})
 	public boolean remove(Object value) {
 		final Boolean exists = isPutQueueEnabled() ? readElementExistence( value ) : null;
 		if ( exists == null ) {
@@ -233,7 +230,7 @@ public class PersistentSet extends AbstractPersistentCollection implements java.
 				return false;
 			}
 		}
-		else if ( exists.booleanValue() ) {
+		else if ( exists ) {
 			queueOperation( new SimpleRemove( value ) );
 			return true;
 		}

hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java

@@ -77,15 +77,14 @@ public class DerbyDialect extends DB2Dialect {
 		}
 	}
 
-	@SuppressWarnings({"UnnecessaryUnboxing", "unchecked"})
 	private void determineDriverVersion() {
 		try {
 			// locate the derby sysinfo class and query its version info
 			final Class sysinfoClass = ReflectHelper.classForName( "org.apache.derby.tools.sysinfo", this.getClass() );
 			final Method majorVersionGetter = sysinfoClass.getMethod( "getMajorVersion", ReflectHelper.NO_PARAM_SIGNATURE );
 			final Method minorVersionGetter = sysinfoClass.getMethod( "getMinorVersion", ReflectHelper.NO_PARAM_SIGNATURE );
-			driverVersionMajor = ( (Integer) majorVersionGetter.invoke( null, ReflectHelper.NO_PARAMS ) ).intValue();
+			driverVersionMajor = (Integer) majorVersionGetter.invoke( null, ReflectHelper.NO_PARAMS );
-			driverVersionMinor = ( (Integer) minorVersionGetter.invoke( null, ReflectHelper.NO_PARAMS ) ).intValue();
+			driverVersionMinor = (Integer) minorVersionGetter.invoke( null, ReflectHelper.NO_PARAMS );
 		}
 		catch ( Exception e ) {
 			LOG.unableToLoadDerbyDriver( e.getMessage() );

hibernate-core/src/main/java/org/hibernate/dialect/function/TemplateRenderer.java

@@ -50,7 +50,6 @@ public class TemplateRenderer {
 	 *
 	 * @param template The template
 	 */
-	@SuppressWarnings({ "UnnecessaryUnboxing" })
 	public TemplateRenderer(String template) {
 		this.template = template;
 

hibernate-core/src/main/java/org/hibernate/engine/internal/ForeignKeys.java

@@ -225,7 +225,6 @@ public final class ForeignKeys {
 	 *
 	 * @return {@code true} if the given entity is transient (unsaved)
 	 */
-	@SuppressWarnings("UnnecessaryUnboxing")
 	public static boolean isTransient(String entityName, Object entity, Boolean assumed, SessionImplementor session) {
 		if ( entity == LazyPropertyInitializer.UNFETCHED_PROPERTY ) {
 			// an unfetched association can only point to
@@ -236,20 +235,20 @@ public final class ForeignKeys {
 		// let the interceptor inspect the instance to decide
 		Boolean isUnsaved = session.getInterceptor().isTransient( entity );
 		if ( isUnsaved != null ) {
-			return isUnsaved.booleanValue();
+			return isUnsaved;
 		}
 
 		// let the persister inspect the instance to decide
 		final EntityPersister persister = session.getEntityPersister( entityName, entity );
 		isUnsaved = persister.isTransient( entity, session );
 		if ( isUnsaved != null ) {
-			return isUnsaved.booleanValue();
+			return isUnsaved;
 		}
 
 		// we use the assumed value, if there is one, to avoid hitting
 		// the database
 		if ( assumed != null ) {
-			return assumed.booleanValue();
+			return assumed;
 		}
 
 		// hit the database, after checking the session cache for a snapshot

hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java

@@ -104,13 +104,12 @@ public class BlobProxy implements InvocationHandler {
 	 * or toString/equals/hashCode are invoked.
 	 */
 	@Override
-	@SuppressWarnings({ "UnnecessaryBoxing" })
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 		final String methodName = method.getName();
 		final int argCount = method.getParameterTypes().length;
 
 		if ( "length".equals( methodName ) && argCount == 0 ) {
-			return Long.valueOf( getLength() );
+			return getLength();
 		}
 		if ( "getUnderlyingStream".equals( methodName ) ) {
 			return getUnderlyingStream(); // Reset stream if needed.
@@ -157,7 +156,7 @@ public class BlobProxy implements InvocationHandler {
 			return this.toString();
 		}
 		if ( "equals".equals( methodName ) && argCount == 1 ) {
-			return Boolean.valueOf( proxy == args[0] );
+			return proxy == args[0];
 		}
 		if ( "hashCode".equals( methodName ) && argCount == 0 ) {
 			return this.hashCode();

hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java

@@ -104,13 +104,12 @@ public class ClobProxy implements InvocationHandler {
 	 * {@link Clob#free}, or toString/equals/hashCode are invoked.
 	 */
 	@Override
-	@SuppressWarnings({ "UnnecessaryBoxing" })
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 		final String methodName = method.getName();
 		final int argCount = method.getParameterTypes().length;
 
 		if ( "length".equals( methodName ) && argCount == 0 ) {
-			return Long.valueOf( getLength() );
+			return getLength();
 		}
 		if ( "getUnderlyingStream".equals( methodName ) ) {
 			return getUnderlyingStream(); // Reset stream if needed.
@@ -161,7 +160,7 @@ public class ClobProxy implements InvocationHandler {
 			return this.toString();
 		}
 		if ( "equals".equals( methodName ) && argCount == 1 ) {
-			return Boolean.valueOf( proxy == args[0] );
+			return proxy == args[0];
 		}
 		if ( "hashCode".equals( methodName ) && argCount == 0 ) {
 			return this.hashCode();

hibernate-core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java

@@ -89,10 +89,9 @@ public class ResultSetWrapperProxy implements InvocationHandler {
 	}
 
 	@Override
-	@SuppressWarnings( {"UnnecessaryBoxing"})
 	public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 		if ( "findColumn".equals( method.getName() ) ) {
-			return Integer.valueOf( findColumn( (String) args[0] ) );
+			return findColumn( (String) args[0] );
 		}
 
 		if ( isFirstArgColumnLabel( method, args ) ) {
@@ -168,10 +167,9 @@ public class ResultSetWrapperProxy implements InvocationHandler {
 		return columnNameMethod.getDeclaringClass().getMethod( columnNameMethod.getName(), actualParameterTypes );
 	}
 
-	@SuppressWarnings( {"UnnecessaryBoxing"})
 	private Object[] buildColumnIndexMethodArgs(Object[] incomingArgs, int columnIndex) {
 		final Object[] actualArgs = new Object[incomingArgs.length];
-		actualArgs[0] = Integer.valueOf( columnIndex );
+		actualArgs[0] = columnIndex;
 		System.arraycopy( incomingArgs, 1, actualArgs, 1, incomingArgs.length - 1 );
 		return actualArgs;
 	}

hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java

@@ -57,7 +57,6 @@ import org.jboss.logging.Logger;
  * @author Gavin King
  * @author Steve Ebersole
  */
-@SuppressWarnings( {"UnnecessaryUnboxing"})
 public class DriverManagerConnectionProviderImpl
 		implements ConnectionProvider, Configurable, Stoppable, ServiceRegistryAwareService {
 	private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, DriverManagerConnectionProviderImpl.class.getName() );
@@ -141,7 +140,7 @@ public class DriverManagerConnectionProviderImpl
 
 		isolation = ConfigurationHelper.getInteger( AvailableSettings.ISOLATION, configurationValues );
 		if ( isolation != null ) {
-			LOG.jdbcIsolationLevel( Environment.isolationLevelToString( isolation.intValue() ) );
+			LOG.jdbcIsolationLevel( Environment.isolationLevelToString( isolation ) );
 		}
 
 		url = (String) configurationValues.get( AvailableSettings.URL );
@@ -195,7 +194,7 @@ public class DriverManagerConnectionProviderImpl
 				}
 				final Connection pooled = pool.remove( last );
 				if ( isolation != null ) {
-					pooled.setTransactionIsolation( isolation.intValue() );
+					pooled.setTransactionIsolation( isolation );
 				}
 				if ( pooled.getAutoCommit() != autocommit ) {
 					pooled.setAutoCommit( autocommit );
@@ -225,7 +224,7 @@ public class DriverManagerConnectionProviderImpl
 		}
 		
 		if ( isolation != null ) {
-			conn.setTransactionIsolation( isolation.intValue() );
+			conn.setTransactionIsolation( isolation );
 		}
 		if ( conn.getAutoCommit() != autocommit ) {
 			conn.setAutoCommit( autocommit );

hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java

@@ -174,12 +174,11 @@ public class StandardRefCursorSupport implements RefCursorSupport {
 	 *
 	 * @return {@code true} if the metadata indicates that the driver defines REF_CURSOR support
 	 */
-	@SuppressWarnings("UnnecessaryUnboxing")
 	public static boolean supportsRefCursors(DatabaseMetaData meta) {
 		// Standard JDBC REF_CURSOR support was not added until Java 8, so we need to use reflection to attempt to
 		// access these fields/methods...
 		try {
-			return ( (Boolean) meta.getClass().getMethod( "supportsRefCursors" ).invoke( null ) ).booleanValue();
+			return (Boolean) meta.getClass().getMethod( "supportsRefCursors" ).invoke( null );
 		}
 		catch (NoSuchMethodException e) {
 			log.trace( "JDBC DatabaseMetaData class does not define supportsRefCursors method..." );
@@ -193,7 +192,6 @@ public class StandardRefCursorSupport implements RefCursorSupport {
 
 	private static Integer refCursorTypeCode;
 
-	@SuppressWarnings("UnnecessaryUnboxing")
 	private int refCursorTypeCode() {
 		if ( refCursorTypeCode == null ) {
 			try {

hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/BasicFormatterImpl.java

@@ -274,13 +274,12 @@ public class BasicFormatterImpl implements Formatter {
 			}
 		}
 
-		@SuppressWarnings( {"UnnecessaryBoxing"})
 		private void select() {
 			out();
 			indent++;
 			newline();
-			parenCounts.addLast( Integer.valueOf( parensSinceSelect ) );
+			parenCounts.addLast( parensSinceSelect );
-			afterByOrFromOrSelects.addLast( Boolean.valueOf( afterByOrSetOrFromOrSelect ) );
+			afterByOrFromOrSelects.addLast( afterByOrSetOrFromOrSelect );
 			parensSinceSelect = 0;
 			afterByOrSetOrFromOrSelect = true;
 		}
@@ -332,13 +331,12 @@ public class BasicFormatterImpl implements Formatter {
 			afterValues = true;
 		}
 
-		@SuppressWarnings( {"UnnecessaryUnboxing"})
 		private void closeParen() {
 			parensSinceSelect--;
 			if ( parensSinceSelect < 0 ) {
 				indent--;
 				parensSinceSelect = parenCounts.removeLast();
-				afterByOrSetOrFromOrSelect = afterByOrFromOrSelects.removeLast().booleanValue();
+				afterByOrSetOrFromOrSelect = afterByOrFromOrSelects.removeLast();
 			}
 			if ( inFunction > 0 ) {
 				inFunction--;

hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java

@@ -106,7 +106,7 @@ public class HQLQueryPlan implements Serializable {
 		this.translators = new QueryTranslator[length];
 
 		final List<String> sqlStringList = new ArrayList<String>();
-		final Set combinedQuerySpaces = new HashSet();
+		final Set<Serializable> combinedQuerySpaces = new HashSet<Serializable>();
 
 		final boolean hasCollectionRole = (collectionRole == null);
 		final Map querySubstitutions = factory.getSettings().getQuerySubstitutions();

hibernate-core/src/main/java/org/hibernate/engine/query/spi/ParameterMetadata.java

@@ -129,7 +129,7 @@ public class ParameterMetadata implements Serializable {
 	 *
 	 * @return The named parameter names
 	 */
-	public Set getNamedParameterNames() {
+	public Set<String> getNamedParameterNames() {
 		return namedDescriptorMap.keySet();
 	}
 

hibernate-core/src/main/java/org/hibernate/engine/query/spi/QueryPlanCache.java

@@ -321,7 +321,6 @@ public class QueryPlanCache implements Serializable {
 		private final Map<String,Integer> parameterMetadata;
 		private final int hashCode;
 
-		@SuppressWarnings({ "UnnecessaryBoxing" })
 		private DynamicFilterKey(FilterImpl filter) {
 			this.filterName = filter.getName();
 			if ( filter.getParameters().isEmpty() ) {

hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java

@@ -782,7 +782,6 @@ public class ActionQueue {
 		/**
 		 * Sort the insert actions.
 		 */
-		@SuppressWarnings({ "unchecked", "UnnecessaryBoxing" })
 		public void sort() {
 			// the list of entity names that indicate the batch number
 			for ( EntityInsertAction action : (List<EntityInsertAction>) insertions ) {
@@ -831,7 +830,6 @@ public class ActionQueue {
 		 *
 		 * @return An appropriate batch number; todo document this process better
 		 */
-		@SuppressWarnings({ "UnnecessaryBoxing", "unchecked" })
 		private Integer findBatchNumber(
 				EntityInsertAction action,
 				String entityName) {

hibernate-core/src/main/java/org/hibernate/engine/spi/AssociationKey.java

@@ -67,4 +67,4 @@ public final class AssociationKey implements Serializable {
 		result = 31 * result + propertyName.hashCode();
 		return result;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java

@@ -101,4 +101,4 @@ public interface CascadingAction {
 	 * Should this action be performed (or noCascade consulted) in the case of lazy properties.
 	 */
 	public boolean performOnLazyProperty();
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/spi/CollectionKey.java

@@ -155,4 +155,4 @@ public final class CollectionKey implements Serializable {
 				(session == null ? null : session.getFactory())
 		);
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/spi/IdentifierValue.java

@@ -148,4 +148,4 @@ public class IdentifierValue implements UnsavedValueStrategy {
 	public String toString() {
 		return "identifier unsaved-value: " + value;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/spi/NamedQueryDefinitionBuilder.java

@@ -140,4 +140,4 @@ public class NamedQueryDefinitionBuilder {
 				maxResults
 		);
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/spi/NamedSQLQueryDefinition.java

@@ -239,4 +239,4 @@ public class NamedSQLQueryDefinition extends NamedQueryDefinition {
 				getQueryReturns()
 		);
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/spi/NamedSQLQueryDefinitionBuilder.java

@@ -181,4 +181,4 @@ public class NamedSQLQueryDefinitionBuilder extends NamedQueryDefinitionBuilder
 				? null
 				: new ArrayList<String>( querySpaces );
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/spi/NonFlushedChanges.java

@@ -30,4 +30,4 @@ public interface NonFlushedChanges extends Serializable {
 	 * Remove the non-flushed changes from this NonFlushedChanges object.
 	 */
 	void clear();
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/spi/VersionValue.java

@@ -135,4 +135,4 @@ public class VersionValue implements UnsavedValueStrategy {
     public String toString() {
 		return "version unsaved-value: " + value;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jdbc/JdbcTransaction.java

@@ -205,4 +205,4 @@ public class JdbcTransaction extends AbstractTransactionImpl {
 	public boolean isActive() throws HibernateException {
 		return getLocalStatus() == LocalStatus.ACTIVE;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jdbc/JdbcTransactionFactory.java

@@ -60,4 +60,4 @@ public final class JdbcTransactionFactory implements TransactionFactory<JdbcTran
 	public boolean isJoinableJtaTransaction(TransactionCoordinator transactionCoordinator, JdbcTransaction transaction) {
 		return false;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaTransactionFactory.java

@@ -101,4 +101,4 @@ public class JtaTransactionFactory implements TransactionFactory<JtaTransaction>
 		}
 	}
 
-}
+}

hibernate-core/src/main/java/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java

@@ -74,10 +74,9 @@ public class WebSphereExtendedJtaPlatform extends AbstractJtaPlatform {
 	}
 
 	@Override
-	@SuppressWarnings( {"UnnecessaryBoxing"})
 	public Object getTransactionIdentifier(Transaction transaction) {
 		// WebSphere, however, is not a sane JEE/JTA container...
-		return Integer.valueOf( transaction.hashCode() );
+		return transaction.hashCode();
 	}
 
 	public class TransactionManagerAdapter implements TransactionManager {

hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionCoordinator.java

@@ -141,4 +141,4 @@ public interface TransactionCoordinator extends Serializable {
 	public void sendBeforeTransactionCompletionNotifications(TransactionImplementor hibernateTransaction);
 	public void sendAfterTransactionCompletionNotifications(TransactionImplementor hibernateTransaction, int status);
 
-}
+}

hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java

@@ -363,4 +363,4 @@ class EventCache implements Map {
 		// Entity was not found in current persistence context. Use Object#toString() method.
 		return "[" + entity + "]";
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerServiceInitiator.java

@@ -58,4 +58,4 @@ public class EventListenerServiceInitiator implements SessionFactoryServiceIniti
 			ServiceRegistryImplementor registry) {
 		return new EventListenerRegistryImpl();
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java

@@ -139,7 +139,7 @@ public class HqlSqlWalker extends HqlSqlBaseWalker implements ErrorReporter, Par
 	 **/
 	private Map<String, SelectExpression> selectExpressionsByResultVariable = new HashMap<String, SelectExpression>();
 
-	private Set querySpaces = new HashSet();
+	private Set<Serializable> querySpaces = new HashSet<Serializable>();
 
 	private int parameterCount;
 	private Map namedParameters = new HashMap();
@@ -315,7 +315,7 @@ public class HqlSqlWalker extends HqlSqlBaseWalker implements ErrorReporter, Par
 	 *
 	 * @return A set of table names (Strings).
 	 */
-	public Set getQuerySpaces() {
+	public Set<Serializable> getQuerySpaces() {
 		return querySpaces;
 	}
 

hibernate-core/src/main/java/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java

@@ -23,6 +23,7 @@
  */
 package org.hibernate.hql.internal.ast;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -342,7 +343,7 @@ public class QueryTranslatorImpl implements FilterTranslator {
 		return getWalker().getSelectClause().getColumnNames();
 	}
 	@Override
-	public Set getQuerySpaces() {
+	public Set<Serializable> getQuerySpaces() {
 		return getWalker().getQuerySpaces();
 	}
 

hibernate-core/src/main/java/org/hibernate/hql/internal/ast/TypeDiscriminatorMetadata.java

@@ -45,4 +45,4 @@ public interface TypeDiscriminatorMetadata {
 	 * @return The resolution type.
 	 */
 	public Type getResolutionType();
-}
+}

hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/ASTPrinter.java

@@ -226,4 +226,4 @@ public class ASTPrinter {
         appendEscapedMultibyteChars(text,buf);
         return buf.toString();
     }
-}
+}

hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/LiteralProcessor.java

@@ -339,4 +339,4 @@ public class LiteralProcessor implements HqlSqlTokenTypes {
 		public abstract DecimalFormatter getFormatter();
 	}
 
-}
+}

hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java

@@ -31,6 +31,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -107,7 +108,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	private final Map joins = new LinkedHashMap();
 	private final List orderByTokens = new ArrayList();
 	private final List groupByTokens = new ArrayList();
-	private final Set querySpaces = new HashSet();
+	private final Set<Serializable> querySpaces = new HashSet<Serializable>();
 	private final Set entitiesToFetch = new HashSet();
 
 	private final Map pathAliases = new HashMap();
@@ -821,7 +822,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 
 	}
 
-	public final Set getQuerySpaces() {
+	public final Set<Serializable> getQuerySpaces() {
 		return querySpaces;
 	}
 
@@ -835,9 +836,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	void addQuerySpaces(Serializable[] spaces) {
-		for ( int i = 0; i < spaces.length; i++ ) {
+		Collections.addAll( querySpaces, spaces );
-			querySpaces.add( spaces[i] );
-		}
 		if ( superQuery != null ) superQuery.addQuerySpaces( spaces );
 	}
 
@@ -936,6 +935,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 		pathJoins.put( path, joinSequence );
 	}
 
+	@Override
 	public List list(SessionImplementor session, QueryParameters queryParameters)
 			throws HibernateException {
 		return list( session, queryParameters, getQuerySpaces(), actualReturnTypes );
@@ -944,6 +944,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	/**
 	 * Return the query results as an iterator
 	 */
+	@Override
 	public Iterator iterate(QueryParameters queryParameters, EventSource session)
 			throws HibernateException {
 

hibernate-core/src/main/java/org/hibernate/hql/spi/QueryTranslator.java

@@ -23,6 +23,7 @@
  */
 package org.hibernate.hql.spi;
 
+import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -110,7 +111,7 @@ public interface QueryTranslator {
 	 *
 	 * @return A set of query spaces (table names).
 	 */
-	Set getQuerySpaces();
+	Set<Serializable> getQuerySpaces();
 
 	/**
 	 * Retrieve the query identifier for this translator.  The query identifier is

hibernate-core/src/main/java/org/hibernate/hql/spi/TemporaryTableBulkIdStrategy.java

@@ -162,16 +162,14 @@ public class TemporaryTableBulkIdStrategy implements MultiTableBulkIdStrategy {
 		}
 	}
 
-	@SuppressWarnings({ "UnnecessaryUnboxing" })
 	protected boolean shouldIsolateTemporaryTableDDL(SessionImplementor session) {
 		Boolean dialectVote = session.getFactory().getDialect().performTemporaryTableDDLInIsolation();
 		if ( dialectVote != null ) {
-			return dialectVote.booleanValue();
+			return dialectVote;
 		}
 		return session.getFactory().getSettings().isDataDefinitionImplicitCommit();
 	}
 
-	@SuppressWarnings({ "UnnecessaryUnboxing" })
 	protected boolean shouldTransactIsolatedTemporaryTableDDL(SessionImplementor session) {
 		// is there ever a time when it makes sense to do this?
 //		return session.getFactory().getSettings().isDataDefinitionInTransactionSupported();

hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java

@@ -67,7 +67,6 @@ public class OptimizerFactory {
 	 * @deprecated Use {@link #buildOptimizer(String, Class, int, long)} instead
 	 */
 	@Deprecated
-	@SuppressWarnings( {"UnnecessaryBoxing", "unchecked"})
 	public static Optimizer buildOptimizer(String type, Class returnClass, int incrementSize) {
 		final Class<? extends Optimizer> optimizerClass;
 
@@ -87,7 +86,7 @@ public class OptimizerFactory {
 
 		try {
 			final Constructor ctor = optimizerClass.getConstructor( CTOR_SIG );
-			return (Optimizer) ctor.newInstance( returnClass, Integer.valueOf( incrementSize ) );
+			return (Optimizer) ctor.newInstance( returnClass, incrementSize );
 		}
 		catch( Throwable ignore ) {
 			LOG.unableToInstantiateOptimizer( type );
@@ -110,7 +109,6 @@ public class OptimizerFactory {
 	 *
 	 * @return The built optimizer
 	 */
-	@SuppressWarnings({ "UnnecessaryBoxing", "deprecation" })
 	public static Optimizer buildOptimizer(String type, Class returnClass, int incrementSize, long explicitInitialValue) {
 		final Optimizer optimizer = buildOptimizer( type, returnClass, incrementSize );
 		if ( InitialValueAwareOptimizer.class.isInstance( optimizer ) ) {

hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java

@@ -91,7 +91,7 @@ public abstract class AbstractQueryImpl implements Query {
 	private List values = new ArrayList(4);
 	private List types = new ArrayList(4);
 	private Map<String,TypedValue> namedParameters = new HashMap<String, TypedValue>(4);
-	private Map namedParameterLists = new HashMap(4);
+	private Map<String, TypedValue> namedParameterLists = new HashMap<String, TypedValue>(4);
 
 	private Object optionalObject;
 	private Serializable optionalId;
@@ -256,24 +256,20 @@ public abstract class AbstractQueryImpl implements Query {
 		return this;
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public boolean isReadOnly() {
 		return ( readOnly == null ?
 				getSession().getPersistenceContext().isDefaultReadOnly() :
-				readOnly.booleanValue() 
+				readOnly
 		);
 	}
 
-	/**
+	@Override
-	 * {@inheritDoc}
-	 */
 	public Query setReadOnly(boolean readOnly) {
-		this.readOnly = Boolean.valueOf( readOnly );
+		this.readOnly = readOnly;
 		return this;
 	}
-
+	@Override
 	public Query setResultTransformer(ResultTransformer transformer) {
 		this.resultTransformer = transformer;
 		return this;
@@ -294,7 +290,7 @@ public abstract class AbstractQueryImpl implements Query {
 	SessionImplementor getSession() {
 		return session;
 	}
-
+	@Override
 	public abstract LockOptions getLockOptions();
 
 
@@ -305,8 +301,8 @@ public abstract class AbstractQueryImpl implements Query {
 	 *
 	 * @return Shallow copy of the named parameter value map
 	 */
-	protected Map getNamedParams() {
+	protected Map<String, TypedValue> getNamedParams() {
-		return new HashMap( namedParameters );
+		return new HashMap<String, TypedValue>( namedParameters );
 	}
 
 	/**
@@ -323,6 +319,7 @@ public abstract class AbstractQueryImpl implements Query {
 	 * @return Array of named parameter names.
 	 * @throws HibernateException
 	 */
+	@Override
 	public String[] getNamedParameters() throws HibernateException {
 		return ArrayHelper.toStringArray( parameterMetadata.getNamedParameterNames() );
 	}
@@ -343,7 +340,7 @@ public abstract class AbstractQueryImpl implements Query {
 	 *
 	 * @return The parameter list value map.
 	 */
-	protected Map getNamedParameterLists() {
+	protected Map<String, TypedValue> getNamedParameterLists() {
 		return namedParameterLists;
 	}
 
@@ -387,7 +384,7 @@ public abstract class AbstractQueryImpl implements Query {
 	 */
 	protected void verifyParameters(boolean reserveFirstParameter) throws HibernateException {
 		if ( parameterMetadata.getNamedParameterNames().size() != namedParameters.size() + namedParameterLists.size() ) {
-			Set missingParams = new HashSet( parameterMetadata.getNamedParameterNames() );
+			Set<String> missingParams = new HashSet<String>( parameterMetadata.getNamedParameterNames() );
 			missingParams.removeAll( namedParameterLists.keySet() );
 			missingParams.removeAll( namedParameters.keySet() );
 			throw new QueryException( "Not all named parameters have been set: " + missingParams, getQueryString() );
@@ -776,6 +773,7 @@ public abstract class AbstractQueryImpl implements Query {
 		return this;
 	}
 
+	@Override
 	public Query setParameterList(String name, Collection vals, Type type) throws HibernateException {
 		if ( !parameterMetadata.getNamedParameterNames().contains( name ) ) {
 			throw new IllegalArgumentException("Parameter " + name + " does not exist as a named parameter in [" + getQueryString() + "]");
@@ -790,9 +788,8 @@ public abstract class AbstractQueryImpl implements Query {
 	 */
 	protected String expandParameterLists(Map namedParamsCopy) {
 		String query = this.queryString;
-		Iterator iter = namedParameterLists.entrySet().iterator();
+		for ( Map.Entry<String, TypedValue> stringTypedValueEntry : namedParameterLists.entrySet() ) {
-		while ( iter.hasNext() ) {
+			Map.Entry me = (Map.Entry) stringTypedValueEntry;
-			Map.Entry me = (Map.Entry) iter.next();
 			query = expandParameterList( query, (String) me.getKey(), (TypedValue) me.getValue(), namedParamsCopy );
 		}
 		return query;

hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java

@@ -27,7 +27,6 @@ import java.io.Serializable;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 
 import org.hibernate.HibernateException;
@@ -187,7 +186,6 @@ public abstract class AbstractSessionImpl
 		return query;
 	}
 
-	@SuppressWarnings("UnnecessaryUnboxing")
 	private void initQuery(Query query, NamedQueryDefinition nqd) {
 		// todo : cacheable and readonly should be Boolean rather than boolean...
 		query.setCacheable( nqd.isCacheable() );

hibernate-core/src/main/java/org/hibernate/internal/FilterConfiguration.java

@@ -92,4 +92,4 @@ public class FilterConfiguration {
 		}
 		return ret;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/internal/NonFlushedChangesImpl.java

@@ -72,4 +72,4 @@ public final class NonFlushedChangesImpl implements NonFlushedChanges, Serializa
 		actionQueue.serialize( oos );
 	}
 
-}
+}

hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java

@@ -2461,4 +2461,4 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			put(key, value);
 		}
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java

@@ -267,4 +267,4 @@ public final class IdentityMap<K,V> implements Map<K,V> {
 		}
 	}
 
-}
+}

hibernate-core/src/main/java/org/hibernate/loader/Loader.java

@@ -2325,7 +2325,7 @@ public abstract class Loader {
 	protected List list(
 	        final SessionImplementor session,
 	        final QueryParameters queryParameters,
-	        final Set querySpaces,
+	        final Set<Serializable> querySpaces,
 	        final Type[] resultTypes) throws HibernateException {
 
 		final boolean cacheable = factory.getSettings().isQueryCacheEnabled() &&
@@ -2346,7 +2346,7 @@ public abstract class Loader {
 	private List listUsingQueryCache(
 			final SessionImplementor session,
 			final QueryParameters queryParameters,
-			final Set querySpaces,
+			final Set<Serializable> querySpaces,
 			final Type[] resultTypes) {
 
 		QueryCache queryCache = factory.getQueryCache( queryParameters.getCacheRegion() );
@@ -2423,7 +2423,7 @@ public abstract class Loader {
 	private List getResultFromQueryCache(
 			final SessionImplementor session,
 			final QueryParameters queryParameters,
-			final Set querySpaces,
+			final Set<Serializable> querySpaces,
 			final Type[] resultTypes,
 			final QueryCache queryCache,
 			final QueryKey key) {

hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java

@@ -23,6 +23,7 @@
  *
  */
 package org.hibernate.loader.criteria;
+import java.io.Serializable;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -68,7 +69,7 @@ public class CriteriaLoader extends OuterJoinLoader {
 	//      multithreaded, or cacheable!!
 
 	private final CriteriaQueryTranslator translator;
-	private final Set querySpaces;
+	private final Set<Serializable> querySpaces;
 	private final Type[] resultTypes;
 	//the user visible aliases, which are unknown to the superclass,
 	//these are not the actual "physical" SQL aliases

hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java

@@ -23,6 +23,7 @@
  */
 package org.hibernate.loader.custom;
 
+import java.io.Serializable;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -71,7 +72,7 @@ public class CustomLoader extends Loader {
 	// Currently *not* cachable if autodiscover types is in effect (e.g. "select * ...")
 
 	private final String sql;
-	private final Set querySpaces = new HashSet();
+	private final Set<Serializable> querySpaces = new HashSet<Serializable>();
 	private final Map namedParameterBindPoints;
 
 	private final Queryable[] entityPersisters;

hibernate-core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java

@@ -132,4 +132,4 @@ public class CollectionElementLoader extends OuterJoinLoader {
     protected boolean isSingleRowLoader() {
 		return true;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/loader/entity/EntityJoinWalker.java

@@ -255,4 +255,4 @@ public class EntityJoinWalker extends AbstractEntityJoinWalker {
 		}
 	}
 
-}
+}

hibernate-core/src/main/java/org/hibernate/loader/entity/EntityLoader.java

@@ -170,4 +170,4 @@ public class EntityLoader extends AbstractEntityLoader {
     public int[][] getCompositeKeyManyToOneTargetIndices() {
 		return compositeKeyManyToOneTargetIndices;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/loader/internal/AbstractLoadQueryImpl.java

@@ -310,4 +310,4 @@ public abstract class AbstractLoadQueryImpl {
 				association.getJoinable().whereJoinFragment( rhsAlias, false, true )
 		);
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/loader/internal/CollectionJoinableAssociationImpl.java

@@ -90,4 +90,4 @@ public class CollectionJoinableAssociationImpl extends AbstractJoinableAssociati
 	protected boolean isOneToOne() {
 		return false;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/loader/internal/EntityJoinableAssociationImpl.java

@@ -86,4 +86,4 @@ public class EntityJoinableAssociationImpl extends AbstractJoinableAssociationIm
 		EntityType entityType = (EntityType) joinableType;
 		return entityType.isOneToOne() /*&& entityType.isReferenceToPrimaryKey()*/;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/loader/internal/EntityLoadQueryImpl.java

@@ -65,4 +65,4 @@ public class EntityLoadQueryImpl extends AbstractEntityLoadQueryImpl {
 	protected String getComment() {
 		return "load " + getPersister().getEntityName();
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/loader/plan/spi/FetchOwnerDelegate.java

@@ -66,4 +66,4 @@ public interface FetchOwnerDelegate {
 	 * be located.
 	 */
 	public FetchMetadata locateFetchMetadata(Fetch fetch);
-}
+}

hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java

@@ -41,4 +41,4 @@ public class ReaderInputStream extends org.hibernate.engine.jdbc.ReaderInputStre
 		return super.read();
 	}
 
-}
+}

hibernate-core/src/main/java/org/hibernate/mapping/Collection.java

@@ -667,4 +667,4 @@ public abstract class Collection implements Fetchable, Value, Filterable {
 	public String getComparatorClassName() {
 		return comparatorClassName;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java

@@ -880,4 +880,4 @@ public abstract class PersistentClass implements Serializable, Filterable, MetaA
 
 	// End of @Mappedsuperclass support
 
-}
+}

hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java

@@ -608,4 +608,4 @@ public class SimpleValue implements KeyValue {
 			return columns;
 		}
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/mapping/Value.java

@@ -55,4 +55,4 @@ public interface Value extends Serializable {
 	public boolean isValid(Mapping mapping) throws MappingException;
 	public void setTypeUsingReflection(String className, String propertyName) throws MappingException;
 	public Object accept(ValueVisitor visitor);
-}
+}

hibernate-core/src/main/java/org/hibernate/metamodel/binding/ManyToOneAttributeBinding.java

@@ -238,4 +238,4 @@ public class ManyToOneAttributeBinding extends BasicAttributeBinding implements
 //		}
 //		//TODO: validate that the entity reference is resolved
 //	}
-}
+}

hibernate-core/src/main/java/org/hibernate/metamodel/binding/SingularAssociationAttributeBinding.java

@@ -62,4 +62,4 @@ public interface SingularAssociationAttributeBinding extends SingularAttributeBi
 	public boolean isReferenceResolved();
 	public EntityBinding getReferencedEntityBinding();
 	public AttributeBinding getReferencedAttributeBinding();
-}
+}

hibernate-core/src/main/java/org/hibernate/metamodel/domain/AbstractAttributeContainer.java

@@ -305,4 +305,4 @@ public abstract class AbstractAttributeContainer implements AttributeContainer,
 			this.indexType = indexType;
 		}
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/package-info.java

@@ -25,4 +25,4 @@ package org.hibernate.metamodel.source.annotations.attribute;
 
 /**
  * This package contains binding code for attributes.
- */
+ */

hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/attribute/type/package-info.java

@@ -25,4 +25,4 @@ package org.hibernate.metamodel.source.annotations.attribute.type;
 
 /**
  * This package contains type binding code for basic attributes.
- */
+ */

hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/filter/AbstractAnnotationFilter.java

@@ -76,4 +76,4 @@ abstract class AbstractAnnotationFilter implements IndexedAnnotationFilter {
 	protected DotName[] targetAnnotation() {
 		return EMPTY_DOTNAME_ARRAY;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/metamodel/source/annotations/xml/mocker/AbstractAttributesBuilder.java

@@ -124,4 +124,4 @@ abstract class AbstractAttributesBuilder {
 	abstract List<JaxbOneToOne> getOneToOne();
 
 	abstract JaxbEmbeddedId getEmbeddedId();
-}
+}

hibernate-core/src/main/java/org/hibernate/metamodel/source/hbm/HibernateMappingProcessor.java

@@ -284,4 +284,4 @@ public class HibernateMappingProcessor {
 			}
 		}
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/SessionFactoryBuilderImpl.java

@@ -96,4 +96,4 @@ public class SessionFactoryBuilderImpl implements SessionFactoryBuilder {
 			return entityNotFoundDelegate;
 		}
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/persister/collection/ElementPropertyMapping.java

@@ -72,4 +72,4 @@ public class ElementPropertyMapping implements PropertyMapping {
 		return type;
 	}
 
-}
+}

hibernate-core/src/main/java/org/hibernate/persister/collection/NamedQueryCollectionInitializer.java

@@ -74,4 +74,4 @@ public final class NamedQueryCollectionInitializer implements CollectionInitiali
 				.list();
 
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -771,7 +771,7 @@ public abstract class AbstractEntityPersister
 		iter = definedBySubclass.iterator();
 		j = 0;
 		while ( iter.hasNext() ) {
-			propertyDefinedOnSubclass[j++] = ( ( Boolean ) iter.next() ).booleanValue();
+			propertyDefinedOnSubclass[j++] = (Boolean) iter.next();
 		}
 
 		// Handle any filters applied to the class level
@@ -4875,12 +4875,11 @@ public abstract class AbstractEntityPersister
 		return generateEntityIdByNaturalIdSql( valueNullness );
 	}
 
-	@SuppressWarnings("UnnecessaryUnboxing")
 	protected boolean isNaturalIdNonNullable() {
 		if ( naturalIdIsNonNullable == null ) {
 			naturalIdIsNonNullable = determineNaturalIdNullability();
 		}
-		return naturalIdIsNonNullable.booleanValue();
+		return naturalIdIsNonNullable;
 	}
 
 	private boolean determineNaturalIdNullability() {

hibernate-core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java

@@ -92,4 +92,4 @@ public final class NamedQueryLoader implements UniqueEntityLoader {
 		return session.getPersistenceContext().getEntity( session.generateEntityKey( id, persister ) );
 
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/persister/walking/internal/EntityIdentifierDefinitionHelper.java

@@ -150,4 +150,4 @@ public class EntityIdentifierDefinitionHelper {
 			return  CompositionSingularSubAttributesHelper.getIdentifierSubAttributes( getEntityPersister() );
 		}
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/persister/walking/spi/package-info.java

@@ -3,4 +3,4 @@ package org.hibernate.persister.walking.spi;
 /**
  * Package for "walking" associations through metadata definition.  Ultimately want {@link org.hibernate.persister.walking.spi.AttributeDefinition} and
  * {@link AttributeSource} etc to become part of the persister model.
- */
+ */

hibernate-core/src/main/java/org/hibernate/procedure/package-info.java

@@ -34,4 +34,4 @@ package org.hibernate.procedure;
  * @see org.hibernate.Session#createStoredProcedureCall(String)
  * @see org.hibernate.Session#createStoredProcedureCall(String, Class[])
  * @see org.hibernate.Session#createStoredProcedureCall(String, String...)
- */
+ */

hibernate-core/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java

@@ -132,7 +132,7 @@ public abstract class AbstractLazyInitializer implements LazyInitializer {
 				}
 				else {
 					// use the read-only/modifiable setting indicated during deserialization
-					setReadOnly( readOnlyBeforeAttachedToSession.booleanValue() );
+					setReadOnly( readOnlyBeforeAttachedToSession );
 					readOnlyBeforeAttachedToSession = null;
 				}
 			}

hibernate-core/src/main/java/org/hibernate/proxy/pojo/BasicLazyInitializer.java

@@ -68,7 +68,6 @@ public abstract class BasicLazyInitializer extends AbstractLazyInitializer {
 
 	protected abstract Object serializableProxy();
 
-	@SuppressWarnings({ "UnnecessaryBoxing" })
 	protected final Object invoke(Method method, Object[] args, Object proxy) throws Throwable {
 		String methodName = method.getName();
 		int params = args.length;
@@ -78,7 +77,7 @@ public abstract class BasicLazyInitializer extends AbstractLazyInitializer {
 				return getReplacement();
 			}
 			else if ( !overridesEquals && "hashCode".equals(methodName) ) {
-				return Integer.valueOf( System.identityHashCode(proxy) );
+				return System.identityHashCode(proxy);
 			}
 			else if ( isUninitialized() && method.equals(getIdentifierMethod) ) {
 				return getIdentifier();

hibernate-core/src/main/java/org/hibernate/result/package-info.java

@@ -21,4 +21,4 @@ package org.hibernate.result;
  *         }
  *     }
  * </code>
- */
+ */

hibernate-core/src/main/java/org/hibernate/secure/package-info.java

@@ -2,4 +2,4 @@ package org.hibernate.secure;
 
 /**
  * Package defining support for declarative security of CRUD operations via JACC.
- */
+ */

hibernate-core/src/main/java/org/hibernate/service/internal/ServiceDependencyException.java

@@ -37,4 +37,4 @@ public class ServiceDependencyException extends HibernateException {
 	public ServiceDependencyException(String s) {
 		super( s );
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/sql/DecodeCaseFragment.java

@@ -66,4 +66,4 @@ public class DecodeCaseFragment extends CaseFragment {
 		
 		return buf.toString();
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/stat/Statistics.java

@@ -272,4 +272,4 @@ public interface Statistics {
 	 * that occurred
 	 */
 	public long getOptimisticFailureCount();
-}
+}

hibernate-core/src/main/java/org/hibernate/stat/internal/ConcurrentStatisticsImpl.java

@@ -406,9 +406,9 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 		}
 	}
 
-	@SuppressWarnings({ "UnnecessaryBoxing" })
+	@Override
 	public void queryExecuted(String hql, int rows, long time) {
-        LOG.hql(hql, Long.valueOf(time), Long.valueOf(rows));
+        LOG.hql(hql, time, (long) rows );
 		queryExecutionCount.getAndIncrement();
 		boolean isLongestQuery = false;
 		for ( long old = queryExecutionMaxTime.get();
@@ -424,7 +424,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 			qs.executed( rows, time );
 		}
 	}
-
+	@Override
 	public void queryCacheHit(String hql, String regionName) {
 		queryCacheHitCount.getAndIncrement();
 		if ( hql != null ) {
@@ -436,7 +436,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 		);
 		slcs.incrementHitCount();
 	}
-
+	@Override
 	public void queryCacheMiss(String hql, String regionName) {
 		queryCacheMissCount.getAndIncrement();
 		if ( hql != null ) {
@@ -448,7 +448,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 		);
 		slcs.incrementMissCount();
 	}
-
+	@Override
 	public void queryCachePut(String hql, String regionName) {
 		queryCachePutCount.getAndIncrement();
 		if ( hql != null ) {
@@ -483,6 +483,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	 *
 	 * @return QueryStatistics
 	 */
+	@Override
 	public QueryStatistics getQueryStatistics(String queryString) {
 		ConcurrentQueryStatisticsImpl qs = (ConcurrentQueryStatisticsImpl) queryStatistics.get( queryString );
 		if ( qs == null ) {
@@ -500,6 +501,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return entity deletion count
 	 */
+	@Override
 	public long getEntityDeleteCount() {
 		return entityDeleteCount.get();
 	}
@@ -507,6 +509,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return entity insertion count
 	 */
+	@Override
 	public long getEntityInsertCount() {
 		return entityInsertCount.get();
 	}
@@ -514,6 +517,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return entity load (from DB)
 	 */
+	@Override
 	public long getEntityLoadCount() {
 		return entityLoadCount.get();
 	}
@@ -521,6 +525,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return entity fetch (from DB)
 	 */
+	@Override
 	public long getEntityFetchCount() {
 		return entityFetchCount.get();
 	}
@@ -528,34 +533,35 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return entity update
 	 */
+	@Override
 	public long getEntityUpdateCount() {
 		return entityUpdateCount.get();
 	}
-
+	@Override
 	public long getQueryExecutionCount() {
 		return queryExecutionCount.get();
 	}
-
+	@Override
 	public long getQueryCacheHitCount() {
 		return queryCacheHitCount.get();
 	}
-
+	@Override
 	public long getQueryCacheMissCount() {
 		return queryCacheMissCount.get();
 	}
-
+	@Override
 	public long getQueryCachePutCount() {
 		return queryCachePutCount.get();
 	}
-
+	@Override
 	public long getUpdateTimestampsCacheHitCount() {
 		return updateTimestampsCacheHitCount.get();
 	}
-
+	@Override
 	public long getUpdateTimestampsCacheMissCount() {
 		return updateTimestampsCacheMissCount.get();
 	}
-
+	@Override
 	public long getUpdateTimestampsCachePutCount() {
 		return updateTimestampsCachePutCount.get();
 	}
@@ -563,6 +569,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return flush
 	 */
+	@Override
 	public long getFlushCount() {
 		return flushCount.get();
 	}
@@ -570,6 +577,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return session connect
 	 */
+	@Override
 	public long getConnectCount() {
 		return connectCount.get();
 	}
@@ -577,6 +585,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return second level cache hit
 	 */
+	@Override
 	public long getSecondLevelCacheHitCount() {
 		return secondLevelCacheHitCount.get();
 	}
@@ -584,6 +593,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return second level cache miss
 	 */
+	@Override
 	public long getSecondLevelCacheMissCount() {
 		return secondLevelCacheMissCount.get();
 	}
@@ -591,6 +601,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return second level cache put
 	 */
+	@Override
 	public long getSecondLevelCachePutCount() {
 		return secondLevelCachePutCount.get();
 	}
@@ -628,6 +639,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return session closing
 	 */
+	@Override
 	public long getSessionCloseCount() {
 		return sessionCloseCount.get();
 	}
@@ -635,6 +647,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return session opening
 	 */
+	@Override
 	public long getSessionOpenCount() {
 		return sessionOpenCount.get();
 	}
@@ -642,6 +655,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return collection loading (from DB)
 	 */
+	@Override
 	public long getCollectionLoadCount() {
 		return collectionLoadCount.get();
 	}
@@ -649,6 +663,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return collection fetching (from DB)
 	 */
+	@Override
 	public long getCollectionFetchCount() {
 		return collectionFetchCount.get();
 	}
@@ -656,6 +671,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return collection update
 	 */
+	@Override
 	public long getCollectionUpdateCount() {
 		return collectionUpdateCount.get();
 	}
@@ -664,6 +680,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	 * @return collection removal
 	 *         FIXME: even if isInverse="true"?
 	 */
+	@Override
 	public long getCollectionRemoveCount() {
 		return collectionRemoveCount.get();
 	}
@@ -671,6 +688,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return collection recreation
 	 */
+	@Override
 	public long getCollectionRecreateCount() {
 		return collectionRecreateCount.get();
 	}
@@ -678,6 +696,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * @return start time in ms (JVM standards {@link System#currentTimeMillis()})
 	 */
+	@Override
 	public long getStartTime() {
 		return startTime;
 	}
@@ -685,6 +704,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * log in info level the main statistics
 	 */
+	@Override
 	public void logSummary() {
 		LOG.loggingStatistics();
 		LOG.startTime( startTime );
@@ -728,6 +748,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * Are statistics logged
 	 */
+	@Override
 	public boolean isStatisticsEnabled() {
 		return isStatisticsEnabled;
 	}
@@ -735,6 +756,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * Enable statistics logs (this is a dynamic parameter)
 	 */
+	@Override
 	public void setStatisticsEnabled(boolean b) {
 		isStatisticsEnabled = b;
 	}
@@ -743,6 +765,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	 * @return Returns the max query execution time,
 	 *         for all queries
 	 */
+	@Override
 	public long getQueryExecutionMaxTime() {
 		return queryExecutionMaxTime.get();
 	}
@@ -750,6 +773,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * Get all executed query strings
 	 */
+	@Override
 	public String[] getQueries() {
 		return ArrayHelper.toStringArray( queryStatistics.keySet() );
 	}
@@ -757,6 +781,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * Get the names of all entities
 	 */
+	@Override
 	public String[] getEntityNames() {
 		if ( sessionFactory == null ) {
 			return ArrayHelper.toStringArray( entityStatistics.keySet() );
@@ -769,6 +794,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * Get the names of all collection roles
 	 */
+	@Override
 	public String[] getCollectionRoleNames() {
 		if ( sessionFactory == null ) {
 			return ArrayHelper.toStringArray( collectionStatistics.keySet() );
@@ -781,6 +807,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 	/**
 	 * Get all second-level cache region names
 	 */
+	@Override
 	public String[] getSecondLevelCacheRegionNames() {
 		if ( sessionFactory == null ) {
 			return ArrayHelper.toStringArray( secondLevelCacheStatistics.keySet() );
@@ -789,43 +816,43 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 			return ArrayHelper.toStringArray( sessionFactory.getAllSecondLevelCacheRegions().keySet() );
 		}
 	}
-
+	@Override
 	public void endTransaction(boolean success) {
 		transactionCount.getAndIncrement();
 		if ( success ) {
 			committedTransactionCount.getAndIncrement();
 		}
 	}
-
+	@Override
 	public long getSuccessfulTransactionCount() {
 		return committedTransactionCount.get();
 	}
-
+	@Override
 	public long getTransactionCount() {
 		return transactionCount.get();
 	}
-
+	@Override
 	public void closeStatement() {
 		closeStatementCount.getAndIncrement();
 	}
-
+	@Override
 	public void prepareStatement() {
 		prepareStatementCount.getAndIncrement();
 	}
-
+	@Override
 	public long getCloseStatementCount() {
 		return closeStatementCount.get();
 	}
-
+	@Override
 	public long getPrepareStatementCount() {
 		return prepareStatementCount.get();
 	}
-
+	@Override
 	public void optimisticFailure(String entityName) {
 		optimisticFailureCount.getAndIncrement();
 		( (ConcurrentEntityStatisticsImpl) getEntityStatistics( entityName ) ).incrementOptimisticFailureCount();
 	}
-
+	@Override
 	public long getOptimisticFailureCount() {
 		return optimisticFailureCount.get();
 	}
@@ -873,7 +900,7 @@ public class ConcurrentStatisticsImpl implements StatisticsImplementor, Service
 				.append( ']' )
 				.toString();
 	}
-
+	@Override
 	public String getQueryExecutionMaxTimeQueryString() {
 		return queryExecutionMaxTimeQueryString;
 	}

hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java

@@ -249,4 +249,4 @@ public interface StatisticsImplementor extends Statistics, Service {
 	 * Callback indicating a put to the timestamp cache
 	 */
 	public void updateTimestampsCachePut();
-}
+}

hibernate-core/src/main/java/org/hibernate/transform/AliasedTupleSubsetResultTransformer.java

@@ -56,4 +56,4 @@ public abstract class AliasedTupleSubsetResultTransformer
 		}
 		return includeInTransform;
 	}
-}
+}

hibernate-core/src/main/java/org/hibernate/transform/TupleSubsetResultTransformer.java

@@ -82,4 +82,4 @@ public interface TupleSubsetResultTransformer extends ResultTransformer {
 	 *         element of the tuple is included in the transformed value.
 	 */
 	boolean[] includeInTransform(String[] aliases, int tupleLength);
-}
+}