From bbfacee64de39c712c4ee09e67c60545403aa372 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Mon, 18 May 2015 01:48:38 -0500
Subject: [PATCH] HHH-9803 - Checkstyle fix ups

---
 .../main/java/org/hibernate/Interceptor.java  |  49 +-
 .../main/java/org/hibernate/Transaction.java  |  24 +-
 .../org/hibernate/boot/SchemaAutoTooling.java |  23 +-
 .../scan/internal/ScanResultCollector.java    |   1 -
 .../internal/MetadataBuildingProcess.java     |   1 -
 .../boot/jaxb/hbm/spi/EntityInfo.java         |  54 +-
 .../jaxb/hbm/spi/PluralAttributeInfo.java     |  72 +-
 .../boot/jaxb/hbm/spi/SubEntityInfo.java      |   2 +-
 .../hibernate/boot/model/TypeDefinition.java  |   8 +-
 .../hbm/AbstractEntitySourceImpl.java         |   4 +-
 .../hbm/ColumnAttributeSourceImpl.java        |  10 +-
 .../source/internal/hbm/ColumnSourceImpl.java |  10 +-
 .../model/source/internal/hbm/Helper.java     |   2 +-
 .../hbm/SubclassEntitySourceImpl.java         |   2 +-
 .../source/spi/CompositeIdentifierSource.java |   4 +-
 .../source/spi/VersionAttributeSource.java    |   4 +-
 .../dialect/AbstractHANADialect.java          |   4 +-
 .../org/hibernate/dialect/CUBRIDDialect.java  |   1 -
 .../hibernate/dialect/InformixDialect.java    |   1 -
 .../org/hibernate/dialect/MySQLDialect.java   |   1 -
 .../hibernate/dialect/Oracle12cDialect.java   |  54 +-
 .../dialect/PostgreSQL81Dialect.java          |   1 -
 .../org/hibernate/dialect/SAPDBDialect.java   |   1 -
 .../dialect/SQLServer2005Dialect.java         |  12 +-
 .../dialect/SQLServer2012Dialect.java         |  31 +-
 .../hibernate/dialect/Teradata14Dialect.java  |  37 +-
 .../hibernate/dialect/TeradataDialect.java    |   2 +-
 .../hibernate/dialect/TimesTenDialect.java    |   1 -
 .../jdbc/batch/internal/BatchingBatch.java    |   2 +-
 .../DriverManagerConnectionProviderImpl.java  |   2 +
 .../ExtractedDatabaseMetaDataImpl.java        |   2 -
 .../jdbc/internal/ResultSetReturnImpl.java    |  42 +-
 .../engine/jdbc/spi/SqlExceptionHelper.java   |  24 +-
 .../query/spi/EntityGraphQueryHint.java       |   3 +-
 .../engine/query/spi/QueryPlanCache.java      |   3 +-
 .../org/hibernate/engine/spi/ActionQueue.java |  15 +-
 .../org/hibernate/engine/spi/EntityEntry.java |   1 -
 .../engine/spi/SessionImplementor.java        |   2 -
 .../engine/transaction/spi/LocalStatus.java   |  52 -
 .../AbstractFlushingEventListener.java        |   4 +-
 .../event/internal/EvictVisitor.java          |   2 -
 .../event/spi/EntityCopyObserver.java         |   2 -
 .../hql/internal/HolderInstantiator.java      |  10 +-
 .../QueryTranslatorFactoryInitiator.java      |   4 -
 .../hql/internal/ast/tree/FromClause.java     |   1 -
 .../hql/internal/ast/tree/FromElement.java    |  29 +-
 .../hql/internal/ast/tree/IdentNode.java      |   4 +-
 .../hql/internal/ast/tree/IntoClause.java     |  30 +-
 .../internal/ast/tree/JavaConstantNode.java   |   1 -
 .../hibernate/hql/internal/ast/tree/Node.java |   8 +-
 .../hql/internal/ast/tree/OrderByClause.java  |   3 +-
 .../ast/tree/ResultVariableRefNode.java       |   5 +-
 .../internal/ast/tree/UpdateStatement.java    |  20 +-
 .../ClassicQueryTranslatorFactory.java        |  24 +-
 .../hql/internal/classic/FromParser.java      |  39 +-
 .../internal/classic/PreprocessingParser.java |  17 +-
 .../internal/classic/QueryTranslatorImpl.java | 246 ++---
 .../hql/internal/classic/SelectParser.java    |   4 +-
 .../hql/internal/classic/WhereParser.java     |   6 +-
 .../hibernate/hql/spi/QueryTranslator.java    |  12 +-
 .../AbstractMultiTableBulkIdStrategyImpl.java |   2 -
 .../hibernate/hql/spi/id/IdTableSupport.java  |  10 +-
 .../java/org/hibernate/id/GUIDGenerator.java  |  10 +-
 .../id/IdentifierGeneratorHelper.java         |  60 +-
 .../org/hibernate/id/IdentityGenerator.java   |  31 +-
 .../org/hibernate/id/IncrementGenerator.java  |  17 +-
 .../id/MultipleHiLoPerTableGenerator.java     |  76 +-
 .../id/PersistentIdentifierGenerator.java     |  43 +-
 .../id/PostInsertIdentifierGenerator.java     |   6 +-
 .../org/hibernate/id/SelectGenerator.java     |  30 +-
 .../org/hibernate/id/SequenceGenerator.java   |   2 +-
 .../id/SequenceIdentityGenerator.java         |  20 +-
 .../java/org/hibernate/id/UUIDGenerator.java  |   9 +-
 .../org/hibernate/id/UUIDHexGenerator.java    |   9 +-
 .../DefaultIdentifierGeneratorFactory.java    |   2 +-
 .../id/insert/AbstractReturningDelegate.java  |  19 +-
 .../id/insert/AbstractSelectingDelegate.java  |  32 +-
 .../hibernate/internal/AbstractQueryImpl.java | 275 +++---
 .../internal/AbstractScrollableResults.java   |  98 +-
 .../internal/AbstractSessionImpl.java         |   5 +-
 .../org/hibernate/internal/CacheImpl.java     |  44 +-
 .../internal/CollectionFilterImpl.java        |  39 +-
 .../hibernate/internal/CoreMessageLogger.java | 323 ++++---
 .../org/hibernate/internal/CriteriaImpl.java  |   3 +-
 .../internal/DynamicFilterAliasGenerator.java |  13 +-
 .../FetchingScrollableResultsImpl.java        |  44 +-
 .../internal/FilterConfiguration.java         |  49 +-
 .../org/hibernate/internal/FilterHelper.java  |  39 +-
 .../org/hibernate/internal/IteratorImpl.java  |  61 +-
 .../org/hibernate/internal/QueryImpl.java     |  45 +-
 .../org/hibernate/internal/SQLQueryImpl.java  |  84 +-
 .../internal/ScrollableResultsImpl.java       |  94 +-
 .../internal/SessionFactoryImpl.java          |  14 +-
 .../internal/SessionFactoryRegistry.java      |  18 +-
 .../org/hibernate/internal/SessionImpl.java   | 335 ++++---
 .../internal/StatelessSessionImpl.java        | 123 +--
 .../hibernate/internal/util/BytesHelper.java  |   2 +-
 .../hibernate/internal/util/Cloneable.java    |  72 +-
 .../hibernate/internal/util/ConfigHelper.java |  83 +-
 .../internal/util/EntityPrinter.java          |  49 +-
 .../internal/util/LockModeConverter.java      |   2 +-
 .../hibernate/internal/util/MarkerObject.java |   7 +-
 .../internal/util/SerializationHelper.java    |  36 +-
 .../hibernate/internal/util/StringHelper.java | 145 +--
 .../beans/BeanIntrospectionException.java     |   3 +-
 .../util/collections/ArrayHelper.java         | 142 +--
 .../collections/BoundedConcurrentHashMap.java | 904 +++++++++---------
 .../util/collections/CollectionHelper.java    |  56 +-
 .../ConcurrentReferenceHashMap.java           | 122 +--
 .../util/collections/IdentityMap.java         |   2 +-
 .../java/org/hibernate/jdbc/Expectations.java |  36 +-
 .../main/java/org/hibernate/jdbc/Work.java    |   9 +-
 .../jmx/internal/JmxServiceImpl.java          |   5 +-
 .../loader/AbstractEntityJoinWalker.java      |   5 +-
 .../loader/GeneratedCollectionAliases.java    |  41 +-
 .../java/org/hibernate/loader/JoinWalker.java | 334 +++----
 .../java/org/hibernate/loader/Loader.java     |  31 +-
 .../org/hibernate/loader/OuterJoinLoader.java |   9 +-
 .../loader/OuterJoinableAssociation.java      |  61 +-
 .../collection/OneToManyJoinWalker.java       |  87 +-
 .../loader/criteria/CriteriaInfoProvider.java |  12 +-
 .../loader/criteria/CriteriaJoinWalker.java   |  59 +-
 .../loader/criteria/CriteriaLoader.java       | 119 ++-
 .../criteria/CriteriaQueryTranslator.java     | 111 ++-
 .../loader/custom/CollectionFetchReturn.java  |   4 +-
 .../loader/custom/CollectionReturn.java       |   6 +-
 .../custom/ColumnCollectionAliases.java       |  36 +-
 .../hibernate/loader/custom/CustomLoader.java | 108 ++-
 .../loader/custom/sql/SQLQueryParser.java     |   8 +-
 .../custom/sql/SQLQueryReturnProcessor.java   |   2 +-
 .../loader/entity/AbstractEntityLoader.java   |  13 +-
 .../entity/CascadeEntityJoinWalker.java       |  25 +-
 .../entity/CollectionElementLoader.java       |  49 +-
 .../hibernate/loader/entity/EntityLoader.java |   4 +-
 .../org/hibernate/loader/hql/QueryLoader.java | 100 +-
 ...AbstractEntityGraphVisitationStrategy.java |   5 +-
 ...BuildingAssociationVisitationStrategy.java |   5 +-
 .../plan/build/internal/LoadPlanImpl.java     |  12 +-
 .../internal/spaces/QuerySpaceHelper.java     |  29 +-
 .../internal/spaces/QuerySpacesImpl.java      |   1 -
 .../spi/ExpandingCollectionQuerySpace.java    |  14 +-
 .../plan/build/spi/ExpandingQuerySpaces.java  |  36 +-
 .../internal/AbstractLoadQueryDetails.java    |  13 +-
 .../ThreadLocalCurrentSessionTest.java        |   1 -
 .../config/checkstyle/checkstyle-eventual.xml | 257 -----
 shared/config/checkstyle/checkstyle.xml       |   8 +
 shared/config/checkstyle/todo-checks.xml      |  15 -
 147 files changed, 3216 insertions(+), 3198 deletions(-)
 delete mode 100644 hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/LocalStatus.java
 delete mode 100644 shared/config/checkstyle/checkstyle-eventual.xml
 delete mode 100644 shared/config/checkstyle/todo-checks.xml

diff --git a/hibernate-core/src/main/java/org/hibernate/Interceptor.java b/hibernate-core/src/main/java/org/hibernate/Interceptor.java
index 864fb91e5c..8a227bd2ed 100644
--- a/hibernate-core/src/main/java/org/hibernate/Interceptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/Interceptor.java
@@ -26,7 +26,6 @@ package org.hibernate;
 import java.io.Serializable;
 import java.util.Iterator;
 
-import org.hibernate.resource.jdbc.spi.StatementInspector;
 import org.hibernate.type.Type;
 
 /**
@@ -71,7 +70,7 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException;
+	boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException;
 
 	/**
 	 * Called when an object is detected to be dirty, during a flush. The interceptor may modify the detected
@@ -94,7 +93,13 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) throws CallbackException;
+	boolean onFlushDirty(
+			Object entity,
+			Serializable id,
+			Object[] currentState,
+			Object[] previousState,
+			String[] propertyNames,
+			Type[] types) throws CallbackException;
 
 	/**
 	 * Called before an object is saved. The interceptor may modify the <tt>state</tt>, which will be used for
@@ -110,7 +115,7 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException;
+	boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException;
 
 	/**
 	 *  Called before an object is deleted. It is not recommended that the interceptor modify the <tt>state</tt>.
@@ -123,7 +128,7 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException;
+	void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException;
 
 	/**
 	 * Called before a collection is (re)created.
@@ -133,7 +138,7 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public void onCollectionRecreate(Object collection, Serializable key) throws CallbackException;
+	void onCollectionRecreate(Object collection, Serializable key) throws CallbackException;
 
 	/**
 	 * Called before a collection is deleted.
@@ -143,7 +148,7 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public void onCollectionRemove(Object collection, Serializable key) throws CallbackException;
+	void onCollectionRemove(Object collection, Serializable key) throws CallbackException;
 
 	/**
 	 * Called before a collection is updated.
@@ -153,7 +158,7 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public void onCollectionUpdate(Object collection, Serializable key) throws CallbackException;
+	void onCollectionUpdate(Object collection, Serializable key) throws CallbackException;
 
 	/**
 	 * Called before a flush.
@@ -162,7 +167,7 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public void preFlush(Iterator entities) throws CallbackException;
+	void preFlush(Iterator entities) throws CallbackException;
 
 	/**
 	 * Called after a flush that actually ends in execution of the SQL statements required to synchronize
@@ -172,7 +177,7 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public void postFlush(Iterator entities) throws CallbackException;
+	void postFlush(Iterator entities) throws CallbackException;
 
 	/**
 	 * Called to distinguish between transient and detached entities. The return value determines the
@@ -186,7 +191,7 @@ public interface Interceptor {
 	 * @param entity a transient or detached entity
 	 * @return Boolean or <tt>null</tt> to choose default behaviour
 	 */
-	public Boolean isTransient(Object entity);
+	Boolean isTransient(Object entity);
 
 	/**
 	 * Called from <tt>flush()</tt>. The return value determines whether the entity is updated
@@ -207,7 +212,13 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public int[] findDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types);
+	int[] findDirty(
+			Object entity,
+			Serializable id,
+			Object[] currentState,
+			Object[] previousState,
+			String[] propertyNames,
+			Type[] types);
 	/**
 	 * Instantiate the entity class. Return <tt>null</tt> to indicate that Hibernate should use
 	 * the default constructor of the class. The identifier property of the returned instance
@@ -221,7 +232,7 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public Object instantiate(String entityName, EntityMode entityMode, Serializable id) throws CallbackException;
+	Object instantiate(String entityName, EntityMode entityMode, Serializable id) throws CallbackException;
 
 	/**
 	 * Get the entity name for a persistent or transient instance.
@@ -232,7 +243,7 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public String getEntityName(Object object) throws CallbackException;
+	String getEntityName(Object object) throws CallbackException;
 
 	/**
 	 * Get a fully loaded entity instance that is cached externally.
@@ -244,7 +255,7 @@ public interface Interceptor {
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	public Object getEntity(String entityName, Serializable id) throws CallbackException;
+	Object getEntity(String entityName, Serializable id) throws CallbackException;
 	
 	/**
 	 * Called when a Hibernate transaction is begun via the Hibernate <tt>Transaction</tt> 
@@ -253,21 +264,21 @@ public interface Interceptor {
 	 *
 	 * @param tx The Hibernate transaction facade object
 	 */
-	public void afterTransactionBegin(Transaction tx);
+	void afterTransactionBegin(Transaction tx);
 
 	/**
 	 * Called before a transaction is committed (but not before rollback).
 	 *
 	 * @param tx The Hibernate transaction facade object
 	 */
-	public void beforeTransactionCompletion(Transaction tx);
+	void beforeTransactionCompletion(Transaction tx);
 
 	/**
 	 * Called after a transaction is committed or rolled back.
 	 *
 	 * @param tx The Hibernate transaction facade object
 	 */
-	public void afterTransactionCompletion(Transaction tx);
+	void afterTransactionCompletion(Transaction tx);
 
 	/**
 	 * Called when sql string is being prepared. 
@@ -278,5 +289,5 @@ public interface Interceptor {
 	 * to inspect and alter SQL statements.
 	 */
 	@Deprecated
-	public String onPrepareStatement(String sql);
+	String onPrepareStatement(String sql);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/Transaction.java b/hibernate-core/src/main/java/org/hibernate/Transaction.java
index c01a80b9b4..a072189682 100644
--- a/hibernate-core/src/main/java/org/hibernate/Transaction.java
+++ b/hibernate-core/src/main/java/org/hibernate/Transaction.java
@@ -25,8 +25,6 @@ package org.hibernate;
 
 import javax.transaction.Synchronization;
 
-import org.hibernate.engine.transaction.spi.IsolationDelegate;
-import org.hibernate.engine.transaction.spi.LocalStatus;
 import org.hibernate.resource.transaction.spi.TransactionStatus;
 
 /**
@@ -53,16 +51,16 @@ public interface Transaction {
 	 *
 	 * @throws HibernateException Indicates a problem beginning the transaction.
 	 */
-	public void begin();
+	void begin();
 
 	/**
 	 * Commit this transaction.  This might entail a number of things depending on the context:<ul>
 	 *     <li>
-	 *         If this transaction is the {@link #isInitiator initiator}, {@link Session#flush} the {@link Session}
-	 *         with which it is associated (unless {@link Session} is in {@link FlushMode#MANUAL}).
+	 *         If the underlying transaction was initiated from this Transaction the Session will be flushed,
+	 *         unless the Session is in {@link FlushMode#MANUAL} FlushMode.
 	 *     </li>
 	 *     <li>
-	 *         If this transaction is the {@link #isInitiator initiator}, commit the underlying transaction.
+	 *         If the underlying transaction was initiated from this Transaction, commit the underlying transaction.
 	 *     </li>
 	 *     <li>
 	 *         Coordinate various callbacks
@@ -71,7 +69,7 @@ public interface Transaction {
 	 *
 	 * @throws HibernateException Indicates a problem committing the transaction.
 	 */
-	public void commit();
+	void commit();
 
 	/**
 	 * Rollback this transaction.  Either rolls back the underlying transaction or ensures it cannot later commit
@@ -79,7 +77,7 @@ public interface Transaction {
 	 *
 	 * @throws HibernateException Indicates a problem rolling back the transaction.
 	 */
-	public void rollback();
+	void rollback();
 
 	/**
 	 * Get the current local status of this transaction.
@@ -89,7 +87,7 @@ public interface Transaction {
 	 *
 	 * @return The current local status.
 	 */
-	public TransactionStatus getStatus();
+	TransactionStatus getStatus();
 
 	/**
 	 * Register a user synchronization callback for this transaction.
@@ -98,25 +96,25 @@ public interface Transaction {
 	 *
 	 * @throws HibernateException Indicates a problem registering the synchronization.
 	 */
-	public void registerSynchronization(Synchronization synchronization) throws HibernateException;
+	void registerSynchronization(Synchronization synchronization) throws HibernateException;
 
 	/**
 	 * Set the transaction timeout for any transaction started by a subsequent call to {@link #begin} on this instance.
 	 *
 	 * @param seconds The number of seconds before a timeout.
 	 */
-	public void setTimeout(int seconds);
+	void setTimeout(int seconds);
 
 	/**
 	 * Retrieve the transaction timeout set for this transaction.  A negative indicates no timeout has been set.
 	 *
 	 * @return The timeout, in seconds.
 	 */
-	public int getTimeout();
+	int getTimeout();
 
 	/**
 	 * Make a best effort to mark the underlying transaction for rollback only.
 	 */
-	public void markRollbackOnly();
+	void markRollbackOnly();
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java b/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java
index b5a5d10844..fd715748e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java
@@ -23,7 +23,6 @@
  */
 package org.hibernate.boot;
 
-import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
 import org.hibernate.internal.util.StringHelper;
 
@@ -36,35 +35,41 @@ public enum SchemaAutoTooling {
 	/**
 	 * Drop the schema and recreate it on SessionFactory startup.
 	 */
-	CREATE,
+	CREATE( "create" ),
 	/**
 	 * Drop the schema and recreate it on SessionFactory startup.  Additionally, drop the
 	 * schema on SessionFactory shutdown.
 	 */
-	CREATE_DROP,
+	CREATE_DROP( "create-drop" ),
 	/**
 	 * Update (alter) the schema on SessionFactory startup.
 	 */
-	UPDATE,
+	UPDATE( "update" ),
 	/**
 	 * Validate the schema on SessionFactory startup.
 	 */
-	VALIDATE;
+	VALIDATE( "validate" );
+
+	private final String externalForm;
+
+	SchemaAutoTooling(String externalForm) {
+		this.externalForm = externalForm;
+	}
 
 	public static SchemaAutoTooling interpret(String configurationValue) {
 		if ( StringHelper.isEmpty( configurationValue ) ) {
 			return null;
 		}
-		else if ( "validate".equals( configurationValue ) ) {
+		else if ( VALIDATE.externalForm.equals( configurationValue ) ) {
 			return VALIDATE;
 		}
-		else if ( "update".equals( configurationValue ) ) {
+		else if ( UPDATE.externalForm.equals( configurationValue ) ) {
 			return UPDATE;
 		}
-		else if ( "create".equals( configurationValue ) ) {
+		else if ( CREATE.externalForm.equals( configurationValue ) ) {
 			return CREATE;
 		}
-		else if ( "create-drop".equals( configurationValue ) ) {
+		else if ( CREATE_DROP.externalForm.equals( configurationValue ) ) {
 			return CREATE_DROP;
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultCollector.java
index 733be9f054..7b8b071589 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultCollector.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/archive/scan/internal/ScanResultCollector.java
@@ -35,7 +35,6 @@ import org.hibernate.boot.archive.scan.spi.ScanOptions;
 import org.hibernate.boot.archive.scan.spi.ScanParameters;
 import org.hibernate.boot.archive.scan.spi.ScanResult;
 
-import org.jboss.jandex.ClassInfo;
 import org.jboss.logging.Logger;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingProcess.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingProcess.java
index 55767f5cd6..d95cd07aab 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingProcess.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuildingProcess.java
@@ -26,7 +26,6 @@ package org.hibernate.boot.internal;
 import java.lang.reflect.Constructor;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.Set;
 import javax.persistence.Converter;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/EntityInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/EntityInfo.java
index 7d24820594..22fbe163d0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/EntityInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/EntityInfo.java
@@ -31,33 +31,45 @@ import java.util.List;
  * @author Steve Ebersole
  */
 public interface EntityInfo extends ToolingHintContainer {
-	public String getName();
-	public String getEntityName();
+	String getName();
 
-    public Boolean isAbstract();
-    public Boolean isLazy();
-    public String getProxy();
-    public int getBatchSize();
-    public boolean isDynamicInsert();
-    public boolean isDynamicUpdate();
-    public boolean isSelectBeforeUpdate();
+	String getEntityName();
 
-	public List<JaxbHbmTuplizerType> getTuplizer();
-    public String getPersister();
+	Boolean isAbstract();
 
-	public JaxbHbmLoaderType getLoader();
-	public JaxbHbmCustomSqlDmlType getSqlInsert();
-	public JaxbHbmCustomSqlDmlType getSqlUpdate();
-	public JaxbHbmCustomSqlDmlType getSqlDelete();
+	Boolean isLazy();
 
-	public List<JaxbHbmSynchronizeType> getSynchronize();
+	String getProxy();
 
-	public List<JaxbHbmFetchProfileType> getFetchProfile();
+	int getBatchSize();
 
-    public List<JaxbHbmResultSetMappingType> getResultset();
+	boolean isDynamicInsert();
 
-	public List<JaxbHbmNamedNativeQueryType> getSqlQuery();
-	public List<JaxbHbmNamedQueryType> getQuery();
+	boolean isDynamicUpdate();
 
-	public List getAttributes();
+	boolean isSelectBeforeUpdate();
+
+	List<JaxbHbmTuplizerType> getTuplizer();
+
+	String getPersister();
+
+	JaxbHbmLoaderType getLoader();
+
+	JaxbHbmCustomSqlDmlType getSqlInsert();
+
+	JaxbHbmCustomSqlDmlType getSqlUpdate();
+
+	JaxbHbmCustomSqlDmlType getSqlDelete();
+
+	List<JaxbHbmSynchronizeType> getSynchronize();
+
+	List<JaxbHbmFetchProfileType> getFetchProfile();
+
+	List<JaxbHbmResultSetMappingType> getResultset();
+
+	List<JaxbHbmNamedNativeQueryType> getSqlQuery();
+
+	List<JaxbHbmNamedQueryType> getQuery();
+
+	List getAttributes();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfo.java
index fd73fff664..8f0877c8ae 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/PluralAttributeInfo.java
@@ -31,41 +31,59 @@ import java.util.List;
  * @author Steve Ebersole
  */
 public interface PluralAttributeInfo extends AttributeMapping, TableInformationContainer, ToolingHintContainer {
-	public JaxbHbmKeyType getKey();
+	JaxbHbmKeyType getKey();
 
-	public JaxbHbmBasicCollectionElementType getElement();
-	public JaxbHbmCompositeCollectionElementType getCompositeElement();
-	public JaxbHbmOneToManyCollectionElementType getOneToMany();
-	public JaxbHbmManyToManyCollectionElementType getManyToMany();
-    public JaxbHbmManyToAnyCollectionElementType getManyToAny();
+	JaxbHbmBasicCollectionElementType getElement();
 
-	public String getComment();
-	public String getCheck();
-	public String getWhere();
+	JaxbHbmCompositeCollectionElementType getCompositeElement();
 
-	public JaxbHbmLoaderType getLoader();
-	public JaxbHbmCustomSqlDmlType getSqlInsert();
-    public JaxbHbmCustomSqlDmlType getSqlUpdate();
-    public JaxbHbmCustomSqlDmlType getSqlDelete();
-    public JaxbHbmCustomSqlDmlType getSqlDeleteAll();
+	JaxbHbmOneToManyCollectionElementType getOneToMany();
 
-	public List<JaxbHbmSynchronizeType> getSynchronize();
+	JaxbHbmManyToManyCollectionElementType getManyToMany();
 
-	public JaxbHbmCacheType getCache();
-	public List<JaxbHbmFilterType> getFilter();
+	JaxbHbmManyToAnyCollectionElementType getManyToAny();
 
-	public String getCascade();
-	public JaxbHbmFetchStyleWithSubselectEnum getFetch();
-	public JaxbHbmLazyWithExtraEnum getLazy();
-	public JaxbHbmOuterJoinEnum getOuterJoin();
+	String getComment();
 
-	public int getBatchSize();
-	public boolean isInverse();
-    public boolean isMutable();
-	public boolean isOptimisticLock();
+	String getCheck();
 
-	public String getCollectionType();
-    public String getPersister();
+	String getWhere();
+
+	JaxbHbmLoaderType getLoader();
+
+	JaxbHbmCustomSqlDmlType getSqlInsert();
+
+	JaxbHbmCustomSqlDmlType getSqlUpdate();
+
+	JaxbHbmCustomSqlDmlType getSqlDelete();
+
+	JaxbHbmCustomSqlDmlType getSqlDeleteAll();
+
+	List<JaxbHbmSynchronizeType> getSynchronize();
+
+	JaxbHbmCacheType getCache();
+
+	List<JaxbHbmFilterType> getFilter();
+
+	String getCascade();
+
+	JaxbHbmFetchStyleWithSubselectEnum getFetch();
+
+	JaxbHbmLazyWithExtraEnum getLazy();
+
+	JaxbHbmOuterJoinEnum getOuterJoin();
+
+	int getBatchSize();
+
+	boolean isInverse();
+
+	boolean isMutable();
+
+	boolean isOptimisticLock();
+
+	String getCollectionType();
+
+	String getPersister();
 
 // todo : not available on all.  do we need a specific interface for these?
 //	public String getSort();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SubEntityInfo.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SubEntityInfo.java
index f60a7efb17..b62772101c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SubEntityInfo.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/hbm/spi/SubEntityInfo.java
@@ -29,5 +29,5 @@ package org.hibernate.boot.jaxb.hbm.spi;
  * @author Steve Ebersole
  */
 public interface SubEntityInfo extends EntityInfo {
-    public String getExtends();
+    String getExtends();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java
index fb815dddb3..42a7c138be 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java
@@ -49,9 +49,9 @@ import org.hibernate.internal.util.compare.EqualsHelper;
  */
 public class TypeDefinition implements Serializable {
 	private final String name;
-    private final Class typeImplementorClass;
+	private final Class typeImplementorClass;
 	private final String[] registrationKeys;
-    private final Map<String, String> parameters;
+	private final Map<String, String> parameters;
 
 	public TypeDefinition(
 			String name,
@@ -108,8 +108,8 @@ public class TypeDefinition implements Serializable {
 	}
 
 	public Map<String, String> getParameters() {
-        return parameters;
-    }
+		return parameters;
+	}
 
 	public Properties getParametersAsProperties() {
 		Properties properties = new Properties();
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java
index 72a160c2f9..fa8a72c13e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java
@@ -66,7 +66,6 @@ import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.internal.util.compare.EqualsHelper;
 
-
 /**
  * @author Steve Ebersole
  * @author Hardy Ferentschik
@@ -530,9 +529,8 @@ public abstract class AbstractEntitySourceImpl
 	}
 
 	@Override
-	@SuppressWarnings( {"unchecked"})
 	public List<JpaCallbackSource> getJpaCallbackClasses() {
-	    return Collections.EMPTY_LIST;
+		return Collections.emptyList();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnAttributeSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnAttributeSourceImpl.java
index 7803fe5f30..5ec8104c1d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnAttributeSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnAttributeSourceImpl.java
@@ -41,21 +41,21 @@ class ColumnAttributeSourceImpl
 	private final String tableName;
 	private final String columnName;
 	private final SizeSource sizeSource;
-    private final TruthValue nullable;
-    private final TruthValue unique;
+	private final TruthValue nullable;
+	private final TruthValue unique;
 
-    ColumnAttributeSourceImpl(
+	ColumnAttributeSourceImpl(
 			MappingDocument mappingDocument,
 			String tableName,
 			String columnName,
 			SizeSource sizeSource,
-            TruthValue nullable,
+			TruthValue nullable,
 			TruthValue unique) {
 		super( mappingDocument );
 		this.tableName = tableName;
 		this.columnName = columnName;
 		this.sizeSource = sizeSource;
-        this.nullable = nullable;
+		this.nullable = nullable;
 		this.unique = unique;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnSourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnSourceImpl.java
index a04df63246..685de80283 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnSourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ColumnSourceImpl.java
@@ -64,13 +64,13 @@ class ColumnSourceImpl
 
 	ColumnSourceImpl(
 			MappingDocument mappingDocument,
-            String tableName,
+			String tableName,
 			JaxbHbmColumnType columnElement,
-            TruthValue nullable) {
+			TruthValue nullable) {
 		super( mappingDocument );
-        this.tableName = tableName;
-        this.columnElement = columnElement;
-        this.nullable = nullable;
+		this.tableName = tableName;
+		this.columnElement = columnElement;
+		this.nullable = nullable;
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java
index 6a2e29fdf5..e646e64b62 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java
@@ -97,7 +97,7 @@ public class Helper {
 			return new Caching( TruthValue.FALSE );
 		}
 
- 		final boolean cacheLazyProps = cacheElement.getInclude() == null
+		final boolean cacheLazyProps = cacheElement.getInclude() == null
 				|| !"non-lazy".equals( cacheElement.getInclude().value() );
 
 		return new Caching(
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SubclassEntitySourceImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SubclassEntitySourceImpl.java
index 18b8ee051b..54d78c2c9e 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SubclassEntitySourceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/SubclassEntitySourceImpl.java
@@ -35,7 +35,7 @@ import org.hibernate.boot.model.source.spi.TableSpecificationSource;
  * @author Steve Ebersole
  */
 public class SubclassEntitySourceImpl extends AbstractEntitySourceImpl implements SubclassEntitySource {
-    private final EntitySource container;
+	private final EntitySource container;
 	private final TableSpecificationSource primaryTable;
 
 	protected SubclassEntitySourceImpl(
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java
index ca92fd66d3..70d1bb496a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/CompositeIdentifierSource.java
@@ -41,5 +41,5 @@ public interface CompositeIdentifierSource extends IdentifierSource, EmbeddableS
 	 *
 	 * @return The generator for the named attribute (within the composite).
 	 */
-	public IdentifierGeneratorDefinition getIndividualAttributeIdGenerator(String identifierAttributeName);
-}
\ No newline at end of file
+	IdentifierGeneratorDefinition getIndividualAttributeIdGenerator(String identifierAttributeName);
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/VersionAttributeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/VersionAttributeSource.java
index 28c669cd02..6da6e3d63c 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/VersionAttributeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/VersionAttributeSource.java
@@ -30,5 +30,5 @@ import org.hibernate.boot.model.naming.ImplicitBasicColumnNameSource;
  */
 public interface VersionAttributeSource
 		extends SingularAttributeSource, RelationalValueSourceContainer, ImplicitBasicColumnNameSource {
-	public String getUnsavedValue();
-}
\ No newline at end of file
+	String getUnsavedValue();
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java
index 24c185c8b7..a2938865e7 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java
@@ -53,7 +53,6 @@ import org.hibernate.exception.LockAcquisitionException;
 import org.hibernate.exception.LockTimeoutException;
 import org.hibernate.exception.SQLGrammarException;
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
-import org.hibernate.hql.spi.id.IdTableSupport;
 import org.hibernate.hql.spi.id.IdTableSupportStandardImpl;
 import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
 import org.hibernate.hql.spi.id.global.GlobalTemporaryTableBulkIdStrategy;
@@ -84,8 +83,7 @@ public abstract class AbstractHANADialect extends Dialect {
 		@Override
 		public String processSql(String sql, RowSelection selection) {
 			final boolean hasOffset = LimitHelper.hasFirstRow( selection );
-			return new StringBuilder( sql.length() + 20 ).append( sql )
-					.append( hasOffset ? " limit ? offset ?" : " limit ?" ).toString();
+			return sql + ( hasOffset ? " limit ? offset ?" : " limit ?" );
 		}
 
 		@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CUBRIDDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/CUBRIDDialect.java
index e3bfd242bd..007041ccef 100755
--- a/hibernate-core/src/main/java/org/hibernate/dialect/CUBRIDDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/CUBRIDDialect.java
@@ -31,7 +31,6 @@ import org.hibernate.dialect.function.StandardSQLFunction;
 import org.hibernate.dialect.function.VarArgsSQLFunction;
 import org.hibernate.dialect.pagination.CUBRIDLimitHandler;
 import org.hibernate.dialect.pagination.LimitHandler;
-import org.hibernate.engine.spi.RowSelection;
 import org.hibernate.type.StandardBasicTypes;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java
index 12bcae35a4..eac63cc4c6 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java
@@ -28,7 +28,6 @@ import java.sql.Types;
 import java.util.Locale;
 
 import org.hibernate.MappingException;
-import org.hibernate.boot.TempTableDdlTransactionHandling;
 import org.hibernate.dialect.function.VarArgsSQLFunction;
 import org.hibernate.dialect.pagination.FirstLimitHandler;
 import org.hibernate.dialect.pagination.LimitHandler;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
index 2798700906..3075531b89 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
@@ -41,7 +41,6 @@ import org.hibernate.engine.spi.RowSelection;
 import org.hibernate.exception.LockAcquisitionException;
 import org.hibernate.exception.LockTimeoutException;
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
-import org.hibernate.hql.spi.id.IdTableSupport;
 import org.hibernate.hql.spi.id.IdTableSupportStandardImpl;
 import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
 import org.hibernate.hql.spi.id.local.AfterUseAction;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle12cDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle12cDialect.java
index 2551dc4fe2..562817f991 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle12cDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle12cDialect.java
@@ -26,43 +26,41 @@ package org.hibernate.dialect;
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.pagination.SQL2008StandardLimitHandler;
-import org.hibernate.engine.spi.RowSelection;
 
 /**
  * An SQL dialect for Oracle 12c.
- * 
+ *
  * @author zhouyanming (zhouyanming@gmail.com)
  */
 public class Oracle12cDialect extends Oracle10gDialect {
+	public Oracle12cDialect() {
+		super();
+	}
 
-        public Oracle12cDialect() {
-                super();
-        }
-        
-        @Override
-    	protected void registerDefaultProperties() {
-    		super.registerDefaultProperties();
-    		getDefaultProperties().setProperty( Environment.USE_GET_GENERATED_KEYS, "true" );
-    	}
-        
-        @Override
-    	public boolean supportsIdentityColumns() {
-    		return true;
-    	}
+	@Override
+	protected void registerDefaultProperties() {
+		super.registerDefaultProperties();
+		getDefaultProperties().setProperty( Environment.USE_GET_GENERATED_KEYS, "true" );
+	}
 
-    	@Override
-    	public boolean supportsInsertSelectIdentity() {
-    		return true;
-    	}
+	@Override
+	public boolean supportsIdentityColumns() {
+		return true;
+	}
 
-    	@Override
-    	public String getIdentityColumnString() {
-    		return "generated as identity";
-    	}
+	@Override
+	public boolean supportsInsertSelectIdentity() {
+		return true;
+	}
 
-		@Override
-		public LimitHandler getLimitHandler() {
-			return SQL2008StandardLimitHandler.INSTANCE;
-		}
+	@Override
+	public String getIdentityColumnString() {
+		return "generated as identity";
+	}
+
+	@Override
+	public LimitHandler getLimitHandler() {
+		return SQL2008StandardLimitHandler.INSTANCE;
+	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQL81Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQL81Dialect.java
index f4c8e9c43a..dfe5b709aa 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQL81Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQL81Dialect.java
@@ -31,7 +31,6 @@ import java.sql.Types;
 import org.hibernate.JDBCException;
 import org.hibernate.LockOptions;
 import org.hibernate.PessimisticLockException;
-import org.hibernate.boot.TempTableDdlTransactionHandling;
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.function.NoArgSQLFunction;
 import org.hibernate.dialect.function.PositionSubstringFunction;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SAPDBDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SAPDBDialect.java
index faa67d3a60..1f094c244a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SAPDBDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SAPDBDialect.java
@@ -32,7 +32,6 @@ import org.hibernate.dialect.function.StandardSQLFunction;
 import org.hibernate.dialect.function.VarArgsSQLFunction;
 import org.hibernate.hql.spi.id.IdTableSupportStandardImpl;
 import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
-import org.hibernate.hql.spi.id.global.GlobalTemporaryTableBulkIdStrategy;
 import org.hibernate.hql.spi.id.local.AfterUseAction;
 import org.hibernate.hql.spi.id.local.LocalTemporaryTableBulkIdStrategy;
 import org.hibernate.internal.util.StringHelper;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2005Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2005Dialect.java
index 4aa7db7854..7eaf086b1a 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2005Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2005Dialect.java
@@ -33,7 +33,6 @@ import org.hibernate.QueryTimeoutException;
 import org.hibernate.dialect.function.NoArgSQLFunction;
 import org.hibernate.dialect.pagination.LimitHandler;
 import org.hibernate.dialect.pagination.SQLServer2005LimitHandler;
-import org.hibernate.engine.spi.RowSelection;
 import org.hibernate.exception.LockTimeoutException;
 import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
 import org.hibernate.internal.util.JdbcExceptionHelper;
@@ -89,16 +88,17 @@ public class SQLServer2005Dialect extends SQLServerDialect {
 		final boolean isNoWait = lockOptions.getTimeOut() == LockOptions.NO_WAIT;
 		final String noWaitStr = isNoWait ? ", nowait" : "";
 		switch ( mode ) {
-			case UPGRADE_NOWAIT:
-				return tableName + " with (updlock, rowlock, nowait)";
 			case UPGRADE:
 			case PESSIMISTIC_WRITE:
-			case WRITE:
+			case WRITE: {
 				return tableName + " with (updlock, rowlock" + noWaitStr + " )";
-			case PESSIMISTIC_READ:
+			}
+			case PESSIMISTIC_READ: {
 				return tableName + " with (holdlock, rowlock" + noWaitStr + " )";
-			default:
+			}
+			default: {
 				return tableName;
+			}
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2012Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2012Dialect.java
index e25b004a03..71332dcb02 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2012Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2012Dialect.java
@@ -23,10 +23,10 @@
  */
 package org.hibernate.dialect;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.hibernate.internal.util.StringHelper;
+
 /**
  * Microsoft SQL Server 2012 Dialect
  *
@@ -68,26 +68,29 @@ public class SQLServer2012Dialect extends SQLServer2008Dialect {
 	public String getQuerySequencesString() {
 		return "select name from sys.sequences";
 	}
-	
+
 	@Override
 	public String getQueryHintString(String sql, List<String> hints) {
-		final String hint = StringHelper.join(", ", hints.iterator());
+		final String hint = StringHelper.join( ", ", hints.iterator() );
 
-		if (StringHelper.isEmpty(hint)) {
+		if ( StringHelper.isEmpty( hint ) ) {
 			return sql;
 		}
 
-		final StringBuilder buffer = new StringBuilder(sql.length()
-				+ hint.length() + 12);
-		final int pos = sql.indexOf(";");
-		if (pos > -1) {
-			buffer.append(sql.substring(0, pos));
-		} else {
-			buffer.append(sql);
+		final StringBuilder buffer = new StringBuilder(
+				sql.length()
+						+ hint.length() + 12
+		);
+		final int pos = sql.indexOf( ";" );
+		if ( pos > -1 ) {
+			buffer.append( sql.substring( 0, pos ) );
 		}
-		buffer.append(" OPTION (").append(hint).append(")");
-		if (pos > -1) {
-			buffer.append(";");
+		else {
+			buffer.append( sql );
+		}
+		buffer.append( " OPTION (" ).append( hint ).append( ")" );
+		if ( pos > -1 ) {
+			buffer.append( ";" );
 		}
 		sql = buffer.toString();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Teradata14Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Teradata14Dialect.java
index 54918fdcfc..89791847db 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/Teradata14Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/Teradata14Dialect.java
@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.dialect;
+
 import org.hibernate.HibernateException;
 import org.hibernate.LockOptions;
 import org.hibernate.cfg.Environment;
@@ -36,9 +37,9 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Map;
+
 /**
  * A dialect for the Teradata database
- *
  */
 public class Teradata14Dialect extends TeradataDialect {
 	/**
@@ -53,7 +54,7 @@ public class Teradata14Dialect extends TeradataDialect {
 		registerColumnType( Types.LONGVARCHAR, "VARCHAR(32000)" );
 
 		getDefaultProperties().setProperty( Environment.USE_STREAMS_FOR_BINARY, "true" );
-		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE,DEFAULT_BATCH_SIZE );
+		getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE );
 
 		registerFunction( "current_time", new SQLFunctionTemplate( StandardBasicTypes.TIME, "current_time" ) );
 		registerFunction( "current_date", new SQLFunctionTemplate( StandardBasicTypes.DATE, "current_date" ) );
@@ -82,14 +83,14 @@ public class Teradata14Dialect extends TeradataDialect {
 	 *
 	 * @throws HibernateException
 	 */
-	 public String getTypeName(int code, int length, int precision, int scale) throws HibernateException {
+	public String getTypeName(int code, int length, int precision, int scale) throws HibernateException {
 		/*
 		 * We might want a special case for 19,2. This is very common for money types
 		 * and here it is converted to 18,1
 		 */
-		float f = precision > 0 ? ( float ) scale / ( float ) precision : 0;
+		float f = precision > 0 ? (float) scale / (float) precision : 0;
 		int p = ( precision > 38 ? 38 : precision );
-		int s = ( precision > 38 ? ( int ) ( 38.0 * f ) : ( scale > 38 ? 38 : scale ) );
+		int s = ( precision > 38 ? (int) ( 38.0 * f ) : ( scale > 38 ? 38 : scale ) );
 		return super.getTypeName( code, length, p, s );
 	}
 
@@ -138,7 +139,7 @@ public class Teradata14Dialect extends TeradataDialect {
 
 	@Override
 	public int registerResultSetOutParameter(CallableStatement statement, int col) throws SQLException {
-		statement.registerOutParameter(col, Types.REF);
+		statement.registerOutParameter( col, Types.REF );
 		col++;
 		return col;
 	}
@@ -146,7 +147,7 @@ public class Teradata14Dialect extends TeradataDialect {
 	@Override
 	public ResultSet getResultSet(CallableStatement cs) throws SQLException {
 		boolean isResultSet = cs.execute();
-		while (!isResultSet && cs.getUpdateCount() != -1) {
+		while ( !isResultSet && cs.getUpdateCount() != -1 ) {
 			isResultSet = cs.getMoreResults();
 		}
 		return cs.getResultSet();
@@ -164,18 +165,20 @@ public class Teradata14Dialect extends TeradataDialect {
 			String constraintName = null;
 
 			int errorCode = sqle.getErrorCode();
-			if (errorCode == 27003) {
-				constraintName = extractUsingTemplate("Unique constraint (", ") violated.", sqle.getMessage());
-			} else if (errorCode == 2700) {
-				constraintName = extractUsingTemplate("Referential constraint", "violation:", sqle.getMessage());
-			} else if (errorCode == 5317) {
-				constraintName = extractUsingTemplate("Check constraint (", ") violated.", sqle.getMessage());
+			if ( errorCode == 27003 ) {
+				constraintName = extractUsingTemplate( "Unique constraint (", ") violated.", sqle.getMessage() );
+			}
+			else if ( errorCode == 2700 ) {
+				constraintName = extractUsingTemplate( "Referential constraint", "violation:", sqle.getMessage() );
+			}
+			else if ( errorCode == 5317 ) {
+				constraintName = extractUsingTemplate( "Check constraint (", ") violated.", sqle.getMessage() );
 			}
 
-			if (constraintName != null) {
-				int i = constraintName.indexOf('.');
-				if (i != -1) {
-					constraintName = constraintName.substring(i + 1);
+			if ( constraintName != null ) {
+				int i = constraintName.indexOf( '.' );
+				if ( i != -1 ) {
+					constraintName = constraintName.substring( i + 1 );
 				}
 			}
 			return constraintName;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java
index f9f4b80867..413b64c48e 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java
@@ -276,4 +276,4 @@ public class TeradataDialect extends Dialect implements IdTableSupport {
 	public int getInExpressionCountLimit() {
 		return PARAM_LIST_SIZE_LIMIT;
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java
index 808305385f..bad922aa91 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java
@@ -43,7 +43,6 @@ import org.hibernate.hql.spi.id.IdTableSupportStandardImpl;
 import org.hibernate.hql.spi.id.MultiTableBulkIdStrategy;
 import org.hibernate.hql.spi.id.global.GlobalTemporaryTableBulkIdStrategy;
 import org.hibernate.hql.spi.id.local.AfterUseAction;
-import org.hibernate.hql.spi.id.local.LocalTemporaryTableBulkIdStrategy;
 import org.hibernate.persister.entity.Lockable;
 import org.hibernate.sql.JoinFragment;
 import org.hibernate.sql.OracleJoinFragment;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java
index 56cd8b5d35..557931a97e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java
@@ -97,7 +97,7 @@ public class BatchingBatch extends AbstractBatchImpl {
 				notifyObserversImplicitExecution();
 				performExecution();
 				batchPosition = 0;
-                batchExecuted = true;
+				batchExecuted = true;
 			}
 			statementPosition = 0;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
index fa402300a3..263568f36d 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
@@ -298,6 +298,7 @@ public class DriverManagerConnectionProviderImpl
 	}
 
 
+	//CHECKSTYLE:START_ALLOW_FINALIZER
 	@Override
 	protected void finalize() throws Throwable {
 		if ( active ) {
@@ -305,5 +306,6 @@ public class DriverManagerConnectionProviderImpl
 		}
 		super.finalize();
 	}
+	//CHECKSTYLE:END_ALLOW_FINALIZER
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java
index 841f0c1875..63c82e1f17 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java
@@ -30,7 +30,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
-import java.util.Locale;
 import java.util.Set;
 
 import org.hibernate.engine.jdbc.cursor.internal.StandardRefCursorSupport;
@@ -39,7 +38,6 @@ import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.engine.jdbc.env.spi.SQLStateType;
 import org.hibernate.engine.jdbc.spi.TypeInfo;
 import org.hibernate.internal.util.StringHelper;
-import org.hibernate.mapping.Collection;
 
 /**
  * Standard implementation of ExtractedDatabaseMetaData
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
index 92403f6ee3..6ba702885c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java
@@ -44,7 +44,7 @@ public class ResultSetReturnImpl implements ResultSetReturn {
 	private final Dialect dialect;
 	private final SqlStatementLogger sqlStatementLogger;
 	private final SqlExceptionHelper sqlExceptionHelper;
-	
+
 	private boolean isJdbc4 = true;
 
 	/**
@@ -69,7 +69,7 @@ public class ResultSetReturnImpl implements ResultSetReturn {
 	@Override
 	public ResultSet extract(PreparedStatement statement) {
 		// IMPL NOTE : SQL logged by caller
-		if (isTypeOf(statement, CallableStatement.class)) {
+		if ( isTypeOf( statement, CallableStatement.class ) ) {
 			// We actually need to extract from Callable statement.  Although
 			// this seems needless, Oracle can return an
 			// OracleCallableStatementWrapper that finds its way to this method,
@@ -103,23 +103,23 @@ public class ResultSetReturnImpl implements ResultSetReturn {
 	}
 
 	private boolean isTypeOf(final Statement statement, final Class<? extends Statement> type) {
-        if (isJdbc4) {
-            try {
-                // This is "more correct" than #isInstance, but not always supported.
-                return statement.isWrapperFor( type );
-            }
-            catch (SQLException e) {
-                // No operation
-            }
-            catch (Throwable e) {
-                // No operation. Note that this catches more than just SQLException to
-                // cover edge cases where a driver might throw an UnsupportedOperationException, AbstractMethodError,
-                // etc.  If so, skip permanently.
-                isJdbc4 = false;
-            }
-        }
-        return type.isInstance( statement );
-    }
+		if ( isJdbc4 ) {
+			try {
+				// This is "more correct" than #isInstance, but not always supported.
+				return statement.isWrapperFor( type );
+			}
+			catch (SQLException e) {
+				// No operation
+			}
+			catch (Throwable e) {
+				// No operation. Note that this catches more than just SQLException to
+				// cover edge cases where a driver might throw an UnsupportedOperationException, AbstractMethodError,
+				// etc.  If so, skip permanently.
+				isJdbc4 = false;
+			}
+		}
+		return type.isInstance( statement );
+	}
 
 	@Override
 	public ResultSet extract(CallableStatement callableStatement) {
@@ -210,7 +210,7 @@ public class ResultSetReturnImpl implements ResultSetReturn {
 			throw sqlExceptionHelper.convert( e, "could not execute statement" );
 		}
 	}
-	
+
 	@Override
 	public int executeUpdate(PreparedStatement statement) {
 		try {
@@ -224,7 +224,7 @@ public class ResultSetReturnImpl implements ResultSetReturn {
 			jdbcExecuteStatementEnd();
 		}
 	}
-	
+
 	@Override
 	public int executeUpdate(Statement statement, String sql) {
 		sqlStatementLogger.logStatement( sql );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java
index 8a27415b48..c4eba020f4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java
@@ -95,7 +95,7 @@ public class SqlExceptionHelper {
 	 * @param sqlExceptionConverter The converter to use.
 	 */
 	public void setSqlExceptionConverter(SQLExceptionConverter sqlExceptionConverter) {
-		this.sqlExceptionConverter = (sqlExceptionConverter == null ? DEFAULT_CONVERTER : sqlExceptionConverter);
+		this.sqlExceptionConverter = ( sqlExceptionConverter == null ? DEFAULT_CONVERTER : sqlExceptionConverter );
 	}
 
 	// SQLException ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -154,13 +154,13 @@ public class SqlExceptionHelper {
 	/**
 	 * Contract for handling {@link SQLWarning warnings}
 	 */
-	public static interface WarningHandler {
+	public interface WarningHandler {
 		/**
 		 * Should processing be done? Allows short-circuiting if not.
 		 *
 		 * @return True to process warnings, false otherwise.
 		 */
-		public boolean doProcess();
+		boolean doProcess();
 
 		/**
 		 * Prepare for processing of a {@link SQLWarning warning} stack.
@@ -169,14 +169,14 @@ public class SqlExceptionHelper {
 		 *
 		 * @param warning The first warning in the stack.
 		 */
-		public void prepare(SQLWarning warning);
+		void prepare(SQLWarning warning);
 
 		/**
 		 * Handle an individual warning in the stack.
 		 *
 		 * @param warning The warning to handle.
 		 */
-		public void handleWarning(SQLWarning warning);
+		void handleWarning(SQLWarning warning);
 	}
 
 	/**
@@ -237,7 +237,9 @@ public class SqlExceptionHelper {
 	/**
 	 * Static access to the standard handler for logging warnings
 	 */
-	public static final StandardWarningHandler STANDARD_WARNING_HANDLER = new StandardWarningHandler( DEFAULT_WARNING_MSG );
+	public static final StandardWarningHandler STANDARD_WARNING_HANDLER = new StandardWarningHandler(
+			DEFAULT_WARNING_MSG
+	);
 
 	/**
 	 * Generic algorithm to walk the hierarchy of SQLWarnings
@@ -268,7 +270,7 @@ public class SqlExceptionHelper {
 	public void logAndClearWarnings(Connection connection) {
 		handleAndClearWarnings( connection, STANDARD_WARNING_HANDLER );
 	}
-	
+
 	public void logAndClearWarnings(Statement statement) {
 		handleAndClearWarnings( statement, STANDARD_WARNING_HANDLER );
 	}
@@ -314,16 +316,16 @@ public class SqlExceptionHelper {
 			Statement statement,
 			WarningHandler handler) {
 		// See HHH-9174.  Statement#getWarnings can be an expensive call for many JDBC libs.  Don't do it unless
-    	// the log level would actually allow a warning to be logged.
-    	if (LOG.isEnabled(Level.WARN)) {
-    		try {
+		// the log level would actually allow a warning to be logged.
+		if ( LOG.isEnabled( Level.WARN ) ) {
+			try {
 				walkWarnings( statement.getWarnings(), handler );
 			}
 			catch (SQLException sqlException) {
 				// workaround for WebLogic
 				LOG.debug( "could not log warnings", sqlException );
 			}
-    	}
+		}
 		try {
 			// Sybase fail if we don't do that, sigh...
 			statement.clearWarnings();
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/EntityGraphQueryHint.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/EntityGraphQueryHint.java
index 4356100302..7f703c3b10 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/EntityGraphQueryHint.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/EntityGraphQueryHint.java
@@ -138,7 +138,8 @@ public class EntityGraphQueryHint {
 								queryableCollection, collectionType.getRole(), JoinType.LEFT_OUTER_JOIN, true, false
 						);
 					}
-				} else {
+				}
+				else {
 					explicitFromElement = true;
 					fromElement.setInProjectionList( true );
 					fromElement.setFetch( true );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/QueryPlanCache.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/QueryPlanCache.java
index 5f7eebf196..21dfb40ffe 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/QueryPlanCache.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/QueryPlanCache.java
@@ -166,7 +166,8 @@ public class QueryPlanCache implements Serializable {
 			LOG.tracev( "Unable to locate HQL query plan in cache; generating ({0})", queryString );
 			value = new HQLQueryPlan( queryString, shallow, enabledFilters, factory );
 			queryPlanCache.putIfAbsent( key, value );
-		} else {
+		}
+		else {
 			LOG.tracev( "Located HQL query plan in cache ({0})", queryString );
 		}
 		return value;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
index a3793f3087..ebb6092caa 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
@@ -27,7 +27,6 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -290,7 +289,7 @@ public class ActionQueue {
 
 	private void registerCleanupActions(Executable executable) {
 		beforeTransactionProcesses.register( executable.getBeforeTransactionCompletionProcess() );
-		if ( session.getFactory().getSettings().isQueryCacheEnabled() ) {
+		if ( session.getFactory().getSessionFactoryOptions().isQueryCacheEnabled() ) {
 			invalidateSpaces( executable.getPropertySpaces() );
 		}
 		afterTransactionProcesses.register( executable.getAfterTransactionCompletionProcess() );
@@ -471,7 +470,7 @@ public class ActionQueue {
 			}
 		}
 		finally {
-			if ( session.getFactory().getSettings().isQueryCacheEnabled() ) {
+			if ( session.getFactory().getSessionFactoryOptions().isQueryCacheEnabled() ) {
 				// Strictly speaking, only a subset of the list may have been processed if a RuntimeException occurs.
 				// We still invalidate all spaces. I don't see this as a big deal - after all, RuntimeExceptions are
 				// unexpected.
@@ -573,7 +572,7 @@ public class ActionQueue {
 	}
 
 	public void sortCollectionActions() {
-		if ( session.getFactory().getSettings().isOrderUpdatesEnabled() ) {
+		if ( session.getFactory().getSessionFactoryOptions().isOrderUpdatesEnabled() ) {
 			// sort the updates by fk
 			collectionCreations.sort();
 			collectionUpdates.sort();
@@ -583,11 +582,11 @@ public class ActionQueue {
 	}
 
 	public void sortActions() {
-		if ( session.getFactory().getSettings().isOrderUpdatesEnabled() ) {
+		if ( session.getFactory().getSessionFactoryOptions().isOrderUpdatesEnabled() ) {
 			// sort the updates by pk
 			updates.sort();
 		}
-		if ( session.getFactory().getSettings().isOrderInsertsEnabled() ) {
+		if ( session.getFactory().getSessionFactoryOptions().isOrderInsertsEnabled() ) {
 			insertions.sort();
 		}
 	}
@@ -604,10 +603,12 @@ public class ActionQueue {
 		}
 	}
 
+	@SuppressWarnings("SimplifiableConditionalExpression")
 	public boolean hasAfterTransactionActions() {
 		return isTransactionCoordinatorShared ? false : afterTransactionProcesses.hasActions();
 	}
 
+	@SuppressWarnings("SimplifiableConditionalExpression")
 	public boolean hasBeforeTransactionActions() {
 		return isTransactionCoordinatorShared ? false : beforeTransactionProcesses.hasActions();
 	}
@@ -759,7 +760,7 @@ public class ActionQueue {
 				}
 			}
 
-			if ( session.getFactory().getSettings().isQueryCacheEnabled() ) {
+			if ( session.getFactory().getSessionFactoryOptions().isQueryCacheEnabled() ) {
 				session.getFactory().getUpdateTimestampsCache().invalidate(
 						querySpacesToInvalidate.toArray( new String[querySpacesToInvalidate.size()] ),
 						session
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
index 1ecdf10311..643b525a47 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
@@ -24,7 +24,6 @@
 package org.hibernate.engine.spi;
 
 import java.io.IOException;
-import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
index b456700f69..7d89247023 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionImplementor.java
@@ -27,7 +27,6 @@ import java.io.Serializable;
 import java.sql.Connection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 import org.hibernate.CacheMode;
 import org.hibernate.Criteria;
@@ -38,7 +37,6 @@ import org.hibernate.Query;
 import org.hibernate.SQLQuery;
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
-import org.hibernate.Transaction;
 import org.hibernate.cache.spi.CacheKey;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.jdbc.LobCreationContext;
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/LocalStatus.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/LocalStatus.java
deleted file mode 100644
index ef9343c825..0000000000
--- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/LocalStatus.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2011, Red Hat Inc. or third-party contributors as
- * indicated by the @author tags or express copyright attribution
- * statements applied by the authors.  All third-party contributions are
- * distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA  02110-1301  USA
- */
-package org.hibernate.engine.transaction.spi;
-
-/**
- * Enumeration of statuses in which a local transaction facade ({@link org.hibernate.Transaction}) might be.
- *
- * @author Steve Ebersole
- */
-public enum LocalStatus {
-	/**
-	 * The local transaction has not yet been begun
-	 */
-	NOT_ACTIVE,
-	/**
-	 * The local transaction has been begun, but not yet completed.
-	 */
-	ACTIVE,
-	/**
-	 * The local transaction has been competed successfully.
-	 */
-	COMMITTED,
-	/**
-	 * The local transaction has been rolled back.
-	 */
-	ROLLED_BACK,
-	/**
-	 * The local transaction attempted to commit, but failed.
-	 */
-	FAILED_COMMIT
-}
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
index c99a3bb827..39d97df4b3 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
@@ -171,7 +171,9 @@ public abstract class AbstractFlushingEventListener implements Serializable {
 		}
 	}
 
-	protected Object getAnything() { return null; }
+	protected Object getAnything() {
+		return null;
+	}
 
 	protected CascadingAction getCascadingAction() {
 		return CascadingActions.SAVE_UPDATE;
diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java
index ba995c97bb..11d185fae2 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EvictVisitor.java
@@ -33,8 +33,6 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.type.CollectionType;
 
-import org.jboss.logging.Logger;
-
 /**
  * Evict any collections referenced by the object from the session cache.
  * This will NOT pick up any collections that were dereferenced, so they
diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserver.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserver.java
index a1286fdb7b..3f0d8f93b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserver.java
+++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EntityCopyObserver.java
@@ -23,8 +23,6 @@
  */
 package org.hibernate.event.spi;
 
-import org.hibernate.event.spi.EventSource;
-
 /**
  * An observer for detection of multiple entity representations for a persistent entity being merged.
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/HolderInstantiator.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/HolderInstantiator.java
index afa96d782a..846656f24a 100755
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/HolderInstantiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/HolderInstantiator.java
@@ -76,10 +76,7 @@ public final class HolderInstantiator {
 		return constructor != null ? new AliasToBeanConstructorResultTransformer( constructor ) : transformer;
 	}	
 
-	public HolderInstantiator( 
-			ResultTransformer transformer,
-			String[] queryReturnAliases
-	) {
+	public HolderInstantiator(ResultTransformer transformer, String[] queryReturnAliases) {
 		this.transformer = transformer;		
 		this.queryReturnAliases = queryReturnAliases;
 	}
@@ -89,9 +86,10 @@ public final class HolderInstantiator {
 	}
 	
 	public Object instantiate(Object[] row) {
-		if(transformer==null) {
+		if (transformer==null) {
 			return row;
-		} else {
+		}
+		else {
 			return transformer.transformTuple(row, queryReturnAliases);
 		}
 	}	
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/QueryTranslatorFactoryInitiator.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/QueryTranslatorFactoryInitiator.java
index c8144e32d4..b91c93d2ee 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/QueryTranslatorFactoryInitiator.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/QueryTranslatorFactoryInitiator.java
@@ -25,18 +25,14 @@ package org.hibernate.hql.internal;
 
 import java.util.Map;
 
-import org.hibernate.HibernateException;
 import org.hibernate.boot.registry.StandardServiceInitiator;
 import org.hibernate.boot.registry.selector.spi.StrategySelector;
 import org.hibernate.hql.internal.ast.ASTQueryTranslatorFactory;
 import org.hibernate.hql.spi.QueryTranslatorFactory;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
-import org.jboss.logging.Logger;
-
 import static org.hibernate.cfg.AvailableSettings.QUERY_TRANSLATOR;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromClause.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromClause.java
index 4978690fce..73625b1791 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromClause.java
@@ -26,7 +26,6 @@ package org.hibernate.hql.internal.ast.tree;
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElement.java
index eb96909c44..316a8f0670 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElement.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElement.java
@@ -62,7 +62,7 @@ import org.hibernate.type.Type;
  * @author josh
  */
 public class FromElement extends HqlSqlWalkerNode implements DisplayableNode, ParameterContainer {
-    private static final CoreMessageLogger LOG = CoreLogging.messageLogger( FromElement.class );
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( FromElement.class );
 
 	private String className;
 	private String classAlias;
@@ -132,19 +132,24 @@ public class FromElement extends HqlSqlWalkerNode implements DisplayableNode, Pa
 	}
 
 	public void initializeEntity(
-	        FromClause fromClause,
-	        String className,
-	        EntityPersister persister,
-	        EntityType type,
-	        String classAlias,
-	        String tableAlias) {
+			FromClause fromClause,
+			String className,
+			EntityPersister persister,
+			EntityType type,
+			String classAlias,
+			String tableAlias) {
 		doInitialize( fromClause, tableAlias, className, classAlias, persister, type );
 		this.sequence = fromClause.nextFromElementCounter();
 		initialized = true;
 	}
 
-	private void doInitialize(FromClause fromClause, String tableAlias, String className, String classAlias,
-							  EntityPersister persister, EntityType type) {
+	private void doInitialize(
+			FromClause fromClause,
+			String tableAlias,
+			String className,
+			String classAlias,
+			EntityPersister persister,
+			EntityType type) {
 		if ( initialized ) {
 			throw new IllegalStateException( "Already initialized!!" );
 		}
@@ -163,7 +168,7 @@ public class FromElement extends HqlSqlWalkerNode implements DisplayableNode, Pa
 	}
 
 	@Override
-    public Type getDataType() {
+	public Type getDataType() {
 		return elementType.getDataType();
 	}
 
@@ -293,12 +298,12 @@ public class FromElement extends HqlSqlWalkerNode implements DisplayableNode, Pa
 	}
 
 	@Override
-    public int hashCode() {
+	public int hashCode() {
 		return super.hashCode();
 	}
 
 	@Override
-    public boolean equals(Object obj) {
+	public boolean equals(Object obj) {
 		return super.equals( obj );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IdentNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IdentNode.java
index 3acabfcef6..657167bba5 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IdentNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IdentNode.java
@@ -331,7 +331,7 @@ public class IdentNode extends FromReferenceNode implements SelectExpression {
 	}
 
 	@Override
-    public Type getDataType() {
+	public Type getDataType() {
 		Type type = super.getDataType();
 		if ( type != null ) {
 			return type;
@@ -365,7 +365,7 @@ public class IdentNode extends FromReferenceNode implements SelectExpression {
 	}
 
 	@Override
-    public String getDisplayText() {
+	public String getDisplayText() {
 		StringBuilder buf = new StringBuilder();
 
 		if (getType() == SqlTokenTypes.ALIAS_REF) {
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IntoClause.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IntoClause.java
index 34b79dccde..5303b5495b 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IntoClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/IntoClause.java
@@ -120,15 +120,15 @@ public class IntoClause extends HqlSqlWalkerNode implements DisplayableNode {
 			throw new QueryException( "number of select types did not match those for insert" );
 		}
 
-		int parameterCount = 0; 
+		int parameterCount = 0;
 		for ( int i = 0; i < types.length; i++ ) {
-			if( selectClause.getParameterPositions().contains(i) ) {
+			if ( selectClause.getParameterPositions().contains( i ) ) {
 				parameterCount++;
 			}
 			else if ( !areCompatible( types[i], selectTypes[i - parameterCount] ) ) {
 				throw new QueryException(
-				        "insertion type [" + types[i] + "] and selection type [" +
-				        selectTypes[i - parameterCount] + "] at position " + i + " are not compatible"
+						"insertion type [" + types[i] + "] and selection type [" +
+								selectTypes[i - parameterCount] + "] at position " + i + " are not compatible"
 				);
 			}
 		}
@@ -142,13 +142,11 @@ public class IntoClause extends HqlSqlWalkerNode implements DisplayableNode {
 	 * @return String - The additional display text.
 	 */
 	public String getDisplayText() {
-		StringBuilder buf = new StringBuilder();
-		buf.append( "IntoClause{" );
-		buf.append( "entityName=" ).append( getEntityName() );
-		buf.append( ",tableName=" ).append( getTableName() );
-		buf.append( ",columns={" ).append( columnSpec ).append( "}" );
-		buf.append( "}" );
-		return buf.toString();
+		return "IntoClause{"
+				+ "entityName=" + getEntityName()
+				+ ",tableName=" + getTableName()
+				+ ",columns={" + columnSpec + "}"
+				+ "}";
 	}
 
 	private void initializeColumns() {
@@ -185,20 +183,21 @@ public class IntoClause extends HqlSqlWalkerNode implements DisplayableNode {
 						componentIds.add( propertyNames[i] );
 					}
 				}
-				if ( componentIds.contains(name) ) {
+				if ( componentIds.contains( name ) ) {
 					if ( explicitComponentIds == null ) {
 						explicitComponentIds = new ArrayList( componentIds.size() );
 					}
 					explicitComponentIds.add( name );
 					explicitIdInsertion = explicitComponentIds.size() == componentIds.size();
 				}
-			} else if ( name.equals( persister.getIdentifierPropertyName() ) ) {
+			}
+			else if ( name.equals( persister.getIdentifierPropertyName() ) ) {
 				explicitIdInsertion = true;
 			}
 		}
-			
+
 		if ( persister.isVersioned() ) {
-			if ( name.equals( persister.getPropertyNames()[ persister.getVersionProperty() ] ) ) {
+			if ( name.equals( persister.getPropertyNames()[persister.getVersionProperty()] ) ) {
 				explicitVersionInsertion = true;
 			}
 		}
@@ -238,6 +237,7 @@ public class IntoClause extends HqlSqlWalkerNode implements DisplayableNode {
 	 *
 	 * @param target The type defined in the into-clause.
 	 * @param source The type defined in the select clause.
+	 *
 	 * @return True if they are assignment compatible.
 	 */
 	private boolean areCompatible(Type target, Type source) {
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/JavaConstantNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/JavaConstantNode.java
index fee5f51717..f426b5c1b4 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/JavaConstantNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/JavaConstantNode.java
@@ -33,7 +33,6 @@ import org.hibernate.hql.spi.QueryTranslator;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.type.LiteralType;
-import org.hibernate.type.StringRepresentableType;
 import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.converter.AttributeConverterTypeAdapter;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Node.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Node.java
index 1b5e451c87..9e59d700be 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Node.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/Node.java
@@ -62,7 +62,7 @@ public class Node extends antlr.CommonAST {
 	}
 
 	@Override
-    public void initialize(Token tok) {
+	public void initialize(Token tok) {
 		super.initialize(tok);
 		filename = tok.getFilename();
 		line = tok.getLine();
@@ -72,7 +72,7 @@ public class Node extends antlr.CommonAST {
 	}
 
 	@Override
-    public void initialize(AST t) {
+	public void initialize(AST t) {
 		super.initialize( t );
 		if ( t instanceof Node ) {
 			Node n = (Node)t;
@@ -88,12 +88,12 @@ public class Node extends antlr.CommonAST {
 	}
 
 	@Override
-    public int getLine() {
+	public int getLine() {
 		return line;
 	}
 
 	@Override
-    public int getColumn() {
+	public int getColumn() {
 		return column;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/OrderByClause.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/OrderByClause.java
index c4bc307022..1701c76180 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/OrderByClause.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/OrderByClause.java
@@ -35,11 +35,10 @@ import antlr.collections.AST;
  * @author Steve Ebersole
  */
 public class OrderByClause extends HqlSqlWalkerNode implements HqlSqlTokenTypes {
-
 	public void addOrderFragment(String orderByFragment) {
 		AST fragment = ASTUtil.create( getASTFactory(), SQL_TOKEN, orderByFragment );
 		if ( getFirstChild() == null ) {
-            setFirstChild( fragment );
+			setFirstChild( fragment );
 		}
 		else {
 			addChild( fragment );
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ResultVariableRefNode.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ResultVariableRefNode.java
index 1e1efcad05..c76f47ac95 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ResultVariableRefNode.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/ResultVariableRefNode.java
@@ -58,11 +58,8 @@ public class ResultVariableRefNode extends HqlSqlWalkerNode {
 		this.selectExpression = selectExpression;
 	}
 
-	/**
-	 *  {@inheritDoc}
-	 */
 	@Override
-    public String getRenderText(SessionFactoryImplementor sessionFactory) {
+	public String getRenderText(SessionFactoryImplementor sessionFactory) {
 		int scalarColumnIndex = selectExpression.getScalarColumnIndex();
 		if ( scalarColumnIndex < 0 ) {
 			throw new IllegalStateException(
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UpdateStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UpdateStatement.java
index eabb8f3ca5..1d70d9f373 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UpdateStatement.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/UpdateStatement.java
@@ -27,10 +27,9 @@ package org.hibernate.hql.internal.ast.tree;
 import org.hibernate.hql.internal.antlr.HqlSqlTokenTypes;
 import org.hibernate.hql.internal.antlr.SqlTokenTypes;
 import org.hibernate.hql.internal.ast.util.ASTUtil;
+import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 
-import org.jboss.logging.Logger;
-
 import antlr.collections.AST;
 
 /**
@@ -39,31 +38,26 @@ import antlr.collections.AST;
  * @author Steve Ebersole
  */
 public class UpdateStatement extends AbstractRestrictableStatement {
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UpdateStatement.class );
 
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, UpdateStatement.class.getName());
-
-	/**
-	 * @see org.hibernate.hql.internal.ast.tree.Statement#getStatementType()
-	 */
+	@Override
 	public int getStatementType() {
 		return SqlTokenTypes.UPDATE;
 	}
 
-	/**
-	 * @see org.hibernate.hql.internal.ast.tree.Statement#needsExecutor()
-	 */
+	@Override
 	public boolean needsExecutor() {
 		return true;
 	}
 
 	@Override
-    protected int getWhereClauseParentTokenType() {
+	protected int getWhereClauseParentTokenType() {
 		return SqlTokenTypes.SET;
 	}
 
 	@Override
-    protected CoreMessageLogger getLog() {
-        return LOG;
+	protected CoreMessageLogger getLog() {
+		return LOG;
 	}
 
 	public AST getSetClause() {
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ClassicQueryTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ClassicQueryTranslatorFactory.java
index e400fb2868..6daec30f65 100755
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ClassicQueryTranslatorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/ClassicQueryTranslatorFactory.java
@@ -23,6 +23,7 @@
  *
  */
 package org.hibernate.hql.internal.classic;
+
 import java.util.Map;
 
 import org.hibernate.QueryException;
@@ -39,30 +40,25 @@ import org.hibernate.hql.spi.QueryTranslatorFactory;
  * @author Gavin King
  */
 public class ClassicQueryTranslatorFactory implements QueryTranslatorFactory {
-
-	/**
-	 * @see QueryTranslatorFactory#createQueryTranslator
-	 */
+	@Override
 	public QueryTranslator createQueryTranslator(
 			String queryIdentifier,
-	        String queryString,
-	        Map filters,
-	        SessionFactoryImplementor factory,
-	        EntityGraphQueryHint entityGraphQueryHint) {
-		if (entityGraphQueryHint != null) {
+			String queryString,
+			Map filters,
+			SessionFactoryImplementor factory,
+			EntityGraphQueryHint entityGraphQueryHint) {
+		if ( entityGraphQueryHint != null ) {
 			throw new QueryException( "EntityGraphs cannot be applied queries using the classic QueryTranslator!" );
 		}
 		return new QueryTranslatorImpl( queryIdentifier, queryString, filters, factory );
 	}
 
-	/**
-	 * @see org.hibernate.hql.spi.QueryTranslatorFactory#createFilterTranslator
-	 */
+	@Override
 	public FilterTranslator createFilterTranslator(
 			String queryIdentifier,
 			String queryString,
-	        Map filters,
-	        SessionFactoryImplementor factory) {
+			Map filters,
+			SessionFactoryImplementor factory) {
 		return new QueryTranslatorImpl( queryIdentifier, queryString, filters, factory );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/FromParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/FromParser.java
index 9bf9bcc3fb..0ed2339bf0 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/FromParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/FromParser.java
@@ -23,6 +23,7 @@
  *
  */
 package org.hibernate.hql.internal.classic;
+
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -51,7 +52,7 @@ public class FromParser implements Parser {
 	private boolean afterJoinType;
 	private JoinType joinType = JoinType.INNER_JOIN;
 	private boolean afterFetch;
-	
+
 	//support collection member declarations
 	//e.g. "from Customer c, in(c.orders) as o"
 	private boolean memberDeclarations;
@@ -59,7 +60,7 @@ public class FromParser implements Parser {
 	private boolean afterMemberDeclarations;
 	private String collectionName;
 
-	private static final Map<String,JoinType> JOIN_TYPES = new HashMap<String,JoinType>();
+	private static final Map<String, JoinType> JOIN_TYPES = new HashMap<String, JoinType>();
 
 	static {
 		JOIN_TYPES.put( "left", JoinType.LEFT_OUTER_JOIN );
@@ -71,7 +72,7 @@ public class FromParser implements Parser {
 	public void token(String token, QueryTranslatorImpl q) throws QueryException {
 
 		// start by looking for HQL keywords...
-		String lcToken = token.toLowerCase(Locale.ROOT);
+		String lcToken = token.toLowerCase( Locale.ROOT );
 		if ( lcToken.equals( "," ) ) {
 			if ( !( expectingJoin | expectingAs ) ) {
 				throw new QueryException( "unexpected token: ," );
@@ -81,7 +82,9 @@ public class FromParser implements Parser {
 		}
 		else if ( lcToken.equals( "join" ) ) {
 			if ( !afterJoinType ) {
-				if ( !( expectingJoin | expectingAs ) ) throw new QueryException( "unexpected token: join" );
+				if ( !( expectingJoin | expectingAs ) ) {
+					throw new QueryException( "unexpected token: join" );
+				}
 				// inner joins can be abbreviated to 'join'
 				joinType = JoinType.INNER_JOIN;
 				expectingJoin = false;
@@ -107,7 +110,7 @@ public class FromParser implements Parser {
 			// 'outer' is optional and is ignored
 			if ( !afterJoinType ||
 					( joinType != JoinType.LEFT_OUTER_JOIN && joinType != JoinType.RIGHT_OUTER_JOIN )
-			) {
+					) {
 				throw new QueryException( "unexpected token: outer" );
 			}
 		}
@@ -130,7 +133,7 @@ public class FromParser implements Parser {
 			afterClass = true;
 		}
 		else if ( lcToken.equals( "in" ) ) {
-			if (alias == null ){
+			if ( alias == null ) {
 				memberDeclarations = true;
 				afterMemberDeclarations = false;
 			}
@@ -149,15 +152,15 @@ public class FromParser implements Parser {
 			afterAs = true;
 			expectingAs = false;
 		}
-		else if ( "(".equals( token ) ){
-			if( !memberDeclarations ) {
+		else if ( "(".equals( token ) ) {
+			if ( !memberDeclarations ) {
 				throw new QueryException( "unexpected token: (" );
 			}
 			//TODO alias should be null here
 			expectingPathExpression = true;
-			
+
 		}
-		else if ( ")".equals( token ) ){
+		else if ( ")".equals( token ) ) {
 //			memberDeclarations = false;
 //			expectingPathExpression = false;
 			afterMemberDeclarations = true;
@@ -218,7 +221,9 @@ public class FromParser implements Parser {
 				if ( afterClass ) {
 					// treat it as a classname
 					Queryable p = q.getEntityPersisterUsingImports( token );
-					if ( p == null ) throw new QueryException( "persister not found: " + token );
+					if ( p == null ) {
+						throw new QueryException( "persister not found: " + token );
+					}
 					q.addFromClass( alias, p );
 				}
 				else {
@@ -226,7 +231,11 @@ public class FromParser implements Parser {
 					peParser.setJoinType( JoinType.INNER_JOIN );
 					peParser.setUseThetaStyleJoin( true );
 					ParserHelper.parse( peParser, q.unalias( token ), ParserHelper.PATH_SEPARATORS, q );
-					if ( !peParser.isCollectionValued() ) throw new QueryException( "path expression did not resolve to collection: " + token );
+					if ( !peParser.isCollectionValued() ) {
+						throw new QueryException(
+								"path expression did not resolve to collection: " + token
+						);
+					}
 					String nm = peParser.addFromCollection( q );
 					q.setAliasName( alias, nm );
 				}
@@ -236,7 +245,7 @@ public class FromParser implements Parser {
 				afterClass = false;
 				expectingJoin = true;
 			}
-			else if( memberDeclarations && expectingPathExpression ){
+			else if ( memberDeclarations && expectingPathExpression ) {
 				expectingAs = true;
 				peParser.setJoinType( JoinType.INNER_JOIN );
 				peParser.setUseThetaStyleJoin( false );
@@ -323,10 +332,10 @@ public class FromParser implements Parser {
 	}
 
 	public void end(QueryTranslatorImpl q) {
-		if( afterMemberDeclarations ) {
+		if ( afterMemberDeclarations ) {
 			//The exception throwned by the AST query translator contains the error token location, respensent by line and colum, 
 			//but it hard to get that info here.
-			throw new QueryException("alias not specified for IN");
+			throw new QueryException( "alias not specified for IN" );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/PreprocessingParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/PreprocessingParser.java
index 9dc99864d3..a8210ab430 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/PreprocessingParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/PreprocessingParser.java
@@ -38,10 +38,10 @@ import org.hibernate.internal.util.StringHelper;
  */
 public class PreprocessingParser implements Parser {
 
-	private static final Set HQL_OPERATORS;
+	private static final Set<String> HQL_OPERATORS;
 
 	static {
-		HQL_OPERATORS = new HashSet();
+		HQL_OPERATORS = new HashSet<String>();
 		HQL_OPERATORS.add( "<=" );
 		HQL_OPERATORS.add( ">=" );
 		HQL_OPERATORS.add( "=>" );
@@ -85,7 +85,9 @@ public class PreprocessingParser implements Parser {
 			}
 			quoted = !quoted;
 		}
-		if ( quoted ) return;
+		if ( quoted ) {
+			return;
+		}
 
 		//ignore whitespace
 		if ( ParserHelper.isWhitespace( token ) ) return;
@@ -142,7 +144,9 @@ public class PreprocessingParser implements Parser {
 	}
 
 	public void end(QueryTranslatorImpl q) throws QueryException {
-		if ( lastToken != null ) parser.token( lastToken, q );
+		if ( lastToken != null ) {
+			parser.token( lastToken, q );
+		}
 		parser.end( q );
 		lastToken = null;
 		currentCollectionProp = null;
@@ -150,8 +154,3 @@ public class PreprocessingParser implements Parser {
 
 }
 
-
-
-
-
-
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java
index 9b45d71d9c..03181d319c 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/QueryTranslatorImpl.java
@@ -84,7 +84,7 @@ import org.hibernate.type.Type;
  * query string to SQL.
  */
 public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator {
-    private static final CoreMessageLogger LOG = CoreLogging.messageLogger( QueryTranslatorImpl.class );
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( QueryTranslatorImpl.class );
 
 	private static final String[] NO_RETURN_ALIASES = new String[] {};
 
@@ -156,9 +156,9 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	 */
 	public QueryTranslatorImpl(
 			String queryIdentifier,
-	        String queryString,
-	        Map enabledFilters,
-	        SessionFactoryImplementor factory) {
+			String queryString,
+			Map enabledFilters,
+			SessionFactoryImplementor factory) {
 		super( factory );
 		this.queryIdentifier = queryIdentifier;
 		this.queryString = queryString;
@@ -173,9 +173,9 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	 * @param factory The session factory.
 	 */
 	public QueryTranslatorImpl(
-	        String queryString,
-	        Map enabledFilters,
-	        SessionFactoryImplementor factory) {
+			String queryString,
+			Map enabledFilters,
+			SessionFactoryImplementor factory) {
 		this( queryString, queryString, enabledFilters, factory );
 	}
 
@@ -238,13 +238,15 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	private void compile() throws QueryException, MappingException {
 		LOG.trace( "Compiling query" );
 		try {
-			ParserHelper.parse( new PreprocessingParser( tokenReplacements ),
+			ParserHelper.parse(
+					new PreprocessingParser( tokenReplacements ),
 					queryString,
 					ParserHelper.HQL_SEPARATORS,
-					this );
+					this
+			);
 			renderSQL();
 		}
-		catch ( QueryException qe ) {
+		catch (QueryException qe) {
 			if ( qe.getQueryString() == null ) {
 				throw qe.wrapWithQueryString( queryString );
 			}
@@ -252,10 +254,10 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 				throw qe;
 			}
 		}
-		catch ( MappingException me ) {
+		catch (MappingException me) {
 			throw me;
 		}
-		catch ( Exception e ) {
+		catch (Exception e) {
 			LOG.debug( "Unexpected query compilation problem", e );
 			e.printStackTrace();
 			throw new QueryException( "Incorrect query syntax", queryString, e );
@@ -268,12 +270,12 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	@Override
-    public String getSQLString() {
+	public String getSQLString() {
 		return sqlString;
 	}
 
 	public List<String> collectSqlStrings() {
-		return ArrayHelper.toList( new String[] { sqlString } );
+		return ArrayHelper.toList( new String[] {sqlString} );
 	}
 
 	public String getQueryString() {
@@ -286,7 +288,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	 * @return an array of <tt>EntityPersister</tt>s.
 	 */
 	@Override
-    protected Loadable[] getEntityPersisters() {
+	protected Loadable[] getEntityPersisters() {
 		return persisters;
 	}
 
@@ -320,7 +322,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	public String getAliasName(String alias) {
-		String name = ( String ) aliasNames.get( alias );
+		String name = (String) aliasNames.get( alias );
 		if ( name == null ) {
 			if ( superQuery != null ) {
 				name = superQuery.getAliasName( alias );
@@ -335,10 +337,10 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	String unalias(String path) {
 		String alias = StringHelper.root( path );
 		String name = getAliasName( alias );
-        if (name != null) {
-			return name + path.substring(alias.length());
+		if ( name != null ) {
+			return name + path.substring( alias.length() );
 		}
-        return path;
+		return path;
 	}
 
 	void addEntityToFetch(String name, String oneToOneOwnerName, AssociationType ownerAssociationType) {
@@ -368,7 +370,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	private String getType(String name) {
-		String type = ( String ) typeMap.get( name );
+		String type = (String) typeMap.get( name );
 		if ( type == null && superQuery != null ) {
 			type = superQuery.getType( name );
 		}
@@ -376,7 +378,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	private String getRole(String name) {
-		String role = ( String ) collections.get( name );
+		String role = (String) collections.get( name );
 		if ( role == null && superQuery != null ) {
 			role = superQuery.getRole( name );
 		}
@@ -388,7 +390,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 				typeMap.containsKey( name ) ||
 				collections.containsKey( name ) || (
 				superQuery != null && superQuery.isName( name )
-				);
+		);
 	}
 
 	PropertyMapping getPropertyMapping(String name) throws QueryException {
@@ -415,7 +417,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	private PropertyMapping getDecoratedPropertyMapping(String name) {
-		return ( PropertyMapping ) decoratedPropertyMappings.get( name );
+		return (PropertyMapping) decoratedPropertyMappings.get( name );
 	}
 
 	void decoratePropertyMapping(String name, PropertyMapping mapping) {
@@ -437,30 +439,30 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 			return null;
 		}
 		try {
-			return ( Queryable ) getFactory().getEntityPersister( importedClassName );
+			return (Queryable) getFactory().getEntityPersister( importedClassName );
 		}
-		catch ( MappingException me ) {
+		catch (MappingException me) {
 			return null;
 		}
 	}
 
 	Queryable getEntityPersister(String entityName) throws QueryException {
 		try {
-			return ( Queryable ) getFactory().getEntityPersister( entityName );
+			return (Queryable) getFactory().getEntityPersister( entityName );
 		}
-		catch ( Exception e ) {
+		catch (Exception e) {
 			throw new QueryException( "persistent class not found: " + entityName );
 		}
 	}
 
 	QueryableCollection getCollectionPersister(String role) throws QueryException {
 		try {
-			return ( QueryableCollection ) getFactory().getCollectionPersister( role );
+			return (QueryableCollection) getFactory().getCollectionPersister( role );
 		}
-		catch ( ClassCastException cce ) {
+		catch (ClassCastException cce) {
 			throw new QueryException( "collection role is not queryable: " + role );
 		}
-		catch ( Exception e ) {
+		catch (Exception e) {
 			throw new QueryException( "collection role not found: " + role );
 		}
 	}
@@ -558,21 +560,21 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 			namedParameters.put( name, list );
 		}
 		else {
-			( ( ArrayList ) o ).add( loc );
+			( (ArrayList) o ).add( loc );
 		}
 	}
 
 	@Override
-    public int[] getNamedParameterLocs(String name) throws QueryException {
+	public int[] getNamedParameterLocs(String name) throws QueryException {
 		Object o = namedParameters.get( name );
 		if ( o == null ) {
 			throw new QueryException( ERROR_NAMED_PARAMETER_DOES_NOT_APPEAR + name, queryString );
 		}
 		if ( o instanceof Integer ) {
-			return new int[] { (Integer) o };
+			return new int[] {(Integer) o};
 		}
 		else {
-			return ArrayHelper.toIntArray( ( ArrayList ) o );
+			return ArrayHelper.toIntArray( (ArrayList) o );
 		}
 	}
 
@@ -599,7 +601,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 		suffixes = new String[size];
 		includeInSelect = new boolean[size];
 		for ( int i = 0; i < size; i++ ) {
-			String name = ( String ) returnedTypes.get( i );
+			String name = (String) returnedTypes.get( i );
 			//if ( !isName(name) ) throw new QueryException("unknown type: " + name);
 			persisters[i] = getEntityPersisterForName( name );
 			// TODO: cannot use generateSuffixes() - it handles the initial suffix differently.
@@ -612,7 +614,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 			if ( name.equals( collectionOwnerName ) ) {
 				collectionOwnerColumn = i;
 			}
-			String oneToOneOwner = ( String ) oneToOneOwnerNames.get( name );
+			String oneToOneOwner = (String) oneToOneOwnerNames.get( name );
 			owners[i] = ( oneToOneOwner == null ) ? -1 : returnedTypes.indexOf( oneToOneOwner );
 			ownerAssociationTypes[i] = (EntityType) uniqueKeyOwnerReferences.get( name );
 		}
@@ -628,7 +630,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 
 		returnTypes = new Type[scalarSize];
 		for ( int i = 0; i < scalarSize; i++ ) {
-			returnTypes[i] = ( Type ) scalarTypes.get( i );
+			returnTypes[i] = (Type) scalarTypes.get( i );
 		}
 
 		QuerySelect sql = new QuerySelect( getFactory().getDialect() );
@@ -665,12 +667,12 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 		// initialize the Set of queried identifier spaces (ie. tables)
 		Iterator iter = collections.values().iterator();
 		while ( iter.hasNext() ) {
-			CollectionPersister p = getCollectionPersister( ( String ) iter.next() );
+			CollectionPersister p = getCollectionPersister( (String) iter.next() );
 			addQuerySpaces( p.getCollectionSpaces() );
 		}
 		iter = typeMap.keySet().iterator();
 		while ( iter.hasNext() ) {
-			Queryable p = getEntityPersisterForName( ( String ) iter.next() );
+			Queryable p = getEntityPersisterForName( (String) iter.next() );
 			addQuerySpaces( p.getQuerySpaces() );
 		}
 
@@ -701,7 +703,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 		int size = returnedTypes.size();
 
 		for ( int k = 0; k < size; k++ ) {
-			String name = ( String ) returnedTypes.get( k );
+			String name = (String) returnedTypes.get( k );
 			String suffix = size == 1 ? "" : Integer.toString( k ) + '_';
 			sql.addSelectFragmentString( persisters[k].identifierSelectFragment( name, suffix ) );
 		}
@@ -728,7 +730,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 		int size = returnedTypes.size();
 		for ( int k = 0; k < size; k++ ) {
 			String suffix = size == 1 ? "" : Integer.toString( k ) + '_';
-			String name = ( String ) returnedTypes.get( k );
+			String name = (String) returnedTypes.get( k );
 			sql.addSelectFragmentString( persisters[k].propertySelectFragment( name, suffix, false ) );
 		}
 	}
@@ -748,7 +750,10 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 			for ( int k = 0; k < size; k++ ) {
 
 				scalarTypes.add(
-						getFactory().getTypeResolver().getTypeFactory().manyToOne( persisters[k].getEntityName(), shallowQuery )
+						getFactory().getTypeResolver().getTypeFactory().manyToOne(
+								persisters[k].getEntityName(),
+								shallowQuery
+						)
 				);
 
 				String[] idColumnNames = persisters[k].getIdentifierColumnNames();
@@ -774,7 +779,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 			while ( iter.hasNext() ) {
 				Object next = iter.next();
 				if ( next instanceof String ) {
-					String token = ( String ) next;
+					String token = (String) next;
 
 					if ( "(".equals( token ) ) {
 						parenCount++;
@@ -783,7 +788,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 						parenCount--;
 					}
 
-					String lc = token.toLowerCase(Locale.ROOT);
+					String lc = token.toLowerCase( Locale.ROOT );
 					if ( lc.equals( ", " ) ) {
 						if ( nolast ) {
 							nolast = false;
@@ -802,7 +807,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 				}
 				else {
 					nolast = true;
-					String[] tokens = ( String[] ) next;
+					String[] tokens = (String[]) next;
 					for ( int i = 0; i < tokens.length; i++ ) {
 						buf.append( tokens[i] );
 						if ( !isSubselect ) {
@@ -829,14 +834,16 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 
 		Iterator iter = joins.entrySet().iterator();
 		while ( iter.hasNext() ) {
-			Map.Entry me = ( Map.Entry ) iter.next();
-			String name = ( String ) me.getKey();
-			JoinSequence join = ( JoinSequence ) me.getValue();
-			join.setSelector( new JoinSequence.Selector() {
-				public boolean includeSubclasses(String alias) {
-					return returnedTypes.contains( alias ) && !isShallowQuery();
-				}
-			} );
+			Map.Entry me = (Map.Entry) iter.next();
+			String name = (String) me.getKey();
+			JoinSequence join = (JoinSequence) me.getValue();
+			join.setSelector(
+					new JoinSequence.Selector() {
+						public boolean includeSubclasses(String alias) {
+							return returnedTypes.contains( alias ) && !isShallowQuery();
+						}
+					}
+			);
 
 			if ( typeMap.containsKey( name ) ) {
 				ojf.addFragment( join.toJoinFragment( enabledFilters, true ) );
@@ -863,7 +870,9 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 
 	void addQuerySpaces(Serializable[] spaces) {
 		Collections.addAll( querySpaces, spaces );
-		if ( superQuery != null ) superQuery.addQuerySpaces( spaces );
+		if ( superQuery != null ) {
+			superQuery.addQuerySpaces( spaces );
+		}
 	}
 
 	void setDistinct(boolean distinct) {
@@ -874,17 +883,14 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 		return superQuery != null;
 	}
 
-	/**
-	 * Overrides method from Loader
-	 */
 	@Override
-    public CollectionPersister[] getCollectionPersisters() {
-		return collectionPersister == null ? null : new CollectionPersister[] { collectionPersister };
+	public CollectionPersister[] getCollectionPersisters() {
+		return collectionPersister == null ? null : new CollectionPersister[] {collectionPersister};
 	}
 
 	@Override
-    protected String[] getCollectionSuffixes() {
-		return collectionPersister == null ? null : new String[] { "__" };
+	protected String[] getCollectionSuffixes() {
+		return collectionPersister == null ? null : new String[] {"__"};
 	}
 
 	void setCollectionToFetch(String role, String name, String ownerName, String entityName)
@@ -898,12 +904,12 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	@Override
-    protected String[] getSuffixes() {
+	protected String[] getSuffixes() {
 		return suffixes;
 	}
 
 	@Override
-    protected String[] getAliases() {
+	protected String[] getAliases() {
 		return names;
 	}
 
@@ -932,28 +938,30 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 			//many-to-many
 			addCollection( collectionName, collectionRole );
 			try {
-				join.addJoin( ( AssociationType ) persister.getElementType(),
+				join.addJoin(
+						(AssociationType) persister.getElementType(),
 						elementName,
 						JoinType.INNER_JOIN,
-						persister.getElementColumnNames(collectionName) );
+						persister.getElementColumnNames( collectionName )
+				);
 			}
-			catch ( MappingException me ) {
+			catch (MappingException me) {
 				throw new QueryException( me );
 			}
 		}
 		join.addCondition( collectionName, keyColumnNames, " = ?" );
 		//if ( persister.hasWhere() ) join.addCondition( persister.getSQLWhereString(collectionName) );
-		EntityType elemType = ( EntityType ) collectionElementType;
+		EntityType elemType = (EntityType) collectionElementType;
 		addFrom( elementName, elemType.getAssociatedEntityName(), join );
 
 	}
 
 	String getPathAlias(String path) {
-		return ( String ) pathAliases.get( path );
+		return (String) pathAliases.get( path );
 	}
 
 	JoinSequence getPathJoin(String path) {
-		return ( JoinSequence ) pathJoins.get( path );
+		return (JoinSequence) pathJoins.get( path );
 	}
 
 	void addPathAliasAndJoin(String path, String alias, JoinSequence joinSequence) {
@@ -982,11 +990,27 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 
 		try {
 			final List<AfterLoadAction> afterLoadActions = new ArrayList<AfterLoadAction>();
-			final SqlStatementWrapper wrapper = executeQueryStatement( queryParameters, false, afterLoadActions, session );
+			final SqlStatementWrapper wrapper = executeQueryStatement(
+					queryParameters,
+					false,
+					afterLoadActions,
+					session
+			);
 			final ResultSet rs = wrapper.getResultSet();
 			final PreparedStatement st = (PreparedStatement) wrapper.getStatement();
-			HolderInstantiator hi = HolderInstantiator.createClassicHolderInstantiator(holderConstructor, queryParameters.getResultTransformer());
-			Iterator result = new IteratorImpl( rs, st, session, queryParameters.isReadOnly( session ), returnTypes, getColumnNames(), hi );
+			HolderInstantiator hi = HolderInstantiator.createClassicHolderInstantiator(
+					holderConstructor,
+					queryParameters.getResultTransformer()
+			);
+			Iterator result = new IteratorImpl(
+					rs,
+					st,
+					session,
+					queryParameters.isReadOnly( session ),
+					returnTypes,
+					getColumnNames(),
+					hi
+			);
 
 			if ( stats ) {
 				final long endTime = System.nanoTime();
@@ -995,31 +1019,31 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 						"HQL: " + queryString,
 						0,
 						milliseconds
-					);
+				);
 			}
 
 			return result;
 
 		}
-		catch ( SQLException sqle ) {
+		catch (SQLException sqle) {
 			throw getFactory().getSQLExceptionHelper().convert(
 					sqle,
 					"could not execute query using iterate",
 					getSQLString()
-				);
+			);
 		}
 
 	}
 
 	public int executeUpdate(QueryParameters queryParameters, SessionImplementor session) throws HibernateException {
-		throw new UnsupportedOperationException( "Not supported!  Use the AST translator...");
+		throw new UnsupportedOperationException( "Not supported!  Use the AST translator..." );
 	}
 
 	@Override
-    protected boolean[] includeInResultRow() {
+	protected boolean[] includeInResultRow() {
 		boolean[] isResultReturned = includeInSelect;
 		if ( hasScalars ) {
-			isResultReturned = new boolean[ returnedTypes.size() ];
+			isResultReturned = new boolean[returnedTypes.size()];
 			Arrays.fill( isResultReturned, true );
 		}
 		return isResultReturned;
@@ -1027,7 +1051,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 
 
 	@Override
-    protected ResultTransformer resolveResultTransformer(ResultTransformer resultTransformer) {
+	protected ResultTransformer resolveResultTransformer(ResultTransformer resultTransformer) {
 		return HolderInstantiator.resolveClassicResultTransformer(
 				holderConstructor,
 				resultTransformer
@@ -1035,17 +1059,21 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	@Override
-    protected Object getResultColumnOrRow(Object[] row, ResultTransformer transformer, ResultSet rs, SessionImplementor session)
+	protected Object getResultColumnOrRow(
+			Object[] row,
+			ResultTransformer transformer,
+			ResultSet rs,
+			SessionImplementor session)
 			throws SQLException, HibernateException {
 		Object[] resultRow = getResultRow( row, rs, session );
 		return ( holderClass == null && resultRow.length == 1 ?
-				resultRow[ 0 ] :
+				resultRow[0] :
 				resultRow
 		);
 	}
 
 	@Override
-    protected Object[] getResultRow(Object[] row, ResultSet rs, SessionImplementor session)
+	protected Object[] getResultRow(Object[] row, ResultSet rs, SessionImplementor session)
 			throws SQLException, HibernateException {
 		Object[] resultRow;
 		if ( hasScalars ) {
@@ -1063,14 +1091,14 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	@Override
-    protected List getResultList(List results, ResultTransformer resultTransformer) throws QueryException {
+	protected List getResultList(List results, ResultTransformer resultTransformer) throws QueryException {
 		if ( holderClass != null ) {
 			for ( int i = 0; i < results.size(); i++ ) {
-				Object[] row = ( Object[] ) results.get( i );
+				Object[] row = (Object[]) results.get( i );
 				try {
 					results.set( i, holderConstructor.newInstance( row ) );
 				}
-				catch ( Exception e ) {
+				catch (Exception e) {
 					throw new QueryException( "could not instantiate: " + holderClass, e );
 				}
 			}
@@ -1086,7 +1114,9 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 			Object[] result = new Object[selectLength];
 			int j = 0;
 			for ( int i = 0; i < row.length; i++ ) {
-				if ( includeInSelect[i] ) result[j++] = row[i];
+				if ( includeInSelect[i] ) {
+					result[j++] = row[i];
+				}
 			}
 			return result;
 		}
@@ -1097,27 +1127,29 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	@Override
-    protected LockMode[] getLockModes(LockOptions lockOptions) {
+	protected LockMode[] getLockModes(LockOptions lockOptions) {
 
 		// unfortunately this stuff can't be cached because
 		// it is per-invocation, not constant for the
 		// QueryTranslator instance
 		HashMap nameLockOptions = new HashMap();
-		if ( lockOptions == null) {
+		if ( lockOptions == null ) {
 			lockOptions = LockOptions.NONE;
 		}
 
 		if ( lockOptions.getAliasLockCount() > 0 ) {
 			Iterator iter = lockOptions.getAliasLockIterator();
 			while ( iter.hasNext() ) {
-				Map.Entry me = ( Map.Entry ) iter.next();
-				nameLockOptions.put( getAliasName( ( String ) me.getKey() ),
-						me.getValue() );
+				Map.Entry me = (Map.Entry) iter.next();
+				nameLockOptions.put(
+						getAliasName( (String) me.getKey() ),
+						me.getValue()
+				);
 			}
 		}
 		LockMode[] lockModesArray = new LockMode[names.length];
 		for ( int i = 0; i < names.length; i++ ) {
-			LockMode lm = ( LockMode ) nameLockOptions.get( names[i] );
+			LockMode lm = (LockMode) nameLockOptions.get( names[i] );
 			//if ( lm == null ) lm = LockOptions.NONE;
 			if ( lm == null ) {
 				lm = lockOptions.getLockMode();
@@ -1128,7 +1160,7 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	@Override
-    protected String applyLocks(
+	protected String applyLocks(
 			String sql,
 			QueryParameters parameters,
 			Dialect dialect,
@@ -1137,18 +1169,18 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 		final LockOptions lockOptions = parameters.getLockOptions();
 		final String result;
 		if ( lockOptions == null ||
-			( lockOptions.getLockMode() == LockMode.NONE && lockOptions.getAliasLockCount() == 0 ) ) {
+				( lockOptions.getLockMode() == LockMode.NONE && lockOptions.getAliasLockCount() == 0 ) ) {
 			return sql;
 		}
 		else {
 			LockOptions locks = new LockOptions();
-			locks.setLockMode(lockOptions.getLockMode());
-			locks.setTimeOut(lockOptions.getTimeOut());
-			locks.setScope(lockOptions.getScope());
+			locks.setLockMode( lockOptions.getLockMode() );
+			locks.setTimeOut( lockOptions.getTimeOut() );
+			locks.setScope( lockOptions.getScope() );
 			Iterator iter = lockOptions.getAliasLockIterator();
 			while ( iter.hasNext() ) {
-				Map.Entry me = ( Map.Entry ) iter.next();
-				locks.setAliasSpecificLockMode( getAliasName( ( String ) me.getKey() ), (LockMode) me.getValue() );
+				Map.Entry me = (Map.Entry) iter.next();
+				locks.setAliasSpecificLockMode( getAliasName( (String) me.getKey() ), (LockMode) me.getValue() );
 			}
 			Map keyColumnNames = null;
 			if ( dialect.forUpdateOfColumns() ) {
@@ -1164,13 +1196,13 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	@Override
-    protected boolean upgradeLocks() {
+	protected boolean upgradeLocks() {
 		return true;
 	}
 
 	@Override
-    protected int[] getCollectionOwners() {
-		return new int[] { collectionOwnerColumn };
+	protected int[] getCollectionOwners() {
+		return new int[] {collectionOwnerColumn};
 	}
 
 	protected boolean isCompiled() {
@@ -1178,17 +1210,17 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	@Override
-    public String toString() {
+	public String toString() {
 		return queryString;
 	}
 
 	@Override
-    protected int[] getOwners() {
+	protected int[] getOwners() {
 		return owners;
 	}
 
 	@Override
-    protected EntityType[] getOwnerAssociationTypes() {
+	protected EntityType[] getOwnerAssociationTypes() {
 		return ownerAssociationTypes;
 	}
 
@@ -1211,12 +1243,12 @@ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator
 	}
 
 	@Override
-    public String getQueryIdentifier() {
+	public String getQueryIdentifier() {
 		return queryIdentifier;
 	}
 
 	@Override
-    protected boolean isSubselectLoadingEnabled() {
+	protected boolean isSubselectLoadingEnabled() {
 		return hasSubselectLoadableCollections();
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/SelectParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/SelectParser.java
index bc8ad8a880..e1194de29c 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/SelectParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/SelectParser.java
@@ -156,7 +156,9 @@ public class SelectParser implements Parser {
 		}
 		else if ( getFunction( lctoken, q ) != null && token.equals( q.unalias( token ) ) ) {
 			// the name of an SQL function
-			if ( !ready ) throw new QueryException( ", expected before aggregate function in SELECT: " + token );
+			if ( !ready ) {
+				throw new QueryException( ", expected before aggregate function in SELECT: " + token );
+			}
 			aggregate = true;
 			aggregateAddSelectScalar = true;
 			aggregateFuncTokenList.add( lctoken );
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/WhereParser.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/WhereParser.java
index 3c7d56ae49..ff21adbaf2 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/WhereParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/classic/WhereParser.java
@@ -244,7 +244,7 @@ public class WhereParser implements Parser {
 
 			if ( bracketsSinceSelect == -1 ) {
 				QueryTranslatorImpl subq = new QueryTranslatorImpl(
-				        subselect.toString(),
+						subselect.toString(),
 						q.getEnabledFilters(),
 						q.getFactory()
 				);
@@ -445,7 +445,9 @@ public class WhereParser implements Parser {
 					catch ( MappingException me ) {
 						throw new QueryException( me );
 					}
-					if ( type == null ) throw new QueryException( QueryTranslator.ERROR_CANNOT_DETERMINE_TYPE + token );
+					if ( type == null ) {
+						throw new QueryException( QueryTranslator.ERROR_CANNOT_DETERMINE_TYPE + token );
+					}
 					try {
 						//noinspection unchecked
 						appendToken( q, ( ( LiteralType ) type ).objectToSQLString( constant, q.getFactory().getDialect() ) );
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/spi/QueryTranslator.java b/hibernate-core/src/main/java/org/hibernate/hql/spi/QueryTranslator.java
index 7de8ef02cb..5109187206 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/spi/QueryTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/spi/QueryTranslator.java
@@ -44,12 +44,10 @@ import org.hibernate.type.Type;
  * @author josh
  */
 public interface QueryTranslator {
-
-	// Error message constants.
-	public static final String ERROR_CANNOT_FETCH_WITH_ITERATE = "fetch may not be used with scroll() or iterate()";
-	public static final String ERROR_NAMED_PARAMETER_DOES_NOT_APPEAR = "Named parameter does not appear in Query: ";
-    public static final String ERROR_CANNOT_DETERMINE_TYPE = "Could not determine type of: ";
-	public static final String ERROR_CANNOT_FORMAT_LITERAL =  "Could not format constant value to SQL literal: ";
+	String ERROR_CANNOT_FETCH_WITH_ITERATE = "fetch may not be used with scroll() or iterate()";
+	String ERROR_NAMED_PARAMETER_DOES_NOT_APPEAR = "Named parameter does not appear in Query: ";
+	String ERROR_CANNOT_DETERMINE_TYPE = "Could not determine type of: ";
+	String ERROR_CANNOT_FORMAT_LITERAL =  "Could not format constant value to SQL literal: ";
 
 	/**
 	 * Compile a "normal" query. This method may be called multiple
@@ -188,5 +186,5 @@ public interface QueryTranslator {
 
 	boolean isManipulationStatement();
 
-	public Class getDynamicInstantiationResultType();
+	Class getDynamicInstantiationResultType();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/spi/id/AbstractMultiTableBulkIdStrategyImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/spi/id/AbstractMultiTableBulkIdStrategyImpl.java
index ad06120d7c..de92a1589b 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/spi/id/AbstractMultiTableBulkIdStrategyImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/spi/id/AbstractMultiTableBulkIdStrategyImpl.java
@@ -23,10 +23,8 @@
  */
 package org.hibernate.hql.spi.id;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import org.hibernate.QueryException;
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/spi/id/IdTableSupport.java b/hibernate-core/src/main/java/org/hibernate/hql/spi/id/IdTableSupport.java
index 4ebd8bc3b8..130715db41 100644
--- a/hibernate-core/src/main/java/org/hibernate/hql/spi/id/IdTableSupport.java
+++ b/hibernate-core/src/main/java/org/hibernate/hql/spi/id/IdTableSupport.java
@@ -23,14 +23,12 @@
  */
 package org.hibernate.hql.spi.id;
 
-import org.hibernate.hql.spi.id.local.AfterUseAction;
-
 /**
  * @author Steve Ebersole
  */
 public interface IdTableSupport {
-	public String generateIdTableName(String baseName);
-	public String getCreateIdTableCommand();
-	public String getCreateIdTableStatementOptions();
-	public String getDropIdTableCommand();
+	String generateIdTableName(String baseName);
+	String getCreateIdTableCommand();
+	String getCreateIdTableStatementOptions();
+	String getDropIdTableCommand();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java
index a072bd3ea8..02950141ff 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java
@@ -39,14 +39,14 @@ import org.hibernate.internal.CoreMessageLogger;
  * @author Joseph Fifield
  */
 public class GUIDGenerator implements IdentifierGenerator {
-    private static final CoreMessageLogger LOG = CoreLogging.messageLogger( GUIDGenerator.class );
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( GUIDGenerator.class );
 
 	private static boolean WARNED;
 
 	public GUIDGenerator() {
 		if ( !WARNED ) {
 			WARNED = true;
-            LOG.deprecatedUuidGenerator( UUIDGenerator.class.getName(), UUIDGenerationStrategy.class.getName() );
+			LOG.deprecatedUuidGenerator( UUIDGenerator.class.getName(), UUIDGenerationStrategy.class.getName() );
 		}
 	}
 
@@ -61,12 +61,12 @@ public class GUIDGenerator implements IdentifierGenerator {
 					if ( !rs.next() ) {
 						throw new HibernateException( "The database returned no GUID identity value" );
 					}
-					result = rs.getString(1);
+					result = rs.getString( 1 );
 				}
 				finally {
 					session.getJdbcCoordinator().getResourceRegistry().release( rs, st );
 				}
-                LOG.guidGenerated(result);
+				LOG.guidGenerated( result );
 				return result;
 			}
 			finally {
@@ -79,7 +79,7 @@ public class GUIDGenerator implements IdentifierGenerator {
 					sqle,
 					"could not retrieve GUID",
 					sql
-				);
+			);
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java
index 10e442e306..d42f998c4b 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java
@@ -32,12 +32,11 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.hibernate.HibernateException;
+import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.type.CustomType;
 import org.hibernate.type.Type;
 
-import org.jboss.logging.Logger;
-
 /**
  * Factory and helper methods for {@link IdentifierGenerator} framework.
  *
@@ -45,9 +44,7 @@ import org.jboss.logging.Logger;
  * @author Steve Ebersole
  */
 public final class IdentifierGeneratorHelper {
-
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class,
-                                                                       IdentifierGeneratorHelper.class.getName());
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IdentifierGeneratorHelper.class );
 
 	/**
 	 * Marker object returned from {@link IdentifierGenerator#generate} to indicate that we should short-circuit any
@@ -86,7 +83,8 @@ public final class IdentifierGeneratorHelper {
 	 * @throws SQLException Can be thrown while accessing the result set
 	 * @throws HibernateException Indicates a problem reading back a generated identity value.
 	 */
-	public static Serializable getGeneratedIdentity(ResultSet rs, String identifier, Type type) throws SQLException, HibernateException {
+	public static Serializable getGeneratedIdentity(ResultSet rs, String identifier, Type type)
+			throws SQLException, HibernateException {
 		if ( !rs.next() ) {
 			throw new HibernateException( "The database returned no natively generated identity value" );
 		}
@@ -108,9 +106,10 @@ public final class IdentifierGeneratorHelper {
 	 * @throws SQLException Indicates problems access the result set
 	 * @throws IdentifierGenerationException Indicates an unknown type.
 	 */
-	public static Serializable get(ResultSet rs, String identifier, Type type) throws SQLException, IdentifierGenerationException {
+	public static Serializable get(ResultSet rs, String identifier, Type type)
+			throws SQLException, IdentifierGenerationException {
 		if ( ResultSetIdentifierConsumer.class.isInstance( type ) ) {
-			return ( ( ResultSetIdentifierConsumer ) type ).consumeIdentifier( rs );
+			return ( (ResultSetIdentifierConsumer) type ).consumeIdentifier( rs );
 		}
 		if ( CustomType.class.isInstance( type ) ) {
 			final CustomType customType = (CustomType) type;
@@ -122,12 +121,12 @@ public final class IdentifierGeneratorHelper {
 		try {
 			columnCount = rs.getMetaData().getColumnCount();
 		}
-		catch(Exception e){
+		catch (Exception e) {
 			//Oracle driver will throw NPE
 		}
 
 		Class clazz = type.getReturnedClass();
-		if (columnCount == 1) {
+		if ( columnCount == 1 ) {
 			if ( clazz == Long.class ) {
 				return rs.getLong( 1 );
 			}
@@ -154,22 +153,22 @@ public final class IdentifierGeneratorHelper {
 		}
 		else {
 			if ( clazz == Long.class ) {
-				return rs.getLong(identifier);
+				return rs.getLong( identifier );
 			}
 			else if ( clazz == Integer.class ) {
-				return rs.getInt(identifier);
+				return rs.getInt( identifier );
 			}
 			else if ( clazz == Short.class ) {
-				return rs.getShort(identifier);
+				return rs.getShort( identifier );
 			}
 			else if ( clazz == String.class ) {
-				return rs.getString(identifier);
+				return rs.getString( identifier );
 			}
 			else if ( clazz == BigInteger.class ) {
-				return rs.getBigDecimal(identifier).setScale( 0, BigDecimal.ROUND_UNNECESSARY ).toBigInteger();
+				return rs.getBigDecimal( identifier ).setScale( 0, BigDecimal.ROUND_UNNECESSARY ).toBigInteger();
 			}
 			else if ( clazz == BigDecimal.class ) {
-				return rs.getBigDecimal(identifier).setScale( 0, BigDecimal.ROUND_UNNECESSARY );
+				return rs.getBigDecimal( identifier ).setScale( 0, BigDecimal.ROUND_UNNECESSARY );
 			}
 			else {
 				throw new IdentifierGenerationException(
@@ -188,19 +187,18 @@ public final class IdentifierGeneratorHelper {
 	 * @return The wrapped type.
 	 *
 	 * @throws IdentifierGenerationException Indicates an unhandled 'clazz'.
-	 *
 	 * @deprecated Use the {@link #getIntegralDataTypeHolder holders} instead.
 	 */
 	@Deprecated
-    public static Number createNumber(long value, Class clazz) throws IdentifierGenerationException {
+	public static Number createNumber(long value, Class clazz) throws IdentifierGenerationException {
 		if ( clazz == Long.class ) {
 			return value;
 		}
 		else if ( clazz == Integer.class ) {
-			return ( int ) value;
+			return (int) value;
 		}
 		else if ( clazz == Short.class ) {
-			return ( short ) value;
+			return (short) value;
 		}
 		else {
 			throw new IdentifierGenerationException( "unrecognized id type : " + clazz.getName() );
@@ -389,10 +387,10 @@ public final class IdentifierGeneratorHelper {
 				return value;
 			}
 			else if ( exactType == Integer.class ) {
-				return ( int ) value;
+				return (int) value;
 			}
 			else {
-				return ( short ) value;
+				return (short) value;
 			}
 		}
 
@@ -409,12 +407,12 @@ public final class IdentifierGeneratorHelper {
 		}
 
 		@Override
-        public String toString() {
+		public String toString() {
 			return "BasicHolder[" + exactType.getName() + "[" + value + "]]";
 		}
 
 		@Override
-        public boolean equals(Object o) {
+		public boolean equals(Object o) {
 			if ( this == o ) {
 				return true;
 			}
@@ -428,7 +426,7 @@ public final class IdentifierGeneratorHelper {
 		}
 
 		@Override
-        public int hashCode() {
+		public int hashCode() {
 			return (int) ( value ^ ( value >>> 32 ) );
 		}
 	}
@@ -550,12 +548,12 @@ public final class IdentifierGeneratorHelper {
 		}
 
 		@Override
-        public String toString() {
+		public String toString() {
 			return "BigIntegerHolder[" + value + "]";
 		}
 
 		@Override
-        public boolean equals(Object o) {
+		public boolean equals(Object o) {
 			if ( this == o ) {
 				return true;
 			}
@@ -571,7 +569,7 @@ public final class IdentifierGeneratorHelper {
 		}
 
 		@Override
-        public int hashCode() {
+		public int hashCode() {
 			return value != null ? value.hashCode() : 0;
 		}
 	}
@@ -693,12 +691,12 @@ public final class IdentifierGeneratorHelper {
 		}
 
 		@Override
-        public String toString() {
+		public String toString() {
 			return "BigDecimalHolder[" + value + "]";
 		}
 
 		@Override
-        public boolean equals(Object o) {
+		public boolean equals(Object o) {
 			if ( this == o ) {
 				return true;
 			}
@@ -714,7 +712,7 @@ public final class IdentifierGeneratorHelper {
 		}
 
 		@Override
-        public int hashCode() {
+		public int hashCode() {
 			return value != null ? value.hashCode() : 0;
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java
index b47085a50d..0f263e7e32 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java
@@ -23,6 +23,7 @@
  *
  */
 package org.hibernate.id;
+
 import java.io.Serializable;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -49,10 +50,11 @@ import org.hibernate.id.insert.InsertSelectIdentityInsert;
  */
 public class IdentityGenerator extends AbstractPostInsertGenerator {
 
+	@Override
 	public InsertGeneratedIdentifierDelegate getInsertGeneratedIdentifierDelegate(
 			PostInsertIdentityPersister persister,
-	        Dialect dialect,
-	        boolean isGetGeneratedKeysEnabled) throws HibernateException {
+			Dialect dialect,
+			boolean isGetGeneratedKeysEnabled) throws HibernateException {
 		if ( isGetGeneratedKeysEnabled ) {
 			return new GetGeneratedKeysDelegate( persister, dialect );
 		}
@@ -79,12 +81,14 @@ public class IdentityGenerator extends AbstractPostInsertGenerator {
 			this.dialect = dialect;
 		}
 
+		@Override
 		public IdentifierGeneratingInsert prepareIdentifierGeneratingInsert() {
 			IdentifierGeneratingInsert insert = new IdentifierGeneratingInsert( dialect );
 			insert.addIdentityColumn( persister.getRootTableKeyColumnNames()[0] );
 			return insert;
 		}
 
+		@Override
 		protected PreparedStatement prepare(String insertSQL, SessionImplementor session) throws SQLException {
 			return session
 					.getJdbcCoordinator()
@@ -92,7 +96,9 @@ public class IdentityGenerator extends AbstractPostInsertGenerator {
 					.prepareStatement( insertSQL, PreparedStatement.RETURN_GENERATED_KEYS );
 		}
 
-		public Serializable executeAndExtract(PreparedStatement insert, SessionImplementor session) throws SQLException {
+		@Override
+		public Serializable executeAndExtract(PreparedStatement insert, SessionImplementor session)
+				throws SQLException {
 			session.getJdbcCoordinator().getResultSetReturn().executeUpdate( insert );
 			ResultSet rs = null;
 			try {
@@ -127,12 +133,14 @@ public class IdentityGenerator extends AbstractPostInsertGenerator {
 			this.dialect = dialect;
 		}
 
+		@Override
 		public IdentifierGeneratingInsert prepareIdentifierGeneratingInsert() {
 			InsertSelectIdentityInsert insert = new InsertSelectIdentityInsert( dialect );
 			insert.addIdentityColumn( persister.getRootTableKeyColumnNames()[0] );
 			return insert;
 		}
 
+		@Override
 		protected PreparedStatement prepare(String insertSQL, SessionImplementor session) throws SQLException {
 			return session
 					.getJdbcCoordinator()
@@ -140,7 +148,9 @@ public class IdentityGenerator extends AbstractPostInsertGenerator {
 					.prepareStatement( insertSQL, PreparedStatement.NO_GENERATED_KEYS );
 		}
 
-		public Serializable executeAndExtract(PreparedStatement insert, SessionImplementor session) throws SQLException {
+		@Override
+		public Serializable executeAndExtract(PreparedStatement insert, SessionImplementor session)
+				throws SQLException {
 			ResultSet rs = session.getJdbcCoordinator().getResultSetReturn().execute( insert );
 			try {
 				return IdentifierGeneratorHelper.getGeneratedIdentity(
@@ -175,21 +185,28 @@ public class IdentityGenerator extends AbstractPostInsertGenerator {
 			this.dialect = dialect;
 		}
 
+		@Override
 		public IdentifierGeneratingInsert prepareIdentifierGeneratingInsert() {
 			IdentifierGeneratingInsert insert = new IdentifierGeneratingInsert( dialect );
 			insert.addIdentityColumn( persister.getRootTableKeyColumnNames()[0] );
 			return insert;
 		}
 
+		@Override
 		protected String getSelectSQL() {
 			return persister.getIdentitySelectString();
 		}
 
+		@Override
 		protected Serializable getResult(
 				SessionImplementor session,
-		        ResultSet rs,
-		        Object object) throws SQLException {
-			return IdentifierGeneratorHelper.getGeneratedIdentity( rs, persister.getRootTableKeyColumnNames()[0], persister.getIdentifierType() );
+				ResultSet rs,
+				Object object) throws SQLException {
+			return IdentifierGeneratorHelper.getGeneratedIdentity(
+					rs,
+					persister.getRootTableKeyColumnNames()[0],
+					persister.getIdentifierType()
+			);
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java
index f1683e2200..bc0397ad5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java
@@ -55,13 +55,14 @@ import org.hibernate.type.Type;
  * @author Brett Meyer
  */
 public class IncrementGenerator implements IdentifierGenerator, Configurable {
-    private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IncrementGenerator.class );
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IncrementGenerator.class );
 
 	private Class returnClass;
 	private String sql;
 
 	private IntegralDataTypeHolder previousValueHolder;
 
+	@Override
 	public synchronized Serializable generate(SessionImplementor session, Object object) throws HibernateException {
 		if ( sql != null ) {
 			initializePreviousValueHolder( session );
@@ -74,7 +75,7 @@ public class IncrementGenerator implements IdentifierGenerator, Configurable {
 		returnClass = type.getReturnedClass();
 
 		ObjectNameNormalizer normalizer =
-				( ObjectNameNormalizer ) params.get( PersistentIdentifierGenerator.IDENTIFIER_NORMALIZER );
+				(ObjectNameNormalizer) params.get( PersistentIdentifierGenerator.IDENTIFIER_NORMALIZER );
 
 		String column = params.getProperty( "column" );
 		if ( column == null ) {
@@ -96,13 +97,13 @@ public class IncrementGenerator implements IdentifierGenerator, Configurable {
 		);
 
 		StringBuilder buf = new StringBuilder();
-		for ( int i=0; i < tables.length; i++ ) {
+		for ( int i = 0; i < tables.length; i++ ) {
 			final String tableName = normalizer.toDatabaseIdentifierText( tables[i] );
 			if ( tables.length > 1 ) {
 				buf.append( "select max(" ).append( column ).append( ") as mx from " );
 			}
 			buf.append( Table.qualify( catalog, schema, tableName ) );
-			if ( i < tables.length-1 ) {
+			if ( i < tables.length - 1 ) {
 				buf.append( " union " );
 			}
 		}
@@ -126,11 +127,11 @@ public class IncrementGenerator implements IdentifierGenerator, Configurable {
 			try {
 				ResultSet rs = session.getJdbcCoordinator().getResultSetReturn().extract( st );
 				try {
-                    if (rs.next()) {
-						previousValueHolder.initialize(rs, 0L).increment();
+					if ( rs.next() ) {
+						previousValueHolder.initialize( rs, 0L ).increment();
 					}
-                    else {
-						previousValueHolder.initialize(1L);
+					else {
+						previousValueHolder.initialize( 1L );
 					}
 					sql = null;
 					if ( debugEnabled ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java
index 46922444f4..c661b51a20 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java
@@ -48,6 +48,7 @@ import org.hibernate.engine.spi.SessionEventListenerManager;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.id.enhanced.AccessCallback;
 import org.hibernate.id.enhanced.LegacyHiLoAlgorithmOptimizer;
+import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.jdbc.AbstractReturningWork;
@@ -59,10 +60,7 @@ import org.hibernate.type.LongType;
 import org.hibernate.type.StringType;
 import org.hibernate.type.Type;
 
-import org.jboss.logging.Logger;
-
 /**
- *
  * A hilo <tt>IdentifierGenerator</tt> that returns a <tt>Long</tt>, constructed using
  * a hi/lo algorithm. The hi value MUST be fetched in a seperate transaction
  * to the <tt>Session</tt> transaction so the generator must be able to obtain
@@ -71,14 +69,14 @@ import org.jboss.logging.Logger;
  * case a <tt>SequenceHiLoGenerator</tt> would be a better choice (where
  * supported).<br>
  * <br>
- *
+ * <p/>
  * A hilo <tt>IdentifierGenerator</tt> that uses a database
  * table to store the last generated values. A table can contains
  * several hi values. They are distinct from each other through a key
  * <p/>
  * <p>This implementation is not compliant with a user connection</p>
  * <p/>
- *
+ * <p/>
  * <p>Allowed parameters (all of them are optional):</p>
  * <ul>
  * <li>table: table name (default <tt>hibernate_sequences</tt>)</li>
@@ -93,9 +91,7 @@ import org.jboss.logging.Logger;
  * @author <a href="mailto:kr@hbt.de">Klaus Richarz</a>.
  */
 public class MultipleHiLoPerTableGenerator implements PersistentIdentifierGenerator, Configurable {
-
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class,
-                                                                       MultipleHiLoPerTableGenerator.class.getName());
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( MultipleHiLoPerTableGenerator.class );
 
 	public static final String ID_TABLE = "table";
 	public static final String PK_COLUMN_NAME = "primary_key_column";
@@ -138,13 +134,23 @@ public class MultipleHiLoPerTableGenerator implements PersistentIdentifierGenera
 
 				int rows;
 				do {
-					final PreparedStatement queryPreparedStatement = prepareStatement( connection, query, statementLogger, statsCollector );
+					final PreparedStatement queryPreparedStatement = prepareStatement(
+							connection,
+							query,
+							statementLogger,
+							statsCollector
+					);
 					try {
 						final ResultSet rs = executeQuery( queryPreparedStatement, statsCollector );
 						boolean isInitialized = rs.next();
 						if ( !isInitialized ) {
 							value.initialize( 0 );
-							final PreparedStatement insertPreparedStatement = prepareStatement( connection, insert, statementLogger, statsCollector );
+							final PreparedStatement insertPreparedStatement = prepareStatement(
+									connection,
+									insert,
+									statementLogger,
+									statsCollector
+							);
 							try {
 								value.bind( insertPreparedStatement, 1 );
 								executeUpdate( insertPreparedStatement, statsCollector );
@@ -167,7 +173,12 @@ public class MultipleHiLoPerTableGenerator implements PersistentIdentifierGenera
 					}
 
 
-					final PreparedStatement updatePreparedStatement = prepareStatement( connection, update, statementLogger, statsCollector );
+					final PreparedStatement updatePreparedStatement = prepareStatement(
+							connection,
+							update,
+							statementLogger,
+							statsCollector
+					);
 					try {
 						value.copy().increment().bind( updatePreparedStatement, 1 );
 						value.bind( updatePreparedStatement, 2 );
@@ -181,7 +192,7 @@ public class MultipleHiLoPerTableGenerator implements PersistentIdentifierGenera
 					finally {
 						updatePreparedStatement.close();
 					}
-				} while ( rows==0 );
+				} while ( rows == 0 );
 
 				return value;
 			}
@@ -240,7 +251,8 @@ public class MultipleHiLoPerTableGenerator implements PersistentIdentifierGenera
 
 	}
 
-	private ResultSet executeQuery(PreparedStatement ps, SessionEventListenerManager statsCollector) throws SQLException {
+	private ResultSet executeQuery(PreparedStatement ps, SessionEventListenerManager statsCollector)
+			throws SQLException {
 		try {
 			statsCollector.jdbcExecuteStatementStart();
 			return ps.executeQuery();
@@ -252,7 +264,7 @@ public class MultipleHiLoPerTableGenerator implements PersistentIdentifierGenera
 
 	@SuppressWarnings({"StatementWithEmptyBody", "deprecation"})
 	public void configure(Type type, Properties params, JdbcEnvironment jdbcEnv) throws MappingException {
-		ObjectNameNormalizer normalizer = ( ObjectNameNormalizer ) params.get( IDENTIFIER_NORMALIZER );
+		ObjectNameNormalizer normalizer = (ObjectNameNormalizer) params.get( IDENTIFIER_NORMALIZER );
 
 		qualifiedTableName = QualifiedNameParser.INSTANCE.parse(
 				ConfigurationHelper.getString( ID_TABLE, params, DEFAULT_TABLE ),
@@ -275,31 +287,31 @@ public class MultipleHiLoPerTableGenerator implements PersistentIdentifierGenera
 		String keyValue = ConfigurationHelper.getString( PK_VALUE_NAME, params, params.getProperty( TABLE ) );
 
 		query = "select " +
-			valueColumnName +
-			" from " +
-			jdbcEnv.getDialect().appendLockHint( LockMode.PESSIMISTIC_WRITE, tableName ) +
-			" where " + pkColumnName + " = '" + keyValue + "'" +
+				valueColumnName +
+				" from " +
+				jdbcEnv.getDialect().appendLockHint( LockMode.PESSIMISTIC_WRITE, tableName ) +
+				" where " + pkColumnName + " = '" + keyValue + "'" +
 				jdbcEnv.getDialect().getForUpdateString();
 
 		update = "update " +
-			tableName +
-			" set " +
-			valueColumnName +
-			" = ? where " +
-			valueColumnName +
-			" = ? and " +
-			pkColumnName +
-			" = '" +
-			keyValue
-			+ "'";
+				tableName +
+				" set " +
+				valueColumnName +
+				" = ? where " +
+				valueColumnName +
+				" = ? and " +
+				pkColumnName +
+				" = '" +
+				keyValue
+				+ "'";
 
 		insert = "insert into " + tableName +
-			"(" + pkColumnName + ", " +	valueColumnName + ") " +
-			"values('"+ keyValue +"', ?)";
+				"(" + pkColumnName + ", " + valueColumnName + ") " +
+				"values('" + keyValue + "', ?)";
 
 
 		//hilo config
-		maxLo = ConfigurationHelper.getInt(MAX_LO, params, Short.MAX_VALUE);
+		maxLo = ConfigurationHelper.getInt( MAX_LO, params, Short.MAX_VALUE );
 		returnClass = type.getReturnedClass();
 
 		if ( maxLo >= 1 ) {
@@ -347,7 +359,7 @@ public class MultipleHiLoPerTableGenerator implements PersistentIdentifierGenera
 	}
 
 	public String[] sqlDropStrings(Dialect dialect) throws HibernateException {
-		return new String[] { dialect.getDropTableString( tableName ) };
+		return new String[] {dialect.getDropTableString( tableName )};
 	}
 
 	public Object generatorKey() {
diff --git a/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java
index 6b619ec069..a4a544a393 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java
@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.id;
+
 import org.hibernate.HibernateException;
 import org.hibernate.boot.model.relational.ExportableProducer;
 import org.hibernate.dialect.Dialect;
@@ -32,76 +33,78 @@ import org.hibernate.dialect.Dialect;
  * All <tt>PersistentIdentifierGenerator</tt>s that also implement
  * <tt>Configurable</tt> have access to a special mapping parameter: schema
  *
- * @see IdentifierGenerator
- * @see Configurable
- *
  * @author Gavin King
  * @author Steve Ebersole
+ *
+ * @see IdentifierGenerator
+ * @see Configurable
  */
 public interface PersistentIdentifierGenerator extends IdentifierGenerator, ExportableProducer {
 
 	/**
 	 * The configuration parameter holding the schema name
 	 */
-	public static final String SCHEMA = "schema";
+	String SCHEMA = "schema";
 
 	/**
 	 * The configuration parameter holding the table name for the
 	 * generated id
 	 */
-	public static final String TABLE = "target_table";
+	String TABLE = "target_table";
 
 	/**
 	 * The configuration parameter holding the table names for all
 	 * tables for which the id must be unique
 	 */
-	public static final String TABLES = "identity_tables";
+	String TABLES = "identity_tables";
 
 	/**
 	 * The configuration parameter holding the primary key column
 	 * name of the generated id
 	 */
-	public static final String PK = "target_column";
+	String PK = "target_column";
 
-    /**
-     * The configuration parameter holding the catalog name
-     */
-    public static final String CATALOG = "catalog";
+	/**
+	 * The configuration parameter holding the catalog name
+	 */
+	String CATALOG = "catalog";
 
 	/**
 	 * The key under whcih to find the {@link org.hibernate.boot.model.naming.ObjectNameNormalizer} in the config param map.
 	 */
-	public static final String IDENTIFIER_NORMALIZER = "identifier_normalizer";
+	String IDENTIFIER_NORMALIZER = "identifier_normalizer";
 
 	/**
 	 * The SQL required to create the underlying database objects.
 	 *
 	 * @param dialect The dialect against which to generate the create command(s)
-	 * @return The create command(s)
-	 * @throws HibernateException problem creating the create command(s)
 	 *
+	 * @return The create command(s)
+	 *
+	 * @throws HibernateException problem creating the create command(s)
 	 * @deprecated Utilize the ExportableProducer contract instead
 	 */
 	@Deprecated
-	public String[] sqlCreateStrings(Dialect dialect) throws HibernateException;
+	String[] sqlCreateStrings(Dialect dialect) throws HibernateException;
 
 	/**
 	 * The SQL required to remove the underlying database objects.
 	 *
 	 * @param dialect The dialect against which to generate the drop command(s)
-	 * @return The drop command(s)
-	 * @throws HibernateException problem creating the drop command(s)
 	 *
+	 * @return The drop command(s)
+	 *
+	 * @throws HibernateException problem creating the drop command(s)
 	 * @deprecated Utilize the ExportableProducer contract instead
 	 */
 	@Deprecated
-	public String[] sqlDropStrings(Dialect dialect) throws HibernateException;
+	String[] sqlDropStrings(Dialect dialect) throws HibernateException;
 
 	/**
 	 * Return a key unique to the underlying database objects. Prevents us from
 	 * trying to create/remove them multiple times.
-	 * 
+	 *
 	 * @return Object an identifying key for this generator
 	 */
-	public Object generatorKey();
+	Object generatorKey();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java
index e763ef0572..189ae67705 100755
--- a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java
@@ -31,8 +31,8 @@ import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate;
  * @author Gavin King
  */
 public interface PostInsertIdentifierGenerator extends IdentifierGenerator {
-	public InsertGeneratedIdentifierDelegate getInsertGeneratedIdentifierDelegate(
+	InsertGeneratedIdentifierDelegate getInsertGeneratedIdentifierDelegate(
 			PostInsertIdentityPersister persister,
-	        Dialect dialect,
-	        boolean isGetGeneratedKeysEnabled) throws HibernateException;
+			Dialect dialect,
+			boolean isGetGeneratedKeysEnabled) throws HibernateException;
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java
index d9948f896a..20c64826e7 100755
--- a/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java
@@ -59,8 +59,8 @@ public class SelectGenerator extends AbstractPostInsertGenerator implements Conf
 
 	public InsertGeneratedIdentifierDelegate getInsertGeneratedIdentifierDelegate(
 			PostInsertIdentityPersister persister,
-	        Dialect dialect,
-	        boolean isGetGeneratedKeysEnabled) throws HibernateException {
+			Dialect dialect,
+			boolean isGetGeneratedKeysEnabled) throws HibernateException {
 		return new SelectGeneratorDelegate( persister, dialect, uniqueKeyPropertyName );
 	}
 
@@ -69,25 +69,25 @@ public class SelectGenerator extends AbstractPostInsertGenerator implements Conf
 			return supplied;
 		}
 		int[] naturalIdPropertyIndices = persister.getNaturalIdentifierProperties();
-		if ( naturalIdPropertyIndices == null ){
+		if ( naturalIdPropertyIndices == null ) {
 			throw new IdentifierGenerationException(
 					"no natural-id property defined; need to specify [key] in " +
-					"generator parameters"
+							"generator parameters"
 			);
 		}
 		if ( naturalIdPropertyIndices.length > 1 ) {
 			throw new IdentifierGenerationException(
 					"select generator does not currently support composite " +
-					"natural-id properties; need to specify [key] in generator parameters"
+							"natural-id properties; need to specify [key] in generator parameters"
 			);
 		}
 		if ( persister.getEntityMetamodel().isNaturalIdentifierInsertGenerated() ) {
 			throw new IdentifierGenerationException(
 					"natural-id also defined as insert-generated; need to specify [key] " +
-					"in generator parameters"
+							"in generator parameters"
 			);
 		}
-		return persister.getPropertyNames() [ naturalIdPropertyIndices[0] ];
+		return persister.getPropertyNames()[naturalIdPropertyIndices[0]];
 	}
 
 
@@ -108,8 +108,8 @@ public class SelectGenerator extends AbstractPostInsertGenerator implements Conf
 
 		private SelectGeneratorDelegate(
 				PostInsertIdentityPersister persister,
-		        Dialect dialect,
-		        String suppliedUniqueKeyPropertyName) {
+				Dialect dialect,
+				String suppliedUniqueKeyPropertyName) {
 			super( persister );
 			this.persister = persister;
 			this.dialect = dialect;
@@ -133,23 +133,23 @@ public class SelectGenerator extends AbstractPostInsertGenerator implements Conf
 
 		protected void bindParameters(
 				SessionImplementor session,
-		        PreparedStatement ps,
-		        Object entity) throws SQLException {
+				PreparedStatement ps,
+				Object entity) throws SQLException {
 			Object uniqueKeyValue = persister.getPropertyValue( entity, uniqueKeyPropertyName );
 			uniqueKeyType.nullSafeSet( ps, uniqueKeyValue, 1, session );
 		}
 
 		protected Serializable getResult(
 				SessionImplementor session,
-		        ResultSet rs,
-		        Object entity) throws SQLException {
+				ResultSet rs,
+				Object entity) throws SQLException {
 			if ( !rs.next() ) {
 				throw new IdentifierGenerationException(
 						"the inserted row could not be located by the unique key: " +
-						uniqueKeyPropertyName
+								uniqueKeyPropertyName
 				);
 			}
-			return ( Serializable ) idType.nullSafeGet(
+			return (Serializable) idType.nullSafeGet(
 					rs,
 					persister.getRootTableKeyColumnNames(),
 					session,
diff --git a/hibernate-core/src/main/java/org/hibernate/id/SequenceGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SequenceGenerator.java
index 77637311d3..1ef6fab784 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/SequenceGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/SequenceGenerator.java
@@ -63,7 +63,7 @@ import org.jboss.logging.Logger;
 public class SequenceGenerator
 		implements PersistentIdentifierGenerator, BulkInsertionCapableIdentifierGenerator, Configurable {
 
-    private static final Logger LOG = Logger.getLogger( SequenceGenerator.class.getName() );
+	private static final Logger LOG = Logger.getLogger( SequenceGenerator.class.getName() );
 
 	/**
 	 * The sequence parameter
diff --git a/hibernate-core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java
index f6a2508b6d..12b987873c 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java
@@ -54,7 +54,6 @@ import org.jboss.logging.Logger;
  * are completely disabled.
  *
  * @author Steve Ebersole
- *
  * @deprecated See deprecation discussion on {@link SequenceGenerator}
  */
 @Deprecated
@@ -62,26 +61,26 @@ public class SequenceIdentityGenerator
 		extends SequenceGenerator
 		implements PostInsertIdentifierGenerator {
 
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(
+	private static final CoreMessageLogger LOG = Logger.getMessageLogger(
 			CoreMessageLogger.class,
 			SequenceIdentityGenerator.class.getName()
 	);
 
 	@Override
-    public Serializable generate(SessionImplementor s, Object obj) {
+	public Serializable generate(SessionImplementor s, Object obj) {
 		return IdentifierGeneratorHelper.POST_INSERT_INDICATOR;
 	}
 
 	@Override
 	public InsertGeneratedIdentifierDelegate getInsertGeneratedIdentifierDelegate(
 			PostInsertIdentityPersister persister,
-	        Dialect dialect,
-	        boolean isGetGeneratedKeysEnabled) throws HibernateException {
+			Dialect dialect,
+			boolean isGetGeneratedKeysEnabled) throws HibernateException {
 		return new Delegate( persister, dialect, getSequenceName() );
 	}
 
 	@Override
-    public void configure(Type type, Properties params, JdbcEnvironment env) throws MappingException {
+	public void configure(Type type, Properties params, JdbcEnvironment env) throws MappingException {
 		super.configure( type, params, env );
 	}
 
@@ -107,13 +106,14 @@ public class SequenceIdentityGenerator
 		}
 
 		@Override
-        protected PreparedStatement prepare(String insertSQL, SessionImplementor session) throws SQLException {
+		protected PreparedStatement prepare(String insertSQL, SessionImplementor session) throws SQLException {
 			return session.getJdbcCoordinator().getStatementPreparer().prepareStatement( insertSQL, keyColumns );
 		}
 
 		@Override
-		protected Serializable executeAndExtract(PreparedStatement insert, SessionImplementor session) throws SQLException {
-						session.getJdbcCoordinator().getResultSetReturn().executeUpdate( insert );
+		protected Serializable executeAndExtract(PreparedStatement insert, SessionImplementor session)
+				throws SQLException {
+			session.getJdbcCoordinator().getResultSetReturn().executeUpdate( insert );
 			return IdentifierGeneratorHelper.getGeneratedIdentity(
 					insert.getGeneratedKeys(),
 					getPersister().getRootTableKeyColumnNames()[0],
@@ -128,7 +128,7 @@ public class SequenceIdentityGenerator
 		}
 
 		@Override
-        public Insert setComment(String comment) {
+		public Insert setComment(String comment) {
 			// don't allow comments on these insert statements as comments totally
 			// blow up the Oracle getGeneratedKeys "support" :(
 			LOG.disallowingInsertStatementComment();
diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java
index f4c68b867b..c5a9454e0c 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java
@@ -32,13 +32,12 @@ import org.hibernate.MappingException;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.id.uuid.StandardRandomStrategy;
+import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.java.UUIDTypeDescriptor;
 
-import org.jboss.logging.Logger;
-
 /**
  * An {@link IdentifierGenerator} which generates {@link UUID} values using a pluggable
  * {@link UUIDGenerationStrategy generation strategy}.  The values this generator can return
@@ -60,7 +59,7 @@ public class UUIDGenerator implements IdentifierGenerator, Configurable {
 	public static final String UUID_GEN_STRATEGY = "uuid_gen_strategy";
 	public static final String UUID_GEN_STRATEGY_CLASS = "uuid_gen_strategy_class";
 
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, UUIDGenerator.class.getName());
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UUIDGenerator.class );
 
 	private UUIDGenerationStrategy strategy;
 	private UUIDTypeDescriptor.ValueTransformer valueTransformer;
@@ -86,11 +85,11 @@ public class UUIDGenerator implements IdentifierGenerator, Configurable {
 						strategy = (UUIDGenerationStrategy) strategyClass.newInstance();
 					}
 					catch ( Exception ignore ) {
-                        LOG.unableToInstantiateUuidGenerationStrategy(ignore);
+						LOG.unableToInstantiateUuidGenerationStrategy(ignore);
 					}
 				}
 				catch ( ClassNotFoundException ignore ) {
-                    LOG.unableToLocateUuidGenerationStrategy(strategyClassName);
+						LOG.unableToLocateUuidGenerationStrategy(strategyClassName);
 				}
 			}
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java
index cbaf2e494c..cba8e15955 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java
@@ -29,12 +29,11 @@ import java.util.Properties;
 import org.hibernate.MappingException;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.type.Type;
 
-import org.jboss.logging.Logger;
-
 /**
  * <b>uuid</b><br>
  * <br>
@@ -42,13 +41,13 @@ import org.jboss.logging.Logger;
  * This string will consist of only hex digits. Optionally,
  * the string may be generated with separators between each
  * component of the UUID.
- *
+ * <p/>
  * Mapping parameters supported: separator.
  *
  * @author Gavin King
  */
 public class UUIDHexGenerator extends AbstractUUIDGenerator implements Configurable {
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, UUIDHexGenerator.class.getName());
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( UUIDHexGenerator.class );
 
 	private static boolean WARNED;
 
@@ -57,7 +56,7 @@ public class UUIDHexGenerator extends AbstractUUIDGenerator implements Configura
 	public UUIDHexGenerator() {
 		if ( !WARNED ) {
 			WARNED = true;
-            LOG.usingUuidHexGenerator( this.getClass().getName(), UUIDGenerator.class.getName() );
+			LOG.usingUuidHexGenerator( this.getClass().getName(), UUIDGenerator.class.getName() );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/factory/internal/DefaultIdentifierGeneratorFactory.java b/hibernate-core/src/main/java/org/hibernate/id/factory/internal/DefaultIdentifierGeneratorFactory.java
index d7bc7e9755..81ff1e8065 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/factory/internal/DefaultIdentifierGeneratorFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/factory/internal/DefaultIdentifierGeneratorFactory.java
@@ -61,7 +61,7 @@ import org.hibernate.type.Type;
 public class DefaultIdentifierGeneratorFactory
 		implements MutableIdentifierGeneratorFactory, Serializable, ServiceRegistryAwareService {
 
-    private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultIdentifierGeneratorFactory.class );
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( DefaultIdentifierGeneratorFactory.class );
 
 	private JdbcEnvironment jdbcEnvironment;
 	private ConcurrentHashMap<String, Class> generatorStrategyToClassNameMap = new ConcurrentHashMap<String, Class>();
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java
index add0184582..870a45f910 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java
@@ -23,6 +23,7 @@
  *
  */
 package org.hibernate.id.insert;
+
 import java.io.Serializable;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
@@ -33,9 +34,9 @@ import org.hibernate.pretty.MessageHelper;
 
 /**
  * Abstract InsertGeneratedIdentifierDelegate implementation where the
- * underlying strategy causes the enerated identitifer to be returned as an
+ * underlying strategy causes the generated identifier to be returned as an
  * effect of performing the insert statement.  Thus, there is no need for an
- * additional sql statement to determine the generated identitifer.
+ * additional sql statement to determine the generated identifier.
  *
  * @author Steve Ebersole
  */
@@ -46,6 +47,7 @@ public abstract class AbstractReturningDelegate implements InsertGeneratedIdenti
 		this.persister = persister;
 	}
 
+	@Override
 	public final Serializable performInsert(
 			String insertSQL,
 			SessionImplementor session,
@@ -61,12 +63,12 @@ public abstract class AbstractReturningDelegate implements InsertGeneratedIdenti
 				releaseStatement( insert, session );
 			}
 		}
-		catch ( SQLException sqle ) {
+		catch (SQLException sqle) {
 			throw session.getFactory().getSQLExceptionHelper().convert(
-			        sqle,
-			        "could not insert: " + MessageHelper.infoString( persister ),
-			        insertSQL
-				);
+					sqle,
+					"could not insert: " + MessageHelper.infoString( persister ),
+					insertSQL
+			);
 		}
 	}
 
@@ -76,7 +78,8 @@ public abstract class AbstractReturningDelegate implements InsertGeneratedIdenti
 
 	protected abstract PreparedStatement prepare(String insertSQL, SessionImplementor session) throws SQLException;
 
-	protected abstract Serializable executeAndExtract(PreparedStatement insert, SessionImplementor session) throws SQLException;
+	protected abstract Serializable executeAndExtract(PreparedStatement insert, SessionImplementor session)
+			throws SQLException;
 
 	protected void releaseStatement(PreparedStatement insert, SessionImplementor session) throws SQLException {
 		session.getJdbcCoordinator().getResourceRegistry().release( insert );
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java
index dba353bff2..487eb1a6be 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java
@@ -20,9 +20,9 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.id.insert;
+
 import java.io.Serializable;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -46,6 +46,7 @@ public abstract class AbstractSelectingDelegate implements InsertGeneratedIdenti
 		this.persister = persister;
 	}
 
+	@Override
 	public final Serializable performInsert(
 			String insertSQL,
 			SessionImplementor session,
@@ -65,12 +66,12 @@ public abstract class AbstractSelectingDelegate implements InsertGeneratedIdenti
 				session.getJdbcCoordinator().afterStatementExecution();
 			}
 		}
-		catch ( SQLException sqle ) {
+		catch (SQLException sqle) {
 			throw session.getFactory().getSQLExceptionHelper().convert(
-			        sqle,
-			        "could not insert: " + MessageHelper.infoString( persister ),
-			        insertSQL
-				);
+					sqle,
+					"could not insert: " + MessageHelper.infoString( persister ),
+					insertSQL
+			);
 		}
 
 		final String selectSQL = getSelectSQL();
@@ -97,11 +98,11 @@ public abstract class AbstractSelectingDelegate implements InsertGeneratedIdenti
 			}
 
 		}
-		catch ( SQLException sqle ) {
+		catch (SQLException sqle) {
 			throw session.getFactory().getSQLExceptionHelper().convert(
-			        sqle,
-			        "could not retrieve generated id after insert: " + MessageHelper.infoString( persister ),
-			        insertSQL
+					sqle,
+					"could not retrieve generated id after insert: " + MessageHelper.infoString( persister ),
+					insertSQL
 			);
 		}
 	}
@@ -119,12 +120,13 @@ public abstract class AbstractSelectingDelegate implements InsertGeneratedIdenti
 	 * @param session The session
 	 * @param ps The prepared {@link #getSelectSQL SQL} command
 	 * @param entity The entity being saved.
+	 *
 	 * @throws SQLException
 	 */
 	protected void bindParameters(
 			SessionImplementor session,
-	        PreparedStatement ps,
-	        Object entity) throws SQLException {
+			PreparedStatement ps,
+			Object entity) throws SQLException {
 	}
 
 	/**
@@ -133,12 +135,14 @@ public abstract class AbstractSelectingDelegate implements InsertGeneratedIdenti
 	 * @param session The session
 	 * @param rs The result set containing the generated primay key values.
 	 * @param entity The entity being saved.
+	 *
 	 * @return The generated identifier
+	 *
 	 * @throws SQLException
 	 */
 	protected abstract Serializable getResult(
 			SessionImplementor session,
-	        ResultSet rs,
-	        Object entity) throws SQLException;
+			ResultSet rs,
+			Object entity) throws SQLException;
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java
index 6f7265b282..c4e1e61c38 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractQueryImpl.java
@@ -82,18 +82,18 @@ public abstract class AbstractQueryImpl implements Query {
 			AbstractQueryImpl.class.getName()
 	);
 
-	private static final Object UNSET_PARAMETER = new MarkerObject("<unset parameter>");
-	private static final Object UNSET_TYPE = new MarkerObject("<unset type>");
+	private static final Object UNSET_PARAMETER = new MarkerObject( "<unset parameter>" );
+	private static final Object UNSET_TYPE = new MarkerObject( "<unset type>" );
 
 	private final String queryString;
 	protected final SessionImplementor session;
 	protected final ParameterMetadata parameterMetadata;
 
 	// parameter bind values...
-	private List values = new ArrayList(4);
-	private List types = new ArrayList(4);
-	private Map<String,TypedValue> namedParameters = new HashMap<String, TypedValue>(4);
-	private Map<String, TypedValue> namedParameterLists = new HashMap<String, TypedValue>(4);
+	private List values = new ArrayList( 4 );
+	private List types = new ArrayList( 4 );
+	private Map<String, TypedValue> namedParameters = new HashMap<String, TypedValue>( 4 );
+	private Map<String, TypedValue> namedParameterLists = new HashMap<String, TypedValue>( 4 );
 
 	private Object optionalObject;
 	private Serializable optionalId;
@@ -111,14 +111,14 @@ public abstract class AbstractQueryImpl implements Query {
 	private Serializable collectionKey;
 	private Boolean readOnly;
 	private ResultTransformer resultTransformer;
-	
+
 	private HQLQueryPlan queryPlan;
 
 	public AbstractQueryImpl(
 			String queryString,
-	        FlushMode flushMode,
-	        SessionImplementor session,
-	        ParameterMetadata parameterMetadata) {
+			FlushMode flushMode,
+			SessionImplementor session,
+			ParameterMetadata parameterMetadata) {
 		this.session = session;
 		this.queryString = queryString;
 		this.selection = new RowSelection();
@@ -159,7 +159,7 @@ public abstract class AbstractQueryImpl implements Query {
 
 	@Override
 	public Query setCacheRegion(String cacheRegion) {
-		if (cacheRegion != null) {
+		if ( cacheRegion != null ) {
 			this.cacheRegion = cacheRegion.trim();
 		}
 		return this;
@@ -197,12 +197,12 @@ public abstract class AbstractQueryImpl implements Query {
 		this.comment = comment;
 		return this;
 	}
-	  
+
 	@Override
 	public Query addQueryHint(String queryHint) {
 		queryHints.add( queryHint );
 		return this;
-	} 
+	}
 
 	@Override
 	public Integer getFirstResult() {
@@ -211,7 +211,7 @@ public abstract class AbstractQueryImpl implements Query {
 
 	@Override
 	public Query setFirstResult(int firstResult) {
-		selection.setFirstRow( firstResult);
+		selection.setFirstRow( firstResult );
 		return this;
 	}
 
@@ -227,7 +227,7 @@ public abstract class AbstractQueryImpl implements Query {
 			selection.setMaxRows( null );
 		}
 		else {
-			selection.setMaxRows( maxResults);
+			selection.setMaxRows( maxResults );
 		}
 		return this;
 	}
@@ -239,7 +239,7 @@ public abstract class AbstractQueryImpl implements Query {
 
 	@Override
 	public Query setTimeout(int timeout) {
-		selection.setTimeout( timeout);
+		selection.setTimeout( timeout );
 		return this;
 	}
 
@@ -250,7 +250,7 @@ public abstract class AbstractQueryImpl implements Query {
 
 	@Override
 	public Query setFetchSize(int fetchSize) {
-		selection.setFetchSize( fetchSize);
+		selection.setFetchSize( fetchSize );
 		return this;
 	}
 
@@ -280,12 +280,13 @@ public abstract class AbstractQueryImpl implements Query {
 		this.readOnly = readOnly;
 		return this;
 	}
+
 	@Override
 	public Query setResultTransformer(ResultTransformer transformer) {
 		this.resultTransformer = transformer;
 		return this;
 	}
-	
+
 	public void setOptionalEntityName(String optionalEntityName) {
 		this.optionalEntityName = optionalEntityName;
 	}
@@ -301,6 +302,7 @@ public abstract class AbstractQueryImpl implements Query {
 	SessionImplementor getSession() {
 		return session;
 	}
+
 	@Override
 	public abstract LockOptions getLockOptions();
 
@@ -328,6 +330,7 @@ public abstract class AbstractQueryImpl implements Query {
 	 * holds true for all parameter metadata exposed here.
 	 *
 	 * @return Array of named parameter names.
+	 *
 	 * @throws HibernateException
 	 */
 	@Override
@@ -382,7 +385,7 @@ public abstract class AbstractQueryImpl implements Query {
 	 * @throws QueryException
 	 */
 	protected void verifyParameters() throws QueryException {
-		verifyParameters(false);
+		verifyParameters( false );
 	}
 
 	/**
@@ -391,10 +394,12 @@ public abstract class AbstractQueryImpl implements Query {
 	 *
 	 * @param reserveFirstParameter if true, the first ? will not be verified since
 	 * its needed for e.g. callable statements returning a out parameter
+	 *
 	 * @throws HibernateException
 	 */
 	protected void verifyParameters(boolean reserveFirstParameter) throws HibernateException {
-		if ( parameterMetadata.getNamedParameterNames().size() != namedParameters.size() + namedParameterLists.size() ) {
+		if ( parameterMetadata.getNamedParameterNames()
+				.size() != namedParameters.size() + namedParameterLists.size() ) {
 			Set<String> missingParams = new HashSet<String>( parameterMetadata.getNamedParameterNames() );
 			missingParams.removeAll( namedParameterLists.keySet() );
 			missingParams.removeAll( namedParameters.keySet() );
@@ -404,8 +409,8 @@ public abstract class AbstractQueryImpl implements Query {
 		int positionalValueSpan = 0;
 		for ( int i = 0; i < values.size(); i++ ) {
 			Object object = types.get( i );
-			if( values.get( i ) == UNSET_PARAMETER || object == UNSET_TYPE ) {
-				if ( reserveFirstParameter && i==0 ) {
+			if ( values.get( i ) == UNSET_PARAMETER || object == UNSET_TYPE ) {
+				if ( reserveFirstParameter && i == 0 ) {
 					continue;
 				}
 				else {
@@ -418,31 +423,31 @@ public abstract class AbstractQueryImpl implements Query {
 		if ( parameterMetadata.getOrdinalParameterCount() != positionalValueSpan ) {
 			if ( reserveFirstParameter && parameterMetadata.getOrdinalParameterCount() - 1 != positionalValueSpan ) {
 				throw new QueryException(
-				 		"Expected positional parameter count: " +
-				 		(parameterMetadata.getOrdinalParameterCount()-1) +
-				 		", actual parameters: " +
-				 		values,
-				 		getQueryString()
-				 	);
+						"Expected positional parameter count: " +
+								( parameterMetadata.getOrdinalParameterCount() - 1 ) +
+								", actual parameters: " +
+								values,
+						getQueryString()
+				);
 			}
 			else if ( !reserveFirstParameter ) {
 				throw new QueryException(
-				 		"Expected positional parameter count: " +
-				 		parameterMetadata.getOrdinalParameterCount() +
-				 		", actual parameters: " +
-				 		values,
-				 		getQueryString()
-				 	);
+						"Expected positional parameter count: " +
+								parameterMetadata.getOrdinalParameterCount() +
+								", actual parameters: " +
+								values,
+						getQueryString()
+				);
 			}
 		}
 	}
 
 	public Query setParameter(int position, Object val, Type type) {
 		if ( parameterMetadata.getOrdinalParameterCount() == 0 ) {
-			throw new IllegalArgumentException("No positional parameters in query: " + getQueryString() );
+			throw new IllegalArgumentException( "No positional parameters in query: " + getQueryString() );
 		}
 		if ( position < 0 || position > parameterMetadata.getOrdinalParameterCount() - 1 ) {
-			throw new IllegalArgumentException("Positional parameter does not exist: " + position + " in query: " + getQueryString() );
+			throw new IllegalArgumentException( "Positional parameter does not exist: " + position + " in query: " + getQueryString() );
 		}
 		int size = values.size();
 		if ( position < size ) {
@@ -463,16 +468,16 @@ public abstract class AbstractQueryImpl implements Query {
 
 	public Query setParameter(String name, Object val, Type type) {
 		if ( !parameterMetadata.getNamedParameterNames().contains( name ) ) {
-			throw new IllegalArgumentException("Parameter " + name + " does not exist as a named parameter in [" + getQueryString() + "]");
+			throw new IllegalArgumentException( "Parameter " + name + " does not exist as a named parameter in [" + getQueryString() + "]" );
 		}
 		else {
-			 namedParameters.put( name, new TypedValue( type, val  ) );
-			 return this;
+			namedParameters.put( name, new TypedValue( type, val ) );
+			return this;
 		}
 	}
 
 	public Query setParameter(int position, Object val) throws HibernateException {
-		if (val == null) {
+		if ( val == null ) {
 			setParameter( position, val, StandardBasicTypes.SERIALIZABLE );
 		}
 		else {
@@ -482,7 +487,7 @@ public abstract class AbstractQueryImpl implements Query {
 	}
 
 	public Query setParameter(String name, Object val) throws HibernateException {
-		if (val == null) {
+		if ( val == null ) {
 			Type type = parameterMetadata.getNamedParameterExpectedType( name );
 			if ( type == null ) {
 				type = StandardBasicTypes.SERIALIZABLE;
@@ -542,18 +547,18 @@ public abstract class AbstractQueryImpl implements Query {
 
 	private Type guessType(Class clazz) throws HibernateException {
 		String typename = clazz.getName();
-		Type type = session.getFactory().getTypeResolver().heuristicType(typename);
-		boolean serializable = type!=null && type instanceof SerializableType;
-		if (type==null || serializable) {
+		Type type = session.getFactory().getTypeResolver().heuristicType( typename );
+		boolean serializable = type != null && type instanceof SerializableType;
+		if ( type == null || serializable ) {
 			try {
 				session.getFactory().getEntityPersister( clazz.getName() );
 			}
 			catch (MappingException me) {
-				if (serializable) {
+				if ( serializable ) {
 					return type;
 				}
 				else {
-					throw new HibernateException("Could not determine a type for class: " + typename);
+					throw new HibernateException( "Could not determine a type for class: " + typename );
 				}
 			}
 			return ( (Session) session ).getTypeHelper().entity( clazz );
@@ -564,7 +569,7 @@ public abstract class AbstractQueryImpl implements Query {
 	}
 
 	public Query setString(int position, String val) {
-		setParameter(position, val, StandardBasicTypes.STRING);
+		setParameter( position, val, StandardBasicTypes.STRING );
 		return this;
 	}
 
@@ -581,62 +586,62 @@ public abstract class AbstractQueryImpl implements Query {
 	}
 
 	public Query setByte(int position, byte val) {
-		setParameter(position, val, StandardBasicTypes.BYTE);
+		setParameter( position, val, StandardBasicTypes.BYTE );
 		return this;
 	}
 
 	public Query setShort(int position, short val) {
-		setParameter(position, val, StandardBasicTypes.SHORT);
+		setParameter( position, val, StandardBasicTypes.SHORT );
 		return this;
 	}
 
 	public Query setInteger(int position, int val) {
-		setParameter(position, val, StandardBasicTypes.INTEGER);
+		setParameter( position, val, StandardBasicTypes.INTEGER );
 		return this;
 	}
 
 	public Query setLong(int position, long val) {
-		setParameter(position, val, StandardBasicTypes.LONG);
+		setParameter( position, val, StandardBasicTypes.LONG );
 		return this;
 	}
 
 	public Query setFloat(int position, float val) {
-		setParameter(position, val, StandardBasicTypes.FLOAT);
+		setParameter( position, val, StandardBasicTypes.FLOAT );
 		return this;
 	}
 
 	public Query setDouble(int position, double val) {
-		setParameter(position, val, StandardBasicTypes.DOUBLE);
+		setParameter( position, val, StandardBasicTypes.DOUBLE );
 		return this;
 	}
 
 	public Query setBinary(int position, byte[] val) {
-		setParameter(position, val, StandardBasicTypes.BINARY);
+		setParameter( position, val, StandardBasicTypes.BINARY );
 		return this;
 	}
 
 	public Query setText(int position, String val) {
-		setParameter(position, val, StandardBasicTypes.TEXT);
+		setParameter( position, val, StandardBasicTypes.TEXT );
 		return this;
 	}
 
 	public Query setSerializable(int position, Serializable val) {
-		setParameter(position, val, StandardBasicTypes.SERIALIZABLE);
+		setParameter( position, val, StandardBasicTypes.SERIALIZABLE );
 		return this;
 	}
 
 	public Query setDate(int position, Date date) {
-		setParameter(position, date, StandardBasicTypes.DATE);
+		setParameter( position, date, StandardBasicTypes.DATE );
 		return this;
 	}
 
 	public Query setTime(int position, Date date) {
-		setParameter(position, date, StandardBasicTypes.TIME);
+		setParameter( position, date, StandardBasicTypes.TIME );
 		return this;
 	}
 
 	public Query setTimestamp(int position, Date date) {
-		setParameter(position, date, StandardBasicTypes.TIMESTAMP);
+		setParameter( position, date, StandardBasicTypes.TIMESTAMP );
 		return this;
 	}
 
@@ -653,27 +658,27 @@ public abstract class AbstractQueryImpl implements Query {
 	}
 
 	public Query setLocale(int position, Locale locale) {
-		setParameter(position, locale, StandardBasicTypes.LOCALE);
+		setParameter( position, locale, StandardBasicTypes.LOCALE );
 		return this;
 	}
 
 	public Query setCalendar(int position, Calendar calendar) {
-		setParameter(position, calendar, StandardBasicTypes.CALENDAR);
+		setParameter( position, calendar, StandardBasicTypes.CALENDAR );
 		return this;
 	}
 
 	public Query setCalendarDate(int position, Calendar calendar) {
-		setParameter(position, calendar, StandardBasicTypes.CALENDAR_DATE);
+		setParameter( position, calendar, StandardBasicTypes.CALENDAR_DATE );
 		return this;
 	}
 
 	public Query setBinary(String name, byte[] val) {
-		setParameter(name, val, StandardBasicTypes.BINARY);
+		setParameter( name, val, StandardBasicTypes.BINARY );
 		return this;
 	}
 
 	public Query setText(String name, String val) {
-		setParameter(name, val, StandardBasicTypes.TEXT);
+		setParameter( name, val, StandardBasicTypes.TEXT );
 		return this;
 	}
 
@@ -685,22 +690,22 @@ public abstract class AbstractQueryImpl implements Query {
 	}
 
 	public Query setByte(String name, byte val) {
-		setParameter(name, val, StandardBasicTypes.BYTE);
+		setParameter( name, val, StandardBasicTypes.BYTE );
 		return this;
 	}
 
 	public Query setCharacter(String name, char val) {
-		setParameter(name, val, StandardBasicTypes.CHARACTER);
+		setParameter( name, val, StandardBasicTypes.CHARACTER );
 		return this;
 	}
 
 	public Query setDate(String name, Date date) {
-		setParameter(name, date, StandardBasicTypes.DATE);
+		setParameter( name, date, StandardBasicTypes.DATE );
 		return this;
 	}
 
 	public Query setDouble(String name, double val) {
-		setParameter(name, val, StandardBasicTypes.DOUBLE);
+		setParameter( name, val, StandardBasicTypes.DOUBLE );
 		return this;
 	}
 
@@ -710,89 +715,89 @@ public abstract class AbstractQueryImpl implements Query {
 	}
 
 	public Query setFloat(String name, float val) {
-		setParameter(name, val, StandardBasicTypes.FLOAT);
+		setParameter( name, val, StandardBasicTypes.FLOAT );
 		return this;
 	}
 
 	public Query setInteger(String name, int val) {
-		setParameter(name, val, StandardBasicTypes.INTEGER);
+		setParameter( name, val, StandardBasicTypes.INTEGER );
 		return this;
 	}
 
 	public Query setLocale(String name, Locale locale) {
-		setParameter(name, locale, StandardBasicTypes.LOCALE);
+		setParameter( name, locale, StandardBasicTypes.LOCALE );
 		return this;
 	}
 
 	public Query setCalendar(String name, Calendar calendar) {
-		setParameter(name, calendar, StandardBasicTypes.CALENDAR);
+		setParameter( name, calendar, StandardBasicTypes.CALENDAR );
 		return this;
 	}
 
 	public Query setCalendarDate(String name, Calendar calendar) {
-		setParameter(name, calendar, StandardBasicTypes.CALENDAR_DATE);
+		setParameter( name, calendar, StandardBasicTypes.CALENDAR_DATE );
 		return this;
 	}
 
 	public Query setLong(String name, long val) {
-		setParameter(name, val, StandardBasicTypes.LONG);
+		setParameter( name, val, StandardBasicTypes.LONG );
 		return this;
 	}
 
 	public Query setSerializable(String name, Serializable val) {
-		setParameter(name, val, StandardBasicTypes.SERIALIZABLE);
+		setParameter( name, val, StandardBasicTypes.SERIALIZABLE );
 		return this;
 	}
 
 	public Query setShort(String name, short val) {
-		setParameter(name, val, StandardBasicTypes.SHORT);
+		setParameter( name, val, StandardBasicTypes.SHORT );
 		return this;
 	}
 
 	public Query setString(String name, String val) {
-		setParameter(name, val, StandardBasicTypes.STRING);
+		setParameter( name, val, StandardBasicTypes.STRING );
 		return this;
 	}
 
 	public Query setTime(String name, Date date) {
-		setParameter(name, date, StandardBasicTypes.TIME);
+		setParameter( name, date, StandardBasicTypes.TIME );
 		return this;
 	}
 
 	public Query setTimestamp(String name, Date date) {
-		setParameter(name, date, StandardBasicTypes.TIMESTAMP);
+		setParameter( name, date, StandardBasicTypes.TIMESTAMP );
 		return this;
 	}
 
 	public Query setBigDecimal(int position, BigDecimal number) {
-		setParameter(position, number, StandardBasicTypes.BIG_DECIMAL);
+		setParameter( position, number, StandardBasicTypes.BIG_DECIMAL );
 		return this;
 	}
 
 	public Query setBigDecimal(String name, BigDecimal number) {
-		setParameter(name, number, StandardBasicTypes.BIG_DECIMAL);
+		setParameter( name, number, StandardBasicTypes.BIG_DECIMAL );
 		return this;
 	}
 
 	public Query setBigInteger(int position, BigInteger number) {
-		setParameter(position, number, StandardBasicTypes.BIG_INTEGER);
+		setParameter( position, number, StandardBasicTypes.BIG_INTEGER );
 		return this;
 	}
 
 	public Query setBigInteger(String name, BigInteger number) {
-		setParameter(name, number, StandardBasicTypes.BIG_INTEGER);
+		setParameter( name, number, StandardBasicTypes.BIG_INTEGER );
 		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() + "]");
+			throw new IllegalArgumentException( "Parameter " + name + " does not exist as a named parameter in [" + getQueryString() + "]" );
 		}
 		namedParameterLists.put( name, new TypedValue( type, vals ) );
 		return this;
 	}
-	
+
 	/**
 	 * Warning: adds new parameters to the argument by side-effect, as well as
 	 * mutating the query string!
@@ -812,7 +817,7 @@ public abstract class AbstractQueryImpl implements Query {
 	 */
 	private String expandParameterList(String query, String name, TypedValue typedList, Map namedParamsCopy) {
 		Collection vals = (Collection) typedList.getValue();
-		
+
 		// HHH-1123
 		// Some DBs limit number of IN expressions.  For now, warn...
 		final Dialect dialect = session.getFactory().getDialect();
@@ -825,13 +830,10 @@ public abstract class AbstractQueryImpl implements Query {
 
 		boolean isJpaPositionalParam = parameterMetadata.getNamedParameterDescriptor( name ).isJpaStyle();
 		String paramPrefix = isJpaPositionalParam ? "?" : ParserHelper.HQL_VARIABLE_PREFIX;
-		String placeholder =
-				new StringBuilder( paramPrefix.length() + name.length() )
-						.append( paramPrefix ).append(  name )
-						.toString();
+		String placeholder = paramPrefix + name;
 
 		if ( query == null ) {
-			return query;
+			return null;
 		}
 		int loc = query.indexOf( placeholder );
 
@@ -840,15 +842,15 @@ public abstract class AbstractQueryImpl implements Query {
 		}
 
 		String beforePlaceholder = query.substring( 0, loc );
-		String afterPlaceholder =  query.substring( loc + placeholder.length() );
+		String afterPlaceholder = query.substring( loc + placeholder.length() );
 
 		// check if placeholder is already immediately enclosed in parentheses
 		// (ignoring whitespace)
 		boolean isEnclosedInParens =
 				StringHelper.getLastNonWhitespaceCharacter( beforePlaceholder ) == '(' &&
-				StringHelper.getFirstNonWhitespaceCharacter( afterPlaceholder ) == ')';
+						StringHelper.getFirstNonWhitespaceCharacter( afterPlaceholder ) == ')';
 
-		if ( vals.size() == 1  && isEnclosedInParens ) {
+		if ( vals.size() == 1 && isEnclosedInParens ) {
 			// short-circuit for performance when only 1 value and the
 			// placeholder is already enclosed in parentheses...
 			namedParamsCopy.put( name, new TypedValue( type, vals.iterator().next() ) );
@@ -885,18 +887,18 @@ public abstract class AbstractQueryImpl implements Query {
 			throw new QueryException( "Collection must be not null!" );
 		}
 
-		if( vals.size() == 0 ) {
+		if ( vals.size() == 0 ) {
 			setParameterList( name, vals, null );
 		}
 		else {
-			setParameterList(name, vals, determineType( name, vals.iterator().next() ) );
+			setParameterList( name, vals, determineType( name, vals.iterator().next() ) );
 		}
 
 		return this;
 	}
 
 	public Query setParameterList(String name, Object[] vals, Type type) throws HibernateException {
-		return setParameterList( name, Arrays.asList(vals), type );
+		return setParameterList( name, Arrays.asList( vals ), type );
 	}
 
 	public Query setParameterList(String name, Object[] values) throws HibernateException {
@@ -905,42 +907,41 @@ public abstract class AbstractQueryImpl implements Query {
 
 	public Query setProperties(Map map) throws HibernateException {
 		String[] params = getNamedParameters();
-		for (int i = 0; i < params.length; i++) {
+		for ( int i = 0; i < params.length; i++ ) {
 			String namedParam = params[i];
-				final Object object = map.get(namedParam);
-				if(object==null) {
-					continue;
-				}
-				Class retType = object.getClass();
-				if ( Collection.class.isAssignableFrom( retType ) ) {
-					setParameterList( namedParam, ( Collection ) object );
-				}
-				else if ( retType.isArray() ) {
-					setParameterList( namedParam, ( Object[] ) object );
-				}
-				else {
-					setParameter( namedParam, object, determineType( namedParam, retType ) );
-				}
+			final Object object = map.get( namedParam );
+			if ( object == null ) {
+				continue;
+			}
+			Class retType = object.getClass();
+			if ( Collection.class.isAssignableFrom( retType ) ) {
+				setParameterList( namedParam, (Collection) object );
+			}
+			else if ( retType.isArray() ) {
+				setParameterList( namedParam, (Object[]) object );
+			}
+			else {
+				setParameter( namedParam, object, determineType( namedParam, retType ) );
+			}
+
 
-			
 		}
-		return this;				
+		return this;
 	}
-	
+
 	public Query setProperties(Object bean) throws HibernateException {
 		Class clazz = bean.getClass();
 		String[] params = getNamedParameters();
-		for (int i = 0; i < params.length; i++) {
-			String namedParam = params[i];
+		for ( String namedParam : params ) {
 			try {
 				Getter getter = ReflectHelper.getGetter( clazz, namedParam );
 				Class retType = getter.getReturnType();
 				final Object object = getter.get( bean );
 				if ( Collection.class.isAssignableFrom( retType ) ) {
-					setParameterList( namedParam, ( Collection ) object );
+					setParameterList( namedParam, (Collection) object );
 				}
 				else if ( retType.isArray() ) {
-				 	setParameterList( namedParam, ( Object[] ) object );
+					setParameterList( namedParam, (Object[]) object );
 				}
 				else {
 					setParameter( namedParam, object, determineType( namedParam, retType ) );
@@ -954,8 +955,8 @@ public abstract class AbstractQueryImpl implements Query {
 	}
 
 	public Query setParameters(Object[] values, Type[] types) {
-		this.values = Arrays.asList(values);
-		this.types = Arrays.asList(types);
+		this.values = Arrays.asList( values );
+		this.types = Arrays.asList( types );
 		return this;
 	}
 
@@ -968,12 +969,12 @@ public abstract class AbstractQueryImpl implements Query {
 
 	static Object uniqueElement(List list) throws NonUniqueResultException {
 		int size = list.size();
-		if (size==0) {
+		if ( size == 0 ) {
 			return null;
 		}
-		Object first = list.get(0);
-		for ( int i=1; i<size; i++ ) {
-			if ( list.get(i)!=first ) {
+		Object first = list.get( 0 );
+		for ( int i = 1; i < size; i++ ) {
+			if ( list.get( i ) != first ) {
 				throw new NonUniqueResultException( list.size() );
 			}
 		}
@@ -987,7 +988,7 @@ public abstract class AbstractQueryImpl implements Query {
 	public Type[] typeArray() {
 		return ArrayHelper.toTypeArray( getTypes() );
 	}
-	
+
 	public Object[] valueArray() {
 		return getValues().toArray();
 	}
@@ -1005,7 +1006,7 @@ public abstract class AbstractQueryImpl implements Query {
 				cacheRegion,
 				comment,
 				queryHints,
-				collectionKey == null ? null : new Serializable[] { collectionKey },
+				collectionKey == null ? null : new Serializable[] {collectionKey},
 				optionalObject,
 				optionalEntityName,
 				optionalId,
@@ -1014,25 +1015,25 @@ public abstract class AbstractQueryImpl implements Query {
 		queryParameters.setQueryPlan( queryPlan );
 		return queryParameters;
 	}
-	
+
 	protected void before() {
-		if ( flushMode!=null ) {
+		if ( flushMode != null ) {
 			sessionFlushMode = getSession().getFlushMode();
-			getSession().setFlushMode(flushMode);
+			getSession().setFlushMode( flushMode );
 		}
-		if ( cacheMode!=null ) {
+		if ( cacheMode != null ) {
 			sessionCacheMode = getSession().getCacheMode();
-			getSession().setCacheMode(cacheMode);
+			getSession().setCacheMode( cacheMode );
 		}
 	}
-	
+
 	protected void after() {
-		if (sessionFlushMode!=null) {
-			getSession().setFlushMode(sessionFlushMode);
+		if ( sessionFlushMode != null ) {
+			getSession().setFlushMode( sessionFlushMode );
 			sessionFlushMode = null;
 		}
-		if (sessionCacheMode!=null) {
-			getSession().setCacheMode(sessionCacheMode);
+		if ( sessionCacheMode != null ) {
+			getSession().setCacheMode( sessionCacheMode );
 			sessionCacheMode = null;
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java
index d77e49c25e..5673397f2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java
@@ -43,19 +43,13 @@ import org.hibernate.loader.Loader;
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.Type;
 
-import org.jboss.logging.Logger;
-
 /**
  * Base implementation of the ScrollableResults interface.
  *
  * @author Steve Ebersole
  */
 public abstract class AbstractScrollableResults implements ScrollableResults {
-
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(
-			CoreMessageLogger.class,
-			AbstractScrollableResults.class.getName()
-	);
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( AbstractScrollableResults.class );
 
 	private final ResultSet resultSet;
 	private final PreparedStatement ps;
@@ -66,22 +60,22 @@ public abstract class AbstractScrollableResults implements ScrollableResults {
 	private HolderInstantiator holderInstantiator;
 
 	protected AbstractScrollableResults(
-	        ResultSet rs,
-	        PreparedStatement ps,
-	        SessionImplementor sess,
+			ResultSet rs,
+			PreparedStatement ps,
+			SessionImplementor sess,
 			Loader loader,
 			QueryParameters queryParameters,
-	        Type[] types,
-	        HolderInstantiator holderInstantiator) {
-		this.resultSet=rs;
-		this.ps=ps;
+			Type[] types,
+			HolderInstantiator holderInstantiator) {
+		this.resultSet = rs;
+		this.ps = ps;
 		this.session = sess;
 		this.loader = loader;
 		this.queryParameters = queryParameters;
 		this.types = types;
-		this.holderInstantiator = holderInstantiator!=null && holderInstantiator.isRequired()
-		        ? holderInstantiator
-		        : null;
+		this.holderInstantiator = holderInstantiator != null && holderInstantiator.isRequired()
+				? holderInstantiator
+				: null;
 	}
 
 	protected abstract Object[] getCurrentRow();
@@ -123,7 +117,7 @@ public abstract class AbstractScrollableResults implements ScrollableResults {
 		try {
 			session.getPersistenceContext().getLoadContexts().cleanup( resultSet );
 		}
-		catch( Throwable ignore ) {
+		catch (Throwable ignore) {
 			// ignore this error for now
 			if ( LOG.isTraceEnabled() ) {
 				LOG.tracev( "Exception trying to cleanup load context : {0}", ignore.getMessage() );
@@ -150,15 +144,15 @@ public abstract class AbstractScrollableResults implements ScrollableResults {
 	 * @param returnType a "final" type
 	 */
 	protected final Object getFinal(int col, Type returnType) throws HibernateException {
-		if ( holderInstantiator!=null ) {
-			throw new HibernateException("query specifies a holder class");
+		if ( holderInstantiator != null ) {
+			throw new HibernateException( "query specifies a holder class" );
 		}
 
-		if ( returnType.getReturnedClass()==types[col].getReturnedClass() ) {
-			return get(col);
+		if ( returnType.getReturnedClass() == types[col].getReturnedClass() ) {
+			return get( col );
 		}
 		else {
-			return throwInvalidColumnTypeException(col, types[col], returnType);
+			return throwInvalidColumnTypeException( col, types[col], returnType );
 		}
 	}
 
@@ -171,111 +165,111 @@ public abstract class AbstractScrollableResults implements ScrollableResults {
 	 * @param returnType any type
 	 */
 	protected final Object getNonFinal(int col, Type returnType) throws HibernateException {
-		if ( holderInstantiator!=null ) {
-			throw new HibernateException("query specifies a holder class");
+		if ( holderInstantiator != null ) {
+			throw new HibernateException( "query specifies a holder class" );
 		}
 
 		if ( returnType.getReturnedClass().isAssignableFrom( types[col].getReturnedClass() ) ) {
-			return get(col);
+			return get( col );
 		}
 		else {
-			return throwInvalidColumnTypeException(col, types[col], returnType);
+			return throwInvalidColumnTypeException( col, types[col], returnType );
 		}
 	}
 
 	@Override
 	public final BigDecimal getBigDecimal(int col) throws HibernateException {
-		return (BigDecimal) getFinal(col, StandardBasicTypes.BIG_DECIMAL);
+		return (BigDecimal) getFinal( col, StandardBasicTypes.BIG_DECIMAL );
 	}
 
 	@Override
 	public final BigInteger getBigInteger(int col) throws HibernateException {
-		return (BigInteger) getFinal(col, StandardBasicTypes.BIG_INTEGER);
+		return (BigInteger) getFinal( col, StandardBasicTypes.BIG_INTEGER );
 	}
 
 	@Override
 	public final byte[] getBinary(int col) throws HibernateException {
-		return (byte[]) getFinal(col, StandardBasicTypes.BINARY);
+		return (byte[]) getFinal( col, StandardBasicTypes.BINARY );
 	}
 
 	@Override
 	public final String getText(int col) throws HibernateException {
-		return (String) getFinal(col, StandardBasicTypes.TEXT);
+		return (String) getFinal( col, StandardBasicTypes.TEXT );
 	}
 
 	@Override
 	public final Blob getBlob(int col) throws HibernateException {
-		return (Blob) getNonFinal(col, StandardBasicTypes.BLOB);
+		return (Blob) getNonFinal( col, StandardBasicTypes.BLOB );
 	}
 
 	@Override
 	public final Clob getClob(int col) throws HibernateException {
-		return (Clob) getNonFinal(col, StandardBasicTypes.CLOB);
+		return (Clob) getNonFinal( col, StandardBasicTypes.CLOB );
 	}
 
 	@Override
 	public final Boolean getBoolean(int col) throws HibernateException {
-		return (Boolean) getFinal(col, StandardBasicTypes.BOOLEAN);
+		return (Boolean) getFinal( col, StandardBasicTypes.BOOLEAN );
 	}
 
 	@Override
 	public final Byte getByte(int col) throws HibernateException {
-		return (Byte) getFinal(col, StandardBasicTypes.BYTE);
+		return (Byte) getFinal( col, StandardBasicTypes.BYTE );
 	}
 
 	@Override
 	public final Character getCharacter(int col) throws HibernateException {
-		return (Character) getFinal(col, StandardBasicTypes.CHARACTER);
+		return (Character) getFinal( col, StandardBasicTypes.CHARACTER );
 	}
 
 	@Override
 	public final Date getDate(int col) throws HibernateException {
-		return (Date) getNonFinal(col, StandardBasicTypes.TIMESTAMP);
+		return (Date) getNonFinal( col, StandardBasicTypes.TIMESTAMP );
 	}
 
 	@Override
 	public final Calendar getCalendar(int col) throws HibernateException {
-		return (Calendar) getNonFinal(col, StandardBasicTypes.CALENDAR);
+		return (Calendar) getNonFinal( col, StandardBasicTypes.CALENDAR );
 	}
 
 	@Override
 	public final Double getDouble(int col) throws HibernateException {
-		return (Double) getFinal(col, StandardBasicTypes.DOUBLE);
+		return (Double) getFinal( col, StandardBasicTypes.DOUBLE );
 	}
 
 	@Override
 	public final Float getFloat(int col) throws HibernateException {
-		return (Float) getFinal(col, StandardBasicTypes.FLOAT);
+		return (Float) getFinal( col, StandardBasicTypes.FLOAT );
 	}
 
 	@Override
 	public final Integer getInteger(int col) throws HibernateException {
-		return (Integer) getFinal(col, StandardBasicTypes.INTEGER);
+		return (Integer) getFinal( col, StandardBasicTypes.INTEGER );
 	}
 
 	@Override
 	public final Long getLong(int col) throws HibernateException {
-		return (Long) getFinal(col, StandardBasicTypes.LONG);
+		return (Long) getFinal( col, StandardBasicTypes.LONG );
 	}
 
 	@Override
 	public final Short getShort(int col) throws HibernateException {
-		return (Short) getFinal(col, StandardBasicTypes.SHORT);
+		return (Short) getFinal( col, StandardBasicTypes.SHORT );
 	}
 
 	@Override
 	public final String getString(int col) throws HibernateException {
-		return (String) getFinal(col, StandardBasicTypes.STRING);
+		return (String) getFinal( col, StandardBasicTypes.STRING );
 	}
 
 	@Override
 	public final Locale getLocale(int col) throws HibernateException {
-		return (Locale) getFinal(col, StandardBasicTypes.LOCALE);
+		return (Locale) getFinal( col, StandardBasicTypes.LOCALE );
 	}
 
 	@Override
 	public final TimeZone getTimeZone(int col) throws HibernateException {
-		return (TimeZone) getNonFinal(col, StandardBasicTypes.TIMEZONE);
+		return (TimeZone) getNonFinal( col, StandardBasicTypes.TIMEZONE );
 	}
 
 	@Override
@@ -284,14 +278,14 @@ public abstract class AbstractScrollableResults implements ScrollableResults {
 	}
 
 	private Object throwInvalidColumnTypeException(
-	        int i,
-	        Type type,
-	        Type returnType) throws HibernateException {
+			int i,
+			Type type,
+			Type returnType) throws HibernateException {
 		throw new HibernateException(
 				"incompatible column types: " +
-				type.getName() +
-				", " +
-				returnType.getName()
+						type.getName() +
+						", " +
+						returnType.getName()
 		);
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
index 0d96d4800a..e5f6e4894d 100755
--- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java
@@ -105,6 +105,7 @@ public abstract class AbstractSessionImpl
 		}
 	}
 
+	@Override
 	public SessionFactoryImplementor getFactory() {
 		return factory;
 	}
@@ -208,8 +209,8 @@ public abstract class AbstractSessionImpl
 		}
 		Query query = new SQLQueryImpl(
 				nsqlqd,
-		        this,
-		        factory.getQueryPlanCache().getSQLParameterMetadata( nsqlqd.getQueryString() )
+				this,
+				factory.getQueryPlanCache().getSQLParameterMetadata( nsqlqd.getQueryString() )
 		);
 		query.setComment( "named native SQL query " + queryName );
 		initQuery( query, nsqlqd );
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java
index e54da177b2..7dd2ef6375 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/CacheImpl.java
@@ -44,16 +44,12 @@ import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.pretty.MessageHelper;
 
-import org.jboss.logging.Logger;
-
 /**
  * @author Strong Liu <stliu@hibernate.org>
  */
 public class CacheImpl implements CacheImplementor {
-	private static final CoreMessageLogger LOG = Logger.getMessageLogger(
-			CoreMessageLogger.class,
-			CacheImpl.class.getName()
-	);
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( CacheImpl.class );
+
 	private final SessionFactoryImplementor sessionFactory;
 	private final SessionFactoryOptions settings;
 	private final transient QueryCache queryCache;
@@ -231,10 +227,10 @@ public class CacheImpl implements CacheImplementor {
 
 	@Override
 	public void evictDefaultQueryRegion() {
-		if ( sessionFactory.getSettings().isQueryCacheEnabled() ) {
-            if ( LOG.isDebugEnabled() ) {
-                LOG.debug( "Evicting default query region cache." );
-            }
+		if ( sessionFactory.getSessionFactoryOptions().isQueryCacheEnabled() ) {
+			if ( LOG.isDebugEnabled() ) {
+				LOG.debug( "Evicting default query region cache." );
+			}
 			sessionFactory.getQueryCache().clear();
 		}
 	}
@@ -246,13 +242,13 @@ public class CacheImpl implements CacheImplementor {
 					"Region-name cannot be null (use Cache#evictDefaultQueryRegion to evict the default query cache)"
 			);
 		}
-		if ( sessionFactory.getSettings().isQueryCacheEnabled() ) {
+		if ( sessionFactory.getSessionFactoryOptions().isQueryCacheEnabled() ) {
 			QueryCache namedQueryCache = queryCaches.get( regionName );
 			// TODO : cleanup entries in queryCaches + allCacheRegions ?
 			if ( namedQueryCache != null ) {
-                if ( LOG.isDebugEnabled() ) {
-                    LOG.debugf( "Evicting query cache, region: %s", regionName );
-                }
+				if ( LOG.isDebugEnabled() ) {
+					LOG.debugf( "Evicting query cache, region: %s", regionName );
+				}
 				namedQueryCache.clear();
 			}
 		}
@@ -261,13 +257,13 @@ public class CacheImpl implements CacheImplementor {
 	@Override
 	public void evictQueryRegions() {
 		evictDefaultQueryRegion();
-		
+
 		if ( CollectionHelper.isEmpty( queryCaches ) ) {
 			return;
 		}
-        if ( LOG.isDebugEnabled() ) {
-            LOG.debug( "Evicting cache of all query regions." );
-        }
+		if ( LOG.isDebugEnabled() ) {
+			LOG.debug( "Evicting cache of all query regions." );
+		}
 		for ( QueryCache queryCache : queryCaches.values() ) {
 			queryCache.clear();
 		}
@@ -278,9 +274,7 @@ public class CacheImpl implements CacheImplementor {
 		if ( settings.isQueryCacheEnabled() ) {
 			queryCache.destroy();
 
-			Iterator iter = queryCaches.values().iterator();
-			while ( iter.hasNext() ) {
-				QueryCache cache = (QueryCache) iter.next();
+			for ( QueryCache cache : queryCaches.values() ) {
 				cache.destroy();
 			}
 			updateTimestampsCache.destroy();
@@ -306,7 +300,7 @@ public class CacheImpl implements CacheImplementor {
 
 		QueryCache currentQueryCache = queryCaches.get( regionName );
 		if ( currentQueryCache == null ) {
-			synchronized ( allCacheRegions ) {
+			synchronized (allCacheRegions) {
 				currentQueryCache = queryCaches.get( regionName );
 				if ( currentQueryCache == null ) {
 					currentQueryCache = settings.getQueryCacheFactory()
@@ -354,17 +348,17 @@ public class CacheImpl implements CacheImplementor {
 		return allCacheRegions.get( regionName );
 	}
 
-	@SuppressWarnings({ "unchecked" })
+	@SuppressWarnings({"unchecked"})
 	@Override
 	public Map<String, Region> getAllSecondLevelCacheRegions() {
-		return new HashMap<String,Region>( allCacheRegions );
+		return new HashMap<String, Region>( allCacheRegions );
 	}
 
 	@Override
 	public RegionFactory getRegionFactory() {
 		return regionFactory;
 	}
-	
+
 	@Override
 	public void evictAllRegions() {
 		evictCollectionRegions();
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CollectionFilterImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/CollectionFilterImpl.java
index e035662414..ad9f38ef0e 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/CollectionFilterImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/CollectionFilterImpl.java
@@ -20,9 +20,9 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.internal;
+
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -35,6 +35,7 @@ import org.hibernate.type.Type;
 
 /**
  * implementation of the <tt>Query</tt> interface for collection filters
+ *
  * @author Gavin King
  */
 public class CollectionFilterImpl extends QueryImpl {
@@ -43,9 +44,9 @@ public class CollectionFilterImpl extends QueryImpl {
 
 	public CollectionFilterImpl(
 			String queryString,
-	        Object collection,
-	        SessionImplementor session,
-	        ParameterMetadata parameterMetadata) {
+			Object collection,
+			SessionImplementor session,
+			ParameterMetadata parameterMetadata) {
 		super( queryString, session, parameterMetadata );
 		this.collection = collection;
 	}
@@ -57,10 +58,10 @@ public class CollectionFilterImpl extends QueryImpl {
 	public Iterator iterate() throws HibernateException {
 		verifyParameters();
 		Map namedParams = getNamedParams();
-		return getSession().iterateFilter( 
-				collection, 
-				expandParameterLists(namedParams),
-				getQueryParameters(namedParams) 
+		return getSession().iterateFilter(
+				collection,
+				expandParameterLists( namedParams ),
+				getQueryParameters( namedParams )
 		);
 	}
 
@@ -70,10 +71,10 @@ public class CollectionFilterImpl extends QueryImpl {
 	public List list() throws HibernateException {
 		verifyParameters();
 		Map namedParams = getNamedParams();
-		return getSession().listFilter( 
-				collection, 
-				expandParameterLists(namedParams),
-				getQueryParameters(namedParams) 
+		return getSession().listFilter(
+				collection,
+				expandParameterLists( namedParams ),
+				getQueryParameters( namedParams )
 		);
 	}
 
@@ -81,15 +82,15 @@ public class CollectionFilterImpl extends QueryImpl {
 	 * @see org.hibernate.Query#scroll()
 	 */
 	public ScrollableResults scroll() throws HibernateException {
-		throw new UnsupportedOperationException("Can't scroll filters");
+		throw new UnsupportedOperationException( "Can't scroll filters" );
 	}
 
 	public Type[] typeArray() {
 		List typeList = getTypes();
 		int size = typeList.size();
-		Type[] result = new Type[size+1];
-		for (int i=0; i<size; i++) {
-			result[i+1] = (Type) typeList.get(i);
+		Type[] result = new Type[size + 1];
+		for ( int i = 0; i < size; i++ ) {
+			result[i + 1] = (Type) typeList.get( i );
 		}
 		return result;
 	}
@@ -97,9 +98,9 @@ public class CollectionFilterImpl extends QueryImpl {
 	public Object[] valueArray() {
 		List valueList = getValues();
 		int size = valueList.size();
-		Object[] result = new Object[size+1];
-		for (int i=0; i<size; i++) {
-			result[i+1] = valueList.get(i);
+		Object[] result = new Object[size + 1];
+		for ( int i = 0; i < size; i++ ) {
+			result[i + 1] = valueList.get( i );
 		}
 		return result;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
index 5d0daef85e..42022c2422 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java
@@ -102,8 +102,7 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "I/O reported cached file could not be found : %s : %s", id = 23)
-	void cachedFileNotFound(String path,
-							FileNotFoundException error);
+	void cachedFileNotFound(String path, FileNotFoundException error);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Cache provider: %s", id = 24)
@@ -216,8 +215,7 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "DEPRECATED : use [%s] instead with custom [%s] implementation", id = 65)
-	void deprecatedUuidGenerator(String name,
-								 String name2);
+	void deprecatedUuidGenerator(String name, String name2);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Disallowing insert statement comment for select-identity due to Oracle driver bug", id = 67)
@@ -233,8 +231,7 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "Duplicate import: %s -> %s", id = 71)
-	void duplicateImport(String entityName,
-						 String rename);
+	void duplicateImport(String entityName, String rename);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Duplicate joins for class: %s", id = 72)
@@ -283,13 +280,11 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "%s %s found", id = 85)
-	void exceptionHeaderFound(String exceptionHeader,
-							  String metaInfOrmXml);
+	void exceptionHeaderFound(String exceptionHeader, String metaInfOrmXml);
 
 	@LogMessage(level = INFO)
 	@Message(value = "%s No %s found", id = 86)
-	void exceptionHeaderNotFound(String exceptionHeader,
-								 String metaInfOrmXml);
+	void exceptionHeaderNotFound(String exceptionHeader, String metaInfOrmXml);
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Exception in interceptor afterTransactionCompletion()", id = 87)
@@ -306,7 +301,7 @@ public interface CoreMessageLogger extends BasicLogger {
 	@LogMessage(level = ERROR)
 	@Message(value = "Expected type: %s, actual value: %s", id = 91)
 	void expectedType(String name,
-					  String string);
+			String string);
 
 	@LogMessage(level = WARN)
 	@Message(value = "An item was expired by the cache while it was locked (increase your cache timeout): %s", id = 92)
@@ -372,8 +367,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Getters of lazy classes cannot be final: %s.%s", id = 112)
-	void gettersOfLazyClassesCannotBeFinal(String entityName,
-										   String name);
+	void gettersOfLazyClassesCannotBeFinal(
+			String entityName,
+			String name);
 
 	@LogMessage(level = WARN)
 	@Message(value = "GUID identifier generated: %s", id = 113)
@@ -389,15 +385,17 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Config specified explicit optimizer of [%s], but [%s=%s; honoring optimizer setting", id = 116)
-	void honoringOptimizerSetting(String none,
-								  String incrementParam,
-								  int incrementSize);
+	void honoringOptimizerSetting(
+			String none,
+			String incrementParam,
+			int incrementSize);
 
 	@LogMessage(level = DEBUG)
 	@Message(value = "HQL: %s, time: %sms, rows: %s", id = 117)
-	void hql(String hql,
-			 Long valueOf,
-			 Long valueOf2);
+	void hql(
+			String hql,
+			Long valueOf,
+			Long valueOf2);
 
 	@LogMessage(level = WARN)
 	@Message(value = "HSQLDB supports only READ_UNCOMMITTED isolation", id = 118)
@@ -417,13 +415,15 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "IllegalArgumentException in class: %s, getter method of property: %s", id = 122)
-	void illegalPropertyGetterArgument(String name,
-									   String propertyName);
+	void illegalPropertyGetterArgument(
+			String name,
+			String propertyName);
 
 	@LogMessage(level = ERROR)
 	@Message(value = "IllegalArgumentException in class: %s, setter method of property: %s", id = 123)
-	void illegalPropertySetterArgument(String name,
-									   String propertyName);
+	void illegalPropertySetterArgument(
+			String name,
+			String propertyName);
 
 	@LogMessage(level = WARN)
 	@Message(value = "@Immutable used on a non root entity: ignored for %s", id = 124)
@@ -460,8 +460,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Invalid JNDI name: %s", id = 135)
-	void invalidJndiName(String name,
-						 @Cause JndiNameException e);
+	void invalidJndiName(
+			String name,
+			@Cause JndiNameException e);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Inapropriate use of @OnDelete on entity, annotation ignored: %s", id = 136)
@@ -486,9 +487,10 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "java.sql.Types mapped the same code [%s] multiple times; was [%s]; now [%s]", id = 141)
-	void JavaSqlTypesMappedSameCodeMultipleTimes(int code,
-												 String old,
-												 String name);
+	void JavaSqlTypesMappedSameCodeMultipleTimes(
+			int code,
+			String old,
+			String name);
 
 	@Message(value = "Javassist Enhancement failed: %s", id = 142)
 	String javassistEnhancementFailed(String entityName);
@@ -517,8 +519,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "JNDI name %s does not handle a session factory reference", id = 155)
-	void jndiNameDoesNotHandleSessionFactoryReference(String sfJNDIName,
-													  @Cause ClassCastException e);
+	void jndiNameDoesNotHandleSessionFactoryReference(
+			String sfJNDIName,
+			@Cause ClassCastException e);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Lazy property fetching available for: %s", id = 157)
@@ -551,8 +554,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Function template anticipated %s arguments, but %s arguments encountered", id = 174)
-	void missingArguments(int anticipatedNumberOfArguments,
-						  int numberOfArguments);
+	void missingArguments(
+			int anticipatedNumberOfArguments,
+			int numberOfArguments);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Class annotated @org.hibernate.annotations.Entity but not javax.persistence.Entity (most likely a user error): %s",
@@ -562,8 +566,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Error in named query: %s", id = 177)
-	void namedQueryError(String queryName,
-						 @Cause HibernateException e);
+	void namedQueryError(
+			String queryName,
+			@Cause HibernateException e);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Naming exception occurred accessing factory: %s", id = 178)
@@ -593,8 +598,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "No session factory with JNDI name %s", id = 184)
-	void noSessionFactoryWithJndiName(String sfJNDIName,
-									  @Cause NameNotFoundException e);
+	void noSessionFactoryWithJndiName(
+			String sfJNDIName,
+			@Cause NameNotFoundException e);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Optimistic lock failures: %s", id = 187)
@@ -618,25 +624,29 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Error parsing XML (%s) : %s", id = 196)
-	void parsingXmlError(int lineNumber,
-						 String message);
+	void parsingXmlError(
+			int lineNumber,
+			String message);
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Error parsing XML: %s(%s) %s", id = 197)
-	void parsingXmlErrorForFile(String file,
-								int lineNumber,
-								String message);
+	void parsingXmlErrorForFile(
+			String file,
+			int lineNumber,
+			String message);
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Warning parsing XML (%s) : %s", id = 198)
-	void parsingXmlWarning(int lineNumber,
-						   String message);
+	void parsingXmlWarning(
+			int lineNumber,
+			String message);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Warning parsing XML: %s(%s) %s", id = 199)
-	void parsingXmlWarningForFile(String file,
-								  int lineNumber,
-								  String message);
+	void parsingXmlWarningForFile(
+			String file,
+			int lineNumber,
+			String message);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Persistence provider caller does not implement the EJB3 spec correctly."
@@ -674,8 +684,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "%s has been deprecated in favor of %s; that provider will be used instead.", id = 208)
-	void providerClassDeprecated(String providerClassName,
-								 String actualProviderClassName);
+	void providerClassDeprecated(
+			String providerClassName,
+			String actualProviderClassName);
 
 	@LogMessage(level = WARN)
 	@Message(value = "proxool properties were encountered, but the %s provider class was not found on the classpath; these properties are going to be ignored.",
@@ -721,13 +732,15 @@ public interface CoreMessageLogger extends BasicLogger {
 	@LogMessage(level = WARN)
 	@Message(value = "Recognized obsolete hibernate namespace %s. Use namespace %s instead. Refer to Hibernate 3.6 Migration Guide!",
 			id = 223)
-	void recognizedObsoleteHibernateNamespace(String oldHibernateNamespace,
-											  String hibernateNamespace);
+	void recognizedObsoleteHibernateNamespace(
+			String oldHibernateNamespace,
+			String hibernateNamespace);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Property [%s] has been renamed to [%s]; update your properties appropriately", id = 225)
-	void renamedProperty(Object propertyName,
-						 Object newPropertyName);
+	void renamedProperty(
+			Object propertyName,
+			Object newPropertyName);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Required a different provider: %s", id = 226)
@@ -759,8 +772,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Scoping types to session factory %s after already scoped %s", id = 233)
-	void scopingTypesToSessionFactoryAfterAlreadyScoped(SessionFactoryImplementor factory,
-														SessionFactoryImplementor factory2);
+	void scopingTypesToSessionFactoryAfterAlreadyScoped(
+			SessionFactoryImplementor factory,
+			SessionFactoryImplementor factory2);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Searching for mapping documents in jar: %s", id = 235)
@@ -792,8 +806,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Setters of lazy classes cannot be final: %s.%s", id = 243)
-	void settersOfLazyClassesCannotBeFinal(String entityName,
-										   String name);
+	void settersOfLazyClassesCannotBeFinal(
+			String entityName,
+			String name);
 
 	@LogMessage(level = WARN)
 	@Message(value = "@Sort not allowed for an indexed collection, annotation ignored.", id = 244)
@@ -801,8 +816,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Manipulation query [%s] resulted in [%s] split queries", id = 245)
-	void splitQueries(String sourceQuery,
-					  int length);
+	void splitQueries(
+			String sourceQuery,
+			int length);
 
 //	@LogMessage(level = ERROR)
 //	@Message(value = "SQLException escaped proxy", id = 246)
@@ -810,8 +826,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "SQL Error: %s, SQLState: %s", id = 247)
-	void sqlWarning(int errorCode,
-					String sqlState);
+	void sqlWarning(
+			int errorCode,
+			String sqlState);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Starting query cache at region: %s", id = 248)
@@ -855,8 +872,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Exception calling user Synchronization [%s] : %s", id = 260)
-	void synchronizationFailed(Synchronization synchronization,
-							   Throwable t);
+	void synchronizationFailed(
+			Synchronization synchronization,
+			Throwable t);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Table found: %s", id = 261)
@@ -888,8 +906,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "Type registration [%s] overrides previous : %s", id = 270)
-	void typeRegistrationOverridesPrevious(String key,
-										   Type old);
+	void typeRegistrationOverridesPrevious(
+			String key,
+			Type old);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Naming exception occurred accessing Ejb3Configuration", id = 271)
@@ -897,8 +916,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Error while accessing session factory with JNDI name %s", id = 272)
-	void unableToAccessSessionFactory(String sfJNDIName,
-									  @Cause NamingException e);
+	void unableToAccessSessionFactory(
+			String sfJNDIName,
+			@Cause NamingException e);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Error accessing type info result set : %s", id = 273)
@@ -906,8 +926,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Unable to apply constraints on DDL for %s", id = 274)
-	void unableToApplyConstraints(String className,
-								  @Cause Exception e);
+	void unableToApplyConstraints(
+			String className,
+			@Cause Exception e);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Could not bind Ejb3Configuration to JNDI", id = 276)
@@ -919,9 +940,10 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "Could not bind value '%s' to parameter: %s; %s", id = 278)
-	void unableToBindValueToParameter(String nullSafeToString,
-									  int index,
-									  String message);
+	void unableToBindValueToParameter(
+			String nullSafeToString,
+			int index,
+			String message);
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Unable to build enhancement metamodel for %s", id = 279)
@@ -954,8 +976,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Error closing input files: %s", id = 286)
-	void unableToCloseInputFiles(String name,
-								 @Cause IOException e);
+	void unableToCloseInputFiles(
+			String name,
+			@Cause IOException e);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Could not close input stream", id = 287)
@@ -963,8 +986,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Could not close input stream for %s", id = 288)
-	void unableToCloseInputStreamForResource(String resourceName,
-											 @Cause IOException e);
+	void unableToCloseInputStreamForResource(
+			String resourceName,
+			@Cause IOException e);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Unable to close iterator", id = 289)
@@ -976,8 +1000,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Error closing output file: %s", id = 291)
-	void unableToCloseOutputFile(String outputFile,
-								 @Cause IOException e);
+	void unableToCloseOutputFile(
+			String outputFile,
+			@Cause IOException e);
 
 	@LogMessage(level = WARN)
 	@Message(value = "IOException occurred closing output stream", id = 292)
@@ -1020,8 +1045,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Unable to construct current session context [%s]", id = 302)
-	void unableToConstructCurrentSessionContext(String impl,
-												@Cause Throwable e);
+	void unableToConstructCurrentSessionContext(
+			String impl,
+			@Cause Throwable e);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Unable to construct instance of specified SQLExceptionConverter : %s", id = 303)
@@ -1033,8 +1059,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Could not create proxy factory for:%s", id = 305)
-	void unableToCreateProxyFactory(String entityName,
-									@Cause HibernateException e);
+	void unableToCreateProxyFactory(
+			String entityName,
+			@Cause HibernateException e);
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Error creating schema ", id = 306)
@@ -1042,8 +1069,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Could not deserialize cache file: %s : %s", id = 307)
-	void unableToDeserializeCache(String path,
-								  SerializationException error);
+	void unableToDeserializeCache(
+			String path,
+			SerializationException error);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Unable to destroy cache: %s", id = 308)
@@ -1051,18 +1079,21 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Unable to destroy query cache: %s: %s", id = 309)
-	void unableToDestroyQueryCache(String region,
-								   String message);
+	void unableToDestroyQueryCache(
+			String region,
+			String message);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Unable to destroy update timestamps cache: %s: %s", id = 310)
-	void unableToDestroyUpdateTimestampsCache(String region,
-											  String message);
+	void unableToDestroyUpdateTimestampsCache(
+			String region,
+			String message);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Unable to determine lock mode value : %s -> %s", id = 311)
-	void unableToDetermineLockModeValue(String hintName,
-										Object value);
+	void unableToDetermineLockModeValue(
+			String hintName,
+			Object value);
 
 	@Message(value = "Could not determine transaction status", id = 312)
 	String unableToDetermineTransactionStatus();
@@ -1080,8 +1111,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Error executing resolver [%s] : %s", id = 316)
-	void unableToExecuteResolver(DialectResolver abstractDialectResolver,
-								 String message);
+	void unableToExecuteResolver(
+			DialectResolver abstractDialectResolver,
+			String message);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Could not find any META-INF/persistence.xml file in the classpath", id = 318)
@@ -1093,8 +1125,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Unable to instantiate configured schema name resolver [%s] %s", id = 320)
-	void unableToInstantiateConfiguredSchemaNameResolver(String resolverClassName,
-														 String message);
+	void unableToInstantiateConfiguredSchemaNameResolver(
+			String resolverClassName,
+			String message);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Unable to interpret specified optimizer [%s], falling back to noop", id = 321)
@@ -1129,8 +1162,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Unable to locate configured schema name resolver class [%s] %s", id = 331)
-	void unableToLocateConfiguredSchemaNameResolver(String resolverClassName,
-													String message);
+	void unableToLocateConfiguredSchemaNameResolver(
+			String resolverClassName,
+			String message);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Unable to locate MBeanServer on JMX service shutdown", id = 332)
@@ -1196,8 +1230,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "Could not read column value from result set: %s; %s", id = 349)
-	void unableToReadColumnValueFromResultSet(String name,
-											  String message);
+	void unableToReadColumnValueFromResultSet(
+			String name,
+			String message);
 
 	@Message(value = "Could not read a hi value - you need to populate the table: %s", id = 350)
 	String unableToReadHiValue(String tableName);
@@ -1244,8 +1279,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "Unable to retreive cache from JNDI [%s]: %s", id = 361)
-	void unableToRetrieveCache(String namespace,
-							   String message);
+	void unableToRetrieveCache(
+			String namespace,
+			String message);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Unable to retrieve type info result set : %s", id = 362)
@@ -1257,8 +1293,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "Unable to rollback isolated transaction on error [%s] : [%s]", id = 364)
-	void unableToRollbackIsolatedTransaction(Exception e,
-											 Exception ignore);
+	void unableToRollbackIsolatedTransaction(
+			Exception e,
+			Exception ignore);
 
 	@Message(value = "JTA rollback failed", id = 365)
 	String unableToRollbackJta();
@@ -1277,8 +1314,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "Error stopping service [%s] : %s", id = 369)
-	void unableToStopService(Class class1,
-							 String string);
+	void unableToStopService(
+			Class class1,
+			String string);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Exception switching from method: [%s] to a method using the column index. Reverting to using: [%<s]",
@@ -1306,8 +1344,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = ERROR)
 	@Message(value = "Could not updateQuery hi value in: %s", id = 376)
-	void unableToUpdateQueryHiValue(String tableName,
-									@Cause SQLException e);
+	void unableToUpdateQueryHiValue(
+			String tableName,
+			@Cause SQLException e);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Error wrapping result set", id = 377)
@@ -1315,8 +1354,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "I/O reported error writing cached file : %s: %s", id = 378)
-	void unableToWriteCachedFile(String path,
-								 String message);
+	void unableToWriteCachedFile(
+			String path,
+			String message);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Unexpected literal token type [%s] passed for numeric processing", id = 380)
@@ -1375,9 +1415,10 @@ public interface CoreMessageLogger extends BasicLogger {
 	@LogMessage(level = WARN)
 	@Message(value = "The %s.%s.%s version of H2 implements temporary table creation such that it commits current transaction; multi-table, bulk hql/jpaql will not work properly",
 			id = 393)
-	void unsupportedMultiTableBulkHqlJpaql(int majorVersion,
-										   int minorVersion,
-										   int buildId);
+	void unsupportedMultiTableBulkHqlJpaql(
+			int majorVersion,
+			int minorVersion,
+			int buildId);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Oracle 11g is not yet fully supported; using Oracle 10g dialect", id = 394)
@@ -1385,8 +1426,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = WARN)
 	@Message(value = "Usage of obsolete property: %s no longer supported, use: %s", id = 395)
-	void unsupportedProperty(Object propertyName,
-							 Object newPropertyName);
+	void unsupportedProperty(
+			Object propertyName,
+			Object newPropertyName);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Updating schema", id = 396)
@@ -1398,9 +1440,10 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "Explicit segment value for id generator [%s.%s] suggested; using default [%s]", id = 398)
-	void usingDefaultIdGeneratorSegmentValue(String tableName,
-											 String segmentColumnName,
-											 String defaultToUse);
+	void usingDefaultIdGeneratorSegmentValue(
+			String tableName,
+			String segmentColumnName,
+			String defaultToUse);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Using default transaction strategy (direct JDBC transactions)", id = 399)
@@ -1412,8 +1455,9 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "using driver [%s] at URL [%s]", id = 401)
-	void usingDriver(String driverClassName,
-					 String url);
+	void usingDriver(
+			String driverClassName,
+			String url);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Using Hibernate built-in connection pool (not for production use!)", id = 402)
@@ -1438,8 +1482,9 @@ public interface CoreMessageLogger extends BasicLogger {
 	@LogMessage(level = WARN)
 	@Message(value = "Using %s which does not generate IETF RFC 4122 compliant UUID values; consider using %s instead",
 			id = 409)
-	void usingUuidHexGenerator(String name,
-							   String name2);
+	void usingUuidHexGenerator(
+			String name,
+			String name2);
 
 	@LogMessage(level = INFO)
 	@Message(value = "Hibernate Validator not found: ignoring", id = 410)
@@ -1468,16 +1513,18 @@ public interface CoreMessageLogger extends BasicLogger {
 
 	@LogMessage(level = INFO)
 	@Message(value = "Adding override for %s: %s", id = 418)
-	void addingOverrideFor(String name,
-						   String name2);
+	void addingOverrideFor(
+			String name,
+			String name2);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Resolved SqlTypeDescriptor is for a different SQL code. %s has sqlCode=%s; type override %s has sqlCode=%s",
 			id = 419)
-	void resolvedSqlTypeDescriptorForDifferentSqlCode(String name,
-													  String valueOf,
-													  String name2,
-													  String valueOf2);
+	void resolvedSqlTypeDescriptorForDifferentSqlCode(
+			String name,
+			String valueOf,
+			String name2,
+			String valueOf2);
 
 	@LogMessage(level = DEBUG)
 	@Message(value = "Closing un-released batch", id = 420)
@@ -1518,8 +1565,9 @@ public interface CoreMessageLogger extends BasicLogger {
 	@LogMessage(level = INFO)
 	@Message(value = "Encountered legacy TransactionManagerLookup specified; convert to newer %s contract specified via %s setting",
 			id = 428)
-	void legacyTransactionManagerStrategy(String name,
-										  String jtaPlatform);
+	void legacyTransactionManagerStrategy(
+			String name,
+			String jtaPlatform);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Setting entity-identifier value binding where one already existed : %s.", id = 429)
@@ -1551,16 +1599,17 @@ public interface CoreMessageLogger extends BasicLogger {
 	void timestampCacheMisses(long updateTimestampsCachePutCount);
 
 	@LogMessage(level = WARN)
-	@Message(value = "Entity manager factory name (%s) is already registered.  If entity manager will be clustered "+
+	@Message(value = "Entity manager factory name (%s) is already registered.  If entity manager will be clustered " +
 			"or passivated, specify a unique value for property '%s'", id = 436)
 	void entityManagerFactoryAlreadyRegistered(String emfName, String propertyName);
 
 	@LogMessage(level = WARN)
 	@Message(value = "Attempting to save one or more entities that have a non-nullable association with an unsaved transient entity. The unsaved transient entity must be saved in an operation prior to saving these dependent entities.\n" +
-			"\tUnsaved transient entity: (%s)\n\tDependent entities: (%s)\n\tNon-nullable association(s): (%s)" , id = 437)
-	void cannotResolveNonNullableTransientDependencies(String transientEntityString,
-													   Set<String> dependentEntityStrings,
-													   Set<String> nonNullableAssociationPaths);
+			"\tUnsaved transient entity: (%s)\n\tDependent entities: (%s)\n\tNon-nullable association(s): (%s)", id = 437)
+	void cannotResolveNonNullableTransientDependencies(
+			String transientEntityString,
+			Set<String> dependentEntityStrings,
+			Set<String> nonNullableAssociationPaths);
 
 	@LogMessage(level = INFO)
 	@Message(value = "NaturalId cache puts: %s", id = 438)
@@ -1577,7 +1626,7 @@ public interface CoreMessageLogger extends BasicLogger {
 	@LogMessage(level = INFO)
 	@Message(value = "Max NaturalId query time: %sms", id = 441)
 	void naturalIdMaxQueryTime(long naturalIdQueryExecutionMaxTime);
-	
+
 	@LogMessage(level = INFO)
 	@Message(value = "NaturalId queries executed to database: %s", id = 442)
 	void naturalIdQueriesExecuted(long naturalIdQueriesExecutionCount);
@@ -1626,7 +1675,7 @@ public interface CoreMessageLogger extends BasicLogger {
 	void explicitSkipLockedLockCombo();
 
 	@LogMessage(level = INFO)
-	@Message( value = "'javax.persistence.validation.mode' named multiple values : %s", id = 448 )
+	@Message(value = "'javax.persistence.validation.mode' named multiple values : %s", id = 448)
 	void multipleValidationModes(String modes);
 
 	@LogMessage(level = WARN)
@@ -1651,11 +1700,11 @@ public interface CoreMessageLogger extends BasicLogger {
 					"delaying afterCompletion processing until the original thread can handle it. [status=%s]"
 	)
 	void rollbackFromBackgroundThread(int status);
-	
+
 	@LogMessage(level = WARN)
 	@Message(value = "Exception while loading a class or resource found during scanning", id = 452)
 	void unableToLoadScannedClassOrResource(@Cause Exception e);
-	
+
 	@LogMessage(level = WARN)
 	@Message(value = "Exception while discovering OSGi service implementations : %s", id = 453)
 	void unableToDiscoverOsgiService(String service, @Cause Exception e);
@@ -1689,7 +1738,7 @@ public interface CoreMessageLogger extends BasicLogger {
 					"(%2$s=true)"
 	)
 	void applyingExplicitDiscriminatorColumnForJoined(String className, String overrideSetting);
-	
+
 	// 458-466 reserved for use by master (ORM 5.0.0)
 
 	@LogMessage(level = DEBUG)
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CriteriaImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/CriteriaImpl.java
index f872b5c44c..3f5d5bbb13 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/CriteriaImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/CriteriaImpl.java
@@ -295,7 +295,8 @@ public class CriteriaImpl implements Criteria, Serializable {
 	public Integer getTimeout() {
 		return timeout;
 	}
-   @Override
+
+	@Override
 	public Criteria setTimeout(int timeout) {
 		this.timeout = timeout;
 		return this;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/DynamicFilterAliasGenerator.java b/hibernate-core/src/main/java/org/hibernate/internal/DynamicFilterAliasGenerator.java
index f2bb6dceca..345e55fddd 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/DynamicFilterAliasGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/DynamicFilterAliasGenerator.java
@@ -26,12 +26,9 @@ package org.hibernate.internal;
 import org.hibernate.persister.entity.AbstractEntityPersister;
 
 /**
- * 
  * @author Rob Worsnop
- *
  */
 public class DynamicFilterAliasGenerator implements FilterAliasGenerator {
-	
 	private String[] tables;
 	private String rootAlias;
 
@@ -42,10 +39,14 @@ public class DynamicFilterAliasGenerator implements FilterAliasGenerator {
 
 	@Override
 	public String getAlias(String table) {
-		if (table == null){
+		if ( table == null ) {
 			return rootAlias;
-		} else{
-			return AbstractEntityPersister.generateTableAlias(rootAlias, AbstractEntityPersister.getTableId(table, tables));
+		}
+		else {
+			return AbstractEntityPersister.generateTableAlias(
+					rootAlias,
+					AbstractEntityPersister.getTableId( table, tables )
+			);
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java
index 5036a7cfb2..b023cb01be 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java
@@ -56,18 +56,18 @@ public class FetchingScrollableResultsImpl extends AbstractScrollableResults {
 	 * @param holderInstantiator Ugh
 	 */
 	public FetchingScrollableResultsImpl(
-	        ResultSet rs,
-	        PreparedStatement ps,
-	        SessionImplementor sess,
-	        Loader loader,
-	        QueryParameters queryParameters,
-	        Type[] types,
-	        HolderInstantiator holderInstantiator) {
+			ResultSet rs,
+			PreparedStatement ps,
+			SessionImplementor sess,
+			Loader loader,
+			QueryParameters queryParameters,
+			Type[] types,
+			HolderInstantiator holderInstantiator) {
 		super( rs, ps, sess, loader, queryParameters, types, holderInstantiator );
 	}
 
 	@Override
-    protected Object[] getCurrentRow() {
+	protected Object[] getCurrentRow() {
 		return currentRow;
 	}
 
@@ -97,15 +97,15 @@ public class FetchingScrollableResultsImpl extends AbstractScrollableResults {
 		try {
 			afterLast = getResultSet().isAfterLast();
 		}
-		catch( SQLException e ) {
+		catch (SQLException e) {
 			throw getSession().getFactory().getSQLExceptionHelper().convert(
-			        e,
-			        "exception calling isAfterLast()"
+					e,
+					"exception calling isAfterLast()"
 			);
 		}
 
 		currentPosition++;
-		currentRow = new Object[] { row };
+		currentRow = new Object[] {row};
 
 		if ( afterLast ) {
 			if ( maxPosition == null ) {
@@ -132,10 +132,10 @@ public class FetchingScrollableResultsImpl extends AbstractScrollableResults {
 				getSession(),
 				getQueryParameters(),
 				false,
-		        ( maxPosition != null && currentPosition > maxPosition )
+				( maxPosition != null && currentPosition > maxPosition )
 		);
 
-		currentRow = new Object[] { loadResult };
+		currentRow = new Object[] {loadResult};
 		currentPosition--;
 
 		afterScrollOperation();
@@ -196,7 +196,7 @@ public class FetchingScrollableResultsImpl extends AbstractScrollableResults {
 					more = next();
 				}
 			}
-			catch( SQLException e ) {
+			catch (SQLException e) {
 				throw getSession().getFactory().getSQLExceptionHelper().convert(
 						e,
 						"exception calling isAfterLast()"
@@ -224,10 +224,10 @@ public class FetchingScrollableResultsImpl extends AbstractScrollableResults {
 		try {
 			getResultSet().beforeFirst();
 		}
-		catch( SQLException e ) {
+		catch (SQLException e) {
 			throw getSession().getFactory().getSQLExceptionHelper().convert(
-			        e,
-			        "exception calling beforeFirst()"
+					e,
+					"exception calling beforeFirst()"
 			);
 		}
 		currentRow = null;
@@ -274,12 +274,12 @@ public class FetchingScrollableResultsImpl extends AbstractScrollableResults {
 
 	private boolean isResultSetEmpty() {
 		try {
-			return currentPosition == 0 && ! getResultSet().isBeforeFirst() && ! getResultSet().isAfterLast();
+			return currentPosition == 0 && !getResultSet().isBeforeFirst() && !getResultSet().isAfterLast();
 		}
-		catch( SQLException e ) {
+		catch (SQLException e) {
 			throw getSession().getFactory().getSQLExceptionHelper().convert(
-			        e,
-			        "Could not determine if resultset is empty due to exception calling isBeforeFirst or isAfterLast()"
+					e,
+					"Could not determine if resultset is empty due to exception calling isBeforeFirst or isAfterLast()"
 			);
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FilterConfiguration.java b/hibernate-core/src/main/java/org/hibernate/internal/FilterConfiguration.java
index 7ae640910f..b8f80088b0 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FilterConfiguration.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FilterConfiguration.java
@@ -32,7 +32,6 @@ import org.hibernate.mapping.PersistentClass;
 import org.hibernate.persister.entity.Joinable;
 
 /**
- *
  * @author Rob Worsnop
  */
 public class FilterConfiguration {
@@ -42,8 +41,14 @@ public class FilterConfiguration {
 	private final Map<String, String> aliasTableMap;
 	private final Map<String, String> aliasEntityMap;
 	private final PersistentClass persistentClass;
-	
-	public FilterConfiguration(String name, String condition, boolean autoAliasInjection, Map<String, String> aliasTableMap, Map<String, String> aliasEntityMap, PersistentClass persistentClass) {
+
+	public FilterConfiguration(
+			String name,
+			String condition,
+			boolean autoAliasInjection,
+			Map<String, String> aliasTableMap,
+			Map<String, String> aliasEntityMap,
+			PersistentClass persistentClass) {
 		this.name = name;
 		this.condition = condition;
 		this.autoAliasInjection = autoAliasInjection;
@@ -65,28 +70,34 @@ public class FilterConfiguration {
 	}
 
 	public Map<String, String> getAliasTableMap(SessionFactoryImplementor factory) {
-		Map<String,String> mergedAliasTableMap = mergeAliasMaps(factory);
-		if (!mergedAliasTableMap.isEmpty()){
+		Map<String, String> mergedAliasTableMap = mergeAliasMaps( factory );
+		if ( !mergedAliasTableMap.isEmpty() ) {
 			return mergedAliasTableMap;
-		} else if (persistentClass != null){
-			String table = persistentClass.getTable().getQualifiedName(factory.getDialect(), 
+		}
+		else if ( persistentClass != null ) {
+			String table = persistentClass.getTable().getQualifiedName(
+					factory.getDialect(),
 					factory.getSettings().getDefaultCatalogName(),
-					factory.getSettings().getDefaultSchemaName());
-			return Collections.singletonMap(null, table);
-		} else{
+					factory.getSettings().getDefaultSchemaName()
+			);
+			return Collections.singletonMap( null, table );
+		}
+		else {
 			return Collections.emptyMap();
 		}
 	}
-	
-	private Map<String,String> mergeAliasMaps(SessionFactoryImplementor factory){
-		Map<String,String> ret = new HashMap<String, String>();
-		if (aliasTableMap != null){
-			ret.putAll(aliasTableMap);
+
+	private Map<String, String> mergeAliasMaps(SessionFactoryImplementor factory) {
+		Map<String, String> ret = new HashMap<String, String>();
+		if ( aliasTableMap != null ) {
+			ret.putAll( aliasTableMap );
 		}
-		if (aliasEntityMap != null){
-			for (Map.Entry<String, String> entry : aliasEntityMap.entrySet()){
-				ret.put(entry.getKey(), 
-						Joinable.class.cast(factory.getEntityPersister(entry.getValue())).getTableName());
+		if ( aliasEntityMap != null ) {
+			for ( Map.Entry<String, String> entry : aliasEntityMap.entrySet() ) {
+				ret.put(
+						entry.getKey(),
+						Joinable.class.cast( factory.getEntityPersister( entry.getValue() ) ).getTableName()
+				);
 			}
 		}
 		return ret;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FilterHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/FilterHelper.java
index 53430e878c..e98d71bc0a 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/FilterHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/FilterHelper.java
@@ -43,7 +43,7 @@ public class FilterHelper {
 	private final String[] filterNames;
 	private final String[] filterConditions;
 	private final boolean[] filterAutoAliasFlags;
-	private final Map<String,String>[] filterAliasTableMaps;
+	private final Map<String, String>[] filterAliasTableMaps;
 
 	/**
 	 * The map of defined filters.  This is expected to be in format
@@ -65,7 +65,7 @@ public class FilterHelper {
 			filterNames[filterCount] = filter.getName();
 			filterConditions[filterCount] = filter.getCondition();
 			filterAliasTableMaps[filterCount] = filter.getAliasTableMap( factory );
-			if ( (filterAliasTableMaps[filterCount].isEmpty() || isTableFromPersistentClass( filterAliasTableMaps[filterCount] )) && filter
+			if ( ( filterAliasTableMaps[filterCount].isEmpty() || isTableFromPersistentClass( filterAliasTableMaps[filterCount] ) ) && filter
 					.useAutoAliasInjection() ) {
 				filterConditions[filterCount] = Template.renderWhereStringTemplate(
 						filter.getCondition(),
@@ -83,9 +83,9 @@ public class FilterHelper {
 			filterCount++;
 		}
 	}
-	
-	private static boolean isTableFromPersistentClass(Map<String,String> aliasTableMap){
-		return aliasTableMap.size() == 1 && aliasTableMap.containsKey(null);
+
+	private static boolean isTableFromPersistentClass(Map<String, String> aliasTableMap) {
+		return aliasTableMap.size() == 1 && aliasTableMap.containsKey( null );
 	}
 
 	public boolean isAffectedBy(Map enabledFilters) {
@@ -116,17 +116,26 @@ public class FilterHelper {
 			}
 		}
 	}
-	
-	private String render(FilterAliasGenerator aliasGenerator, int filterIndex){
-		Map<String,String> aliasTableMap = filterAliasTableMaps[filterIndex];
+
+	private String render(FilterAliasGenerator aliasGenerator, int filterIndex) {
+		Map<String, String> aliasTableMap = filterAliasTableMaps[filterIndex];
 		String condition = filterConditions[filterIndex];
-		if (filterAutoAliasFlags[filterIndex]){
-			return StringHelper.replace(condition, FilterImpl.MARKER, aliasGenerator.getAlias(aliasTableMap.get(null)));
-		} else if (isTableFromPersistentClass(aliasTableMap)){
-			return condition.replace("{alias}", aliasGenerator.getAlias(aliasTableMap.get(null)));
-		} else {
-			for (Map.Entry<String, String> entry : aliasTableMap.entrySet()){
-				condition = condition.replace("{"+entry.getKey()+"}", aliasGenerator.getAlias(entry.getValue()));
+		if ( filterAutoAliasFlags[filterIndex] ) {
+			return StringHelper.replace(
+					condition,
+					FilterImpl.MARKER,
+					aliasGenerator.getAlias( aliasTableMap.get( null ) )
+			);
+		}
+		else if ( isTableFromPersistentClass( aliasTableMap ) ) {
+			return condition.replace( "{alias}", aliasGenerator.getAlias( aliasTableMap.get( null ) ) );
+		}
+		else {
+			for ( Map.Entry<String, String> entry : aliasTableMap.entrySet() ) {
+				condition = condition.replace(
+						"{" + entry.getKey() + "}",
+						aliasGenerator.getAlias( entry.getValue() )
+				);
 			}
 			return condition;
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/IteratorImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/IteratorImpl.java
index 210d6df332..c19b861fbb 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/IteratorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/IteratorImpl.java
@@ -40,10 +40,11 @@ import org.hibernate.type.Type;
 /**
  * An implementation of <tt>java.util.Iterator</tt> that is
  * returned by <tt>iterate()</tt> query execution methods.
+ *
  * @author Gavin King
  */
 public final class IteratorImpl implements HibernateIterator {
-    private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IteratorImpl.class );
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IteratorImpl.class );
 
 	private ResultSet rs;
 	private final EventSource session;
@@ -57,38 +58,36 @@ public final class IteratorImpl implements HibernateIterator {
 	private HolderInstantiator holderInstantiator;
 
 	public IteratorImpl(
-	        ResultSet rs,
-	        PreparedStatement ps,
-	        EventSource sess,
-	        boolean readOnly,
-	        Type[] types,
-	        String[][] columnNames,
-	        HolderInstantiator holderInstantiator)
-	throws HibernateException, SQLException {
-
-		this.rs=rs;
-		this.ps=ps;
+			ResultSet rs,
+			PreparedStatement ps,
+			EventSource sess,
+			boolean readOnly,
+			Type[] types,
+			String[][] columnNames,
+			HolderInstantiator holderInstantiator) throws HibernateException, SQLException {
+		this.rs = rs;
+		this.ps = ps;
 		this.session = sess;
 		this.readOnly = readOnly;
 		this.types = types;
 		this.names = columnNames;
 		this.holderInstantiator = holderInstantiator;
 
-		single = types.length==1;
+		single = types.length == 1;
 
 		postNext();
 	}
 
 	public void close() throws JDBCException {
-		if (ps!=null) {
+		if ( ps != null ) {
 			LOG.debug( "Closing iterator" );
 			session.getJdbcCoordinator().getResourceRegistry().release( ps );
 			try {
 				session.getPersistenceContext().getLoadContexts().cleanup( rs );
 			}
-			catch( Throwable ignore ) {
+			catch (Throwable ignore) {
 				// ignore this error for now
-                LOG.debugf("Exception trying to cleanup load context : %s", ignore.getMessage());
+				LOG.debugf( "Exception trying to cleanup load context : %s", ignore.getMessage() );
 			}
 			session.getJdbcCoordinator().afterStatementExecution();
 			ps = null;
@@ -98,14 +97,14 @@ public final class IteratorImpl implements HibernateIterator {
 	}
 
 	private void postNext() throws SQLException {
-		LOG.debug("Attempting to retrieve next results");
+		LOG.debug( "Attempting to retrieve next results" );
 		this.hasNext = rs.next();
-		if (!hasNext) {
-			LOG.debug("Exhausted results");
+		if ( !hasNext ) {
+			LOG.debug( "Exhausted results" );
 			close();
 		}
 		else {
-			LOG.debug("Retrieved next results");
+			LOG.debug( "Retrieved next results" );
 		}
 	}
 
@@ -115,7 +114,7 @@ public final class IteratorImpl implements HibernateIterator {
 
 	public Object next() throws HibernateException {
 		if ( !hasNext ) {
-			throw new NoSuchElementException("No more results");
+			throw new NoSuchElementException( "No more results" );
 		}
 		boolean sessionDefaultReadOnlyOrig = session.isDefaultReadOnly();
 		session.setDefaultReadOnly( readOnly );
@@ -128,12 +127,12 @@ public final class IteratorImpl implements HibernateIterator {
 			}
 			else {
 				Object[] currentResults = new Object[types.length];
-				for (int i=0; i<types.length; i++) {
+				for ( int i = 0; i < types.length; i++ ) {
 					currentResults[i] = types[i].nullSafeGet( rs, names[i], session, null );
 				}
 
-				if (isHolder) {
-					currentResult = holderInstantiator.instantiate(currentResults);
+				if ( isHolder ) {
+					currentResult = holderInstantiator.instantiate( currentResults );
 				}
 				else {
 					currentResult = currentResults;
@@ -148,7 +147,7 @@ public final class IteratorImpl implements HibernateIterator {
 			throw session.getFactory().getSQLExceptionHelper().convert(
 					sqle,
 					"could not get next iterator result"
-				);
+			);
 		}
 		finally {
 			session.setDefaultReadOnly( sessionDefaultReadOnlyOrig );
@@ -156,21 +155,21 @@ public final class IteratorImpl implements HibernateIterator {
 	}
 
 	public void remove() {
-		if (!single) {
-			throw new UnsupportedOperationException("Not a single column hibernate query result set");
+		if ( !single ) {
+			throw new UnsupportedOperationException( "Not a single column hibernate query result set" );
 		}
-		if (currentResult==null) {
-			throw new IllegalStateException("Called Iterator.remove() before next()");
+		if ( currentResult == null ) {
+			throw new IllegalStateException( "Called Iterator.remove() before next()" );
 		}
 		if ( !( types[0] instanceof EntityType ) ) {
-			throw new UnsupportedOperationException("Not an entity");
+			throw new UnsupportedOperationException( "Not an entity" );
 		}
 
 		session.delete(
 				( (EntityType) types[0] ).getAssociatedEntityName(),
 				currentResult,
 				false,
-		        null
+				null
 		);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/QueryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/QueryImpl.java
index 214be22122..31c702d6a1 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/QueryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/QueryImpl.java
@@ -20,9 +20,9 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.internal;
+
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -43,8 +43,9 @@ import org.hibernate.engine.spi.SessionImplementor;
 /**
  * default implementation of the <tt>Query</tt> interface,
  * for "ordinary" HQL queries (not collection filters)
- * @see CollectionFilterImpl
+ *
  * @author Gavin King
+ * @see CollectionFilterImpl
  */
 public class QueryImpl extends AbstractQueryImpl {
 
@@ -52,9 +53,9 @@ public class QueryImpl extends AbstractQueryImpl {
 
 	public QueryImpl(
 			String queryString,
-	        FlushMode flushMode,
-	        SessionImplementor session,
-	        ParameterMetadata parameterMetadata) {
+			FlushMode flushMode,
+			SessionImplementor session,
+			ParameterMetadata parameterMetadata) {
 		super( queryString, flushMode, session, parameterMetadata );
 	}
 
@@ -68,9 +69,9 @@ public class QueryImpl extends AbstractQueryImpl {
 		before();
 		try {
 			return getSession().iterate(
-					expandParameterLists(namedParams),
-			        getQueryParameters(namedParams)
-				);
+					expandParameterLists( namedParams ),
+					getQueryParameters( namedParams )
+			);
 		}
 		finally {
 			after();
@@ -85,10 +86,10 @@ public class QueryImpl extends AbstractQueryImpl {
 		verifyParameters();
 		Map namedParams = getNamedParams();
 		before();
-		QueryParameters qp = getQueryParameters(namedParams);
-		qp.setScrollMode(scrollMode);
+		QueryParameters qp = getQueryParameters( namedParams );
+		qp.setScrollMode( scrollMode );
 		try {
-			return getSession().scroll( expandParameterLists(namedParams), qp );
+			return getSession().scroll( expandParameterLists( namedParams ), qp );
 		}
 		finally {
 			after();
@@ -101,9 +102,9 @@ public class QueryImpl extends AbstractQueryImpl {
 		before();
 		try {
 			return getSession().list(
-					expandParameterLists(namedParams),
-			        getQueryParameters(namedParams)
-				);
+					expandParameterLists( namedParams ),
+					getQueryParameters( namedParams )
+			);
 		}
 		finally {
 			after();
@@ -115,10 +116,10 @@ public class QueryImpl extends AbstractQueryImpl {
 		Map namedParams = getNamedParams();
 		before();
 		try {
-            return getSession().executeUpdate(
-                    expandParameterLists( namedParams ),
-                    getQueryParameters( namedParams )
-	            );
+			return getSession().executeUpdate(
+					expandParameterLists( namedParams ),
+					getQueryParameters( namedParams )
+			);
 		}
 		finally {
 			after();
@@ -129,11 +130,11 @@ public class QueryImpl extends AbstractQueryImpl {
 		lockOptions.setAliasSpecificLockMode( alias, lockMode );
 		return this;
 	}
-	
+
 	public Query setLockOptions(LockOptions lockOption) {
-		this.lockOptions.setLockMode(lockOption.getLockMode());
-		this.lockOptions.setScope(lockOption.getScope());
-		this.lockOptions.setTimeOut(lockOption.getTimeOut());
+		this.lockOptions.setLockMode( lockOption.getLockMode() );
+		this.lockOptions.setScope( lockOption.getScope() );
+		this.lockOptions.setTimeOut( lockOption.getTimeOut() );
 		return this;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
index 6f5bc091e4..26c317ede4 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SQLQueryImpl.java
@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.internal;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -83,16 +84,16 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
 		if ( queryDef.getResultSetRef() != null ) {
 			ResultSetMappingDefinition definition = session.getFactory()
 					.getResultSetMapping( queryDef.getResultSetRef() );
-			if (definition == null) {
+			if ( definition == null ) {
 				throw new MappingException(
 						"Unable to find resultset-ref definition: " +
-						queryDef.getResultSetRef()
-					);
+								queryDef.getResultSetRef()
+				);
 			}
-			this.queryReturns = new ArrayList<NativeSQLQueryReturn>(Arrays.asList( definition.getQueryReturns() ));
+			this.queryReturns = new ArrayList<NativeSQLQueryReturn>( Arrays.asList( definition.getQueryReturns() ) );
 		}
 		else if ( queryDef.getQueryReturns() != null && queryDef.getQueryReturns().length > 0 ) {
-			this.queryReturns = new ArrayList<NativeSQLQueryReturn>(Arrays.asList( queryDef.getQueryReturns()));
+			this.queryReturns = new ArrayList<NativeSQLQueryReturn>( Arrays.asList( queryDef.getQueryReturns() ) );
 		}
 		else {
 			this.queryReturns = new ArrayList<NativeSQLQueryReturn>();
@@ -114,7 +115,7 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
 	}
 
 	@Override
-	public List<NativeSQLQueryReturn>  getQueryReturns() {
+	public List<NativeSQLQueryReturn> getQueryReturns() {
 		prepareQueryReturnsIfNecessary();
 		return queryReturns;
 	}
@@ -147,9 +148,9 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
 
 	private NativeSQLQuerySpecification generateQuerySpecification(Map namedParams) {
 		return new NativeSQLQuerySpecification(
-		        expandParameterLists(namedParams),
+				expandParameterLists( namedParams ),
 				queryReturns.toArray( new NativeSQLQueryReturn[queryReturns.size()] ),
-		        querySpaces
+				querySpaces
 		);
 	}
 
@@ -176,24 +177,24 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
 	}
 
 	public Iterator iterate() throws HibernateException {
-		throw new UnsupportedOperationException("SQL queries do not currently support iteration");
+		throw new UnsupportedOperationException( "SQL queries do not currently support iteration" );
 	}
 
 	@Override
-    public QueryParameters getQueryParameters(Map namedParams) {
-		QueryParameters qp = super.getQueryParameters(namedParams);
-		qp.setCallable(callable);
+	public QueryParameters getQueryParameters(Map namedParams) {
+		QueryParameters qp = super.getQueryParameters( namedParams );
+		qp.setCallable( callable );
 		qp.setAutoDiscoverScalarTypes( autoDiscoverTypes );
 		return qp;
 	}
 
 	@Override
-    protected void verifyParameters() {
+	protected void verifyParameters() {
 		// verifyParameters is called at the start of all execution type methods, so we use that here to perform
 		// some preparation work.
 		prepareQueryReturnsIfNecessary();
 		verifyParameters( callable );
-		boolean noReturns = queryReturns==null || queryReturns.isEmpty();
+		boolean noReturns = queryReturns == null || queryReturns.isEmpty();
 		if ( noReturns ) {
 			this.autoDiscoverTypes = noReturns;
 		}
@@ -216,7 +217,7 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
 
 	private void prepareQueryReturnsIfNecessary() {
 		if ( queryReturnBuilders != null ) {
-			if ( ! queryReturnBuilders.isEmpty() ) {
+			if ( !queryReturnBuilders.isEmpty() ) {
 				if ( queryReturns != null ) {
 					queryReturns.clear();
 					queryReturns = null;
@@ -232,25 +233,25 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
 	}
 
 	@Override
-    public String[] getReturnAliases() throws HibernateException {
-		throw new UnsupportedOperationException("SQL queries do not currently support returning aliases");
+	public String[] getReturnAliases() throws HibernateException {
+		throw new UnsupportedOperationException( "SQL queries do not currently support returning aliases" );
 	}
 
 	@Override
-    public Type[] getReturnTypes() throws HibernateException {
-		throw new UnsupportedOperationException("not yet implemented for SQL queries");
+	public Type[] getReturnTypes() throws HibernateException {
+		throw new UnsupportedOperationException( "not yet implemented for SQL queries" );
 	}
 
 	public Query setLockMode(String alias, LockMode lockMode) {
-		throw new UnsupportedOperationException("cannot set the lock mode for a native SQL query");
+		throw new UnsupportedOperationException( "cannot set the lock mode for a native SQL query" );
 	}
 
 	public Query setLockOptions(LockOptions lockOptions) {
-		throw new UnsupportedOperationException("cannot set lock options for a native SQL query");
+		throw new UnsupportedOperationException( "cannot set lock options for a native SQL query" );
 	}
 
 	@Override
-    public LockOptions getLockOptions() {
+	public LockOptions getLockOptions() {
 		//we never need to apply locks to the SQL, however the native-sql loader handles this specially
 		return lockOptions;
 	}
@@ -332,12 +333,12 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
 	}
 
 	private FetchReturn createFetchJoin(String tableAlias, String path) {
-		int loc = path.indexOf('.');
+		int loc = path.indexOf( '.' );
 		if ( loc < 0 ) {
 			throw new QueryException( "not a property path: " + path );
 		}
 		final String ownerTableAlias = path.substring( 0, loc );
-		final String joinedPropertyName = path.substring( loc+1 );
+		final String joinedPropertyName = path.substring( loc + 1 );
 		return addFetch( tableAlias, ownerTableAlias, joinedPropertyName );
 	}
 
@@ -400,7 +401,7 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
 		private final String alias;
 		private final String entityName;
 		private LockMode lockMode = LockMode.READ;
-		private Map<String,String[]> propertyMappings;
+		private Map<String, String[]> propertyMappings;
 
 		private RootReturnBuilder(String alias, String entityName) {
 			this.alias = alias;
@@ -424,20 +425,21 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
 
 		public ReturnProperty addProperty(final String propertyName) {
 			if ( propertyMappings == null ) {
-				propertyMappings = new HashMap<String,String[]>();
+				propertyMappings = new HashMap<String, String[]>();
 			}
 			return new ReturnProperty() {
 				public ReturnProperty addColumnAlias(String columnAlias) {
 					String[] columnAliases = propertyMappings.get( propertyName );
 					if ( columnAliases == null ) {
-						columnAliases = new String[]{columnAlias};
-					}else{
-						 String[] newColumnAliases = new String[columnAliases.length + 1];
+						columnAliases = new String[] {columnAlias};
+					}
+					else {
+						String[] newColumnAliases = new String[columnAliases.length + 1];
 						System.arraycopy( columnAliases, 0, newColumnAliases, 0, columnAliases.length );
 						newColumnAliases[columnAliases.length] = columnAlias;
 						columnAliases = newColumnAliases;
 					}
-					propertyMappings.put( propertyName,columnAliases );
+					propertyMappings.put( propertyName, columnAliases );
 					return this;
 				}
 			};
@@ -447,12 +449,13 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
 			return new NativeSQLQueryRootReturn( alias, entityName, propertyMappings, lockMode );
 		}
 	}
+
 	private class FetchReturnBuilder implements FetchReturn, ReturnBuilder {
 		private final String alias;
 		private String ownerTableAlias;
 		private final String joinedPropertyName;
 		private LockMode lockMode = LockMode.READ;
-		private Map<String,String[]> propertyMappings;
+		private Map<String, String[]> propertyMappings;
 
 		private FetchReturnBuilder(String alias, String ownerTableAlias, String joinedPropertyName) {
 			this.alias = alias;
@@ -472,27 +475,34 @@ public class SQLQueryImpl extends AbstractQueryImpl implements SQLQuery {
 
 		public ReturnProperty addProperty(final String propertyName) {
 			if ( propertyMappings == null ) {
-				propertyMappings = new HashMap<String,String[]>();
+				propertyMappings = new HashMap<String, String[]>();
 			}
 			return new ReturnProperty() {
 				public ReturnProperty addColumnAlias(String columnAlias) {
 					String[] columnAliases = propertyMappings.get( propertyName );
 					if ( columnAliases == null ) {
-						columnAliases = new String[]{columnAlias};
-					}else{
-						 String[] newColumnAliases = new String[columnAliases.length + 1];
+						columnAliases = new String[] {columnAlias};
+					}
+					else {
+						String[] newColumnAliases = new String[columnAliases.length + 1];
 						System.arraycopy( columnAliases, 0, newColumnAliases, 0, columnAliases.length );
 						newColumnAliases[columnAliases.length] = columnAlias;
 						columnAliases = newColumnAliases;
 					}
-					propertyMappings.put( propertyName,columnAliases );
+					propertyMappings.put( propertyName, columnAliases );
 					return this;
 				}
 			};
 		}
 
 		public NativeSQLQueryReturn buildReturn() {
-			return new NativeSQLQueryJoinReturn( alias, ownerTableAlias, joinedPropertyName, propertyMappings, lockMode );
+			return new NativeSQLQueryJoinReturn(
+					alias,
+					ownerTableAlias,
+					joinedPropertyName,
+					propertyMappings,
+					lockMode
+			);
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java
index e6fcb9adaa..adaa9e38bb 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java
@@ -28,6 +28,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.hibernate.HibernateException;
+import org.hibernate.JDBCException;
 import org.hibernate.ScrollableResults;
 import org.hibernate.engine.spi.QueryParameters;
 import org.hibernate.engine.spi.SessionImplementor;
@@ -55,12 +56,12 @@ public class ScrollableResultsImpl extends AbstractScrollableResults implements
 	 * @param holderInstantiator Ugh
 	 */
 	public ScrollableResultsImpl(
-	        ResultSet rs,
-	        PreparedStatement ps,
-	        SessionImplementor sess,
-	        Loader loader,
-	        QueryParameters queryParameters,
-	        Type[] types, HolderInstantiator holderInstantiator) {
+			ResultSet rs,
+			PreparedStatement ps,
+			SessionImplementor sess,
+			Loader loader,
+			QueryParameters queryParameters,
+			Type[] types, HolderInstantiator holderInstantiator) {
 		super( rs, ps, sess, loader, queryParameters, types, holderInstantiator );
 	}
 
@@ -72,30 +73,28 @@ public class ScrollableResultsImpl extends AbstractScrollableResults implements
 	@Override
 	public boolean scroll(int i) {
 		try {
-			final boolean result = getResultSet().relative(i);
-			prepareCurrentRow(result);
+			final boolean result = getResultSet().relative( i );
+			prepareCurrentRow( result );
 			return result;
 		}
 		catch (SQLException sqle) {
-			throw getSession().getFactory().getSQLExceptionHelper().convert(
-					sqle,
-					"could not advance using scroll()"
-			);
+			throw convert( sqle, "could not advance using scroll()" );
 		}
 	}
 
+	protected JDBCException convert(SQLException sqle, String message) {
+		return getSession().getFactory().getSQLExceptionHelper().convert( sqle, message );
+	}
+
 	@Override
 	public boolean first() {
 		try {
 			final boolean result = getResultSet().first();
-			prepareCurrentRow(result);
+			prepareCurrentRow( result );
 			return result;
 		}
 		catch (SQLException sqle) {
-			throw getSession().getFactory().getSQLExceptionHelper().convert(
-					sqle,
-					"could not advance using first()"
-			);
+			throw convert( sqle, "could not advance using first()" );
 		}
 	}
 
@@ -103,14 +102,11 @@ public class ScrollableResultsImpl extends AbstractScrollableResults implements
 	public boolean last() {
 		try {
 			final boolean result = getResultSet().last();
-			prepareCurrentRow(result);
+			prepareCurrentRow( result );
 			return result;
 		}
 		catch (SQLException sqle) {
-			throw getSession().getFactory().getSQLExceptionHelper().convert(
-					sqle,
-					"could not advance using last()"
-			);
+			throw convert( sqle, "could not advance using last()" );
 		}
 	}
 
@@ -118,14 +114,11 @@ public class ScrollableResultsImpl extends AbstractScrollableResults implements
 	public boolean next() {
 		try {
 			final boolean result = getResultSet().next();
-			prepareCurrentRow(result);
+			prepareCurrentRow( result );
 			return result;
 		}
 		catch (SQLException sqle) {
-			throw getSession().getFactory().getSQLExceptionHelper().convert(
-					sqle,
-					"could not advance using next()"
-			);
+			throw convert( sqle, "could not advance using next()" );
 		}
 	}
 
@@ -133,14 +126,11 @@ public class ScrollableResultsImpl extends AbstractScrollableResults implements
 	public boolean previous() {
 		try {
 			final boolean result = getResultSet().previous();
-			prepareCurrentRow(result);
+			prepareCurrentRow( result );
 			return result;
 		}
 		catch (SQLException sqle) {
-			throw getSession().getFactory().getSQLExceptionHelper().convert(
-					sqle,
-					"could not advance using previous()"
-			);
+			throw convert( sqle, "could not advance using previous()" );
 		}
 	}
 
@@ -150,10 +140,7 @@ public class ScrollableResultsImpl extends AbstractScrollableResults implements
 			getResultSet().afterLast();
 		}
 		catch (SQLException sqle) {
-			throw getSession().getFactory().getSQLExceptionHelper().convert(
-					sqle,
-					"exception calling afterLast()"
-			);
+			throw convert( sqle, "exception calling afterLast()" );
 		}
 	}
 
@@ -163,10 +150,7 @@ public class ScrollableResultsImpl extends AbstractScrollableResults implements
 			getResultSet().beforeFirst();
 		}
 		catch (SQLException sqle) {
-			throw getSession().getFactory().getSQLExceptionHelper().convert(
-					sqle,
-					"exception calling beforeFirst()"
-			);
+			throw convert( sqle, "exception calling beforeFirst()" );
 		}
 	}
 
@@ -176,10 +160,7 @@ public class ScrollableResultsImpl extends AbstractScrollableResults implements
 			return getResultSet().isFirst();
 		}
 		catch (SQLException sqle) {
-			throw getSession().getFactory().getSQLExceptionHelper().convert(
-					sqle,
-					"exception calling isFirst()"
-			);
+			throw convert( sqle, "exception calling isFirst()" );
 		}
 	}
 
@@ -189,23 +170,17 @@ public class ScrollableResultsImpl extends AbstractScrollableResults implements
 			return getResultSet().isLast();
 		}
 		catch (SQLException sqle) {
-			throw getSession().getFactory().getSQLExceptionHelper().convert(
-					sqle,
-					"exception calling isLast()"
-			);
+			throw convert( sqle, "exception calling isLast()" );
 		}
 	}
 
 	@Override
 	public int getRowNumber() throws HibernateException {
 		try {
-			return getResultSet().getRow()-1;
+			return getResultSet().getRow() - 1;
 		}
 		catch (SQLException sqle) {
-			throw getSession().getFactory().getSQLExceptionHelper().convert(
-					sqle,
-					"exception calling getRow()"
-			);
+			throw convert( sqle, "exception calling getRow()" );
 		}
 	}
 
@@ -216,15 +191,12 @@ public class ScrollableResultsImpl extends AbstractScrollableResults implements
 		}
 
 		try {
-			final boolean result = getResultSet().absolute(rowNumber);
-			prepareCurrentRow(result);
+			final boolean result = getResultSet().absolute( rowNumber );
+			prepareCurrentRow( result );
 			return result;
 		}
 		catch (SQLException sqle) {
-			throw getSession().getFactory().getSQLExceptionHelper().convert(
-					sqle,
-					"could not advance using absolute()"
-			);
+			throw convert( sqle, "could not advance using absolute()" );
 		}
 	}
 
@@ -244,11 +216,11 @@ public class ScrollableResultsImpl extends AbstractScrollableResults implements
 			currentRow = (Object[]) result;
 		}
 		else {
-			currentRow = new Object[] { result };
+			currentRow = new Object[] {result};
 		}
 
 		if ( getHolderInstantiator() != null ) {
-			currentRow = new Object[] { getHolderInstantiator().instantiate(currentRow) };
+			currentRow = new Object[] {getHolderInstantiator().instantiate( currentRow )};
 		}
 
 		afterScrollOperation();
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
index ab3cc2b683..a2f556e8c7 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -183,11 +183,8 @@ import org.hibernate.type.TypeResolver;
  * @author Gavin King
  */
 public final class SessionFactoryImpl implements SessionFactoryImplementor {
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SessionFactoryImpl.class );
 
-	private static final CoreMessageLogger LOG = Logger.getMessageLogger(
-			CoreMessageLogger.class,
-			SessionFactoryImpl.class.getName()
-	);
 	private static final IdentifierGenerator UUID_GENERATOR = UUIDGenerator.buildSessionFactoryUniqueIdentifierGenerator();
 
 	private final String name;
@@ -639,8 +636,11 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
 			final AccessType accessType = AccessType.fromExternalName( model.getCacheConcurrencyStrategy() );
 			if ( accessType != null ) {
 				LOG.tracef( "Building shared cache region for entity data [%s]", model.getEntityName() );
-				EntityRegion entityRegion = regionFactory.buildEntityRegion( cacheRegionName, properties, CacheDataDescriptionImpl
-																					 .decode( model ) );
+				EntityRegion entityRegion = regionFactory.buildEntityRegion(
+						cacheRegionName,
+						properties,
+						CacheDataDescriptionImpl.decode( model )
+				);
 				accessStrategy = entityRegion.buildAccessStrategy( accessType );
 				cacheAccessStrategiesMap.put( cacheRegionName, accessStrategy );
 				cacheAccess.addCacheRegion( cacheRegionName, entityRegion );
@@ -866,7 +866,7 @@ public final class SessionFactoryImpl implements SessionFactoryImplementor {
 	@Override
 	public Reference getReference() {
 		// from javax.naming.Referenceable
-        LOG.debug( "Returning a Reference to the SessionFactory" );
+		LOG.debug( "Returning a Reference to the SessionFactory" );
 		return new Reference(
 				SessionFactoryImpl.class.getName(),
 				new StringRefAddr("uuid", uuid),
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java
index d3bcc4a128..f69681a97e 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryRegistry.java
@@ -40,7 +40,7 @@ import org.hibernate.engine.jndi.spi.JndiService;
 
 /**
  * A registry of all {@link SessionFactory} instances for the same classloader as this class.
- *
+ * <p/>
  * This registry is used for serialization/deserialization as well as JNDI binding.
  *
  * @author Steve Ebersole
@@ -61,7 +61,7 @@ public class SessionFactoryRegistry {
 	/**
 	 * A cross-reference for mapping a SessionFactory name to its UUID.  Not all SessionFactories get named,
 	 */
-	private final ConcurrentHashMap<String,String> nameUuidXref = new ConcurrentHashMap<String, String>();
+	private final ConcurrentHashMap<String, String> nameUuidXref = new ConcurrentHashMap<String, String>();
 
 	private SessionFactoryRegistry() {
 		LOG.debugf( "Initializing SessionFactoryRegistry : %s", this );
@@ -92,7 +92,7 @@ public class SessionFactoryRegistry {
 			nameUuidXref.put( name, uuid );
 		}
 
-		if ( name == null || ! isNameAlsoJndiName ) {
+		if ( name == null || !isNameAlsoJndiName ) {
 			LOG.debug( "Not binding SessionFactory to JNDI, no JNDI name configured" );
 			return;
 		}
@@ -139,10 +139,10 @@ public class SessionFactoryRegistry {
 					jndiService.unbind( name );
 					LOG.factoryUnboundFromJndiName( name );
 				}
-				catch ( JndiNameException e ) {
+				catch (JndiNameException e) {
 					LOG.invalidJndiName( name, e );
 				}
-				catch ( JndiException e ) {
+				catch (JndiException e) {
 					LOG.unableToUnbindFactoryFromJndi( e );
 				}
 			}
@@ -181,7 +181,7 @@ public class SessionFactoryRegistry {
 	 * @return true/false
 	 */
 	public boolean hasRegistrations() {
-		return ! sessionFactoryMap.isEmpty();
+		return !sessionFactoryMap.isEmpty();
 	}
 
 	public void clearRegistrations() {
@@ -203,13 +203,13 @@ public class SessionFactoryRegistry {
 	private final NamespaceChangeListener listener = new NamespaceChangeListener() {
 		@Override
 		public void objectAdded(NamingEvent evt) {
-			LOG.debugf("A factory was successfully bound to name: %s", evt.getNewBinding().getName());
+			LOG.debugf( "A factory was successfully bound to name: %s", evt.getNewBinding().getName() );
 		}
 
 		@Override
 		public void objectRemoved(NamingEvent evt) {
 			final String jndiName = evt.getOldBinding().getName();
-            LOG.factoryUnboundFromName( jndiName );
+			LOG.factoryUnboundFromName( jndiName );
 
 			final String uuid = nameUuidXref.remove( jndiName );
 			if ( uuid == null ) {
@@ -232,7 +232,7 @@ public class SessionFactoryRegistry {
 		@Override
 		public void namingExceptionThrown(NamingExceptionEvent evt) {
 			//noinspection ThrowableResultOfMethodCallIgnored
-            LOG.namingExceptionAccessingFactory(evt.getException());
+			LOG.namingExceptionAccessingFactory( evt.getException() );
 		}
 	};
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
index d92dcc5cfd..82c7987736 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
@@ -165,16 +165,14 @@ import org.hibernate.resource.transaction.spi.TransactionStatus;
 import org.hibernate.stat.SessionStatistics;
 import org.hibernate.stat.internal.SessionStatisticsImpl;
 
-import org.jboss.logging.Logger;
-
 /**
  * Concrete implementation of a Session.
- *
+ * <p/>
  * Exposes two interfaces:<ul>
- *     <li>{@link Session} to the application</li>
- *     <li>{@link org.hibernate.engine.spi.SessionImplementor} to other Hibernate components (SPI)</li>
+ * <li>{@link Session} to the application</li>
+ * <li>{@link org.hibernate.engine.spi.SessionImplementor} to other Hibernate components (SPI)</li>
  * </ul>
- *
+ * <p/>
  * This class is not thread-safe.
  *
  * @author Gavin King
@@ -187,11 +185,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	// a separate class responsible for generating/dispatching events just duplicates most of the Session methods...
 	// passing around separate interceptor, factory, actionQueue, and persistentContext is not manageable...
 
-	private static final CoreMessageLogger LOG = Logger.getMessageLogger(
-			CoreMessageLogger.class,
-			SessionImpl.class.getName()
-	);
-
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SessionImpl.class );
 	private static final boolean TRACE_ENABLED = LOG.isTraceEnabled();
 
 	private transient long timestamp;
@@ -277,6 +271,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		if ( statementInspector == null ) {
 			this.statementInspector = new StatementInspector() {
 				@Override
+				@SuppressWarnings("deprecation")
 				public String inspect(String sql) {
 					return SessionImpl.this.interceptor.onPrepareStatement( sql );
 				}
@@ -293,7 +288,10 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 			this.autoJoinTransactions = autoJoinTransactions;
 
 			this.jdbcCoordinator = new JdbcCoordinatorImpl( connection, this );
-			this.transactionCoordinator = getTransactionCoordinatorBuilder().buildTransactionCoordinator( this.jdbcCoordinator, this );
+			this.transactionCoordinator = getTransactionCoordinatorBuilder().buildTransactionCoordinator(
+					this.jdbcCoordinator,
+					this
+			);
 			this.currentHibernateTransaction = getTransaction();
 		}
 		else {
@@ -334,7 +332,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 					}
 					actionQueue.beforeTransactionCompletion();
 					try {
-						interceptor.beforeTransactionCompletion( currentHibernateTransaction );
+						SessionImpl.this.interceptor.beforeTransactionCompletion( currentHibernateTransaction );
 					}
 					catch (Throwable t) {
 						LOG.exceptionInBeforeTransactionCompletionInterceptor( t );
@@ -557,7 +555,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	 * @param success Was the operation a success
 	 */
 	public void afterOperation(boolean success) {
-		if ( ! isTransactionInProgress() ) {
+		if ( !isTransactionInProgress() ) {
 			jdbcCoordinator.afterTransaction();
 		}
 	}
@@ -590,12 +588,12 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 			throw new NullPointerException( "null object passed to getCurrentLockMode()" );
 		}
 		if ( object instanceof HibernateProxy ) {
-			object = ( (HibernateProxy) object ).getHibernateLazyInitializer().getImplementation(this);
+			object = ( (HibernateProxy) object ).getHibernateLazyInitializer().getImplementation( this );
 			if ( object == null ) {
 				return LockMode.NONE;
 			}
 		}
-		EntityEntry e = persistenceContext.getEntry(object);
+		EntityEntry e = persistenceContext.getEntry( object );
 		if ( e == null ) {
 			throw new TransientObjectException( "Given object not associated with the session" );
 		}
@@ -604,7 +602,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 					"The given object was deleted",
 					e.getId(),
 					e.getPersister().getEntityName()
-				);
+			);
 		}
 		return e.getLockMode();
 	}
@@ -614,7 +612,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		errorIfClosed();
 		// todo : should this get moved to PersistentContext?
 		// logically, is PersistentContext the "thing" to which an interceptor gets attached?
-		final Object result = persistenceContext.getEntity(key);
+		final Object result = persistenceContext.getEntity( key );
 		if ( result == null ) {
 			final Object newObject = interceptor.getEntity( key.getEntityName(), key.getIdentifier() );
 			if ( newObject != null ) {
@@ -641,8 +639,9 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	}
 
 	private void delayedAfterCompletion() {
-		if(transactionCoordinator instanceof JtaTransactionCoordinatorImpl) {
-			((JtaTransactionCoordinatorImpl)transactionCoordinator).getSynchronizationCallbackCoordinator().processAnyDelayedAfterCompletion();
+		if ( transactionCoordinator instanceof JtaTransactionCoordinatorImpl ) {
+			( (JtaTransactionCoordinatorImpl) transactionCoordinator ).getSynchronizationCallbackCoordinator()
+					.processAnyDelayedAfterCompletion();
 		}
 	}
 
@@ -733,7 +732,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 	@Override
 	public LockRequest buildLockRequest(LockOptions lockOptions) {
-		return new LockRequestImpl(lockOptions);
+		return new LockRequestImpl( lockOptions );
 	}
 
 	@Override
@@ -884,7 +883,8 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	}
 
 	@Override
-	public void delete(String entityName, Object object, boolean isCascadeDeleteEnabled, Set transientEntities) throws HibernateException {
+	public void delete(String entityName, Object object, boolean isCascadeDeleteEnabled, Set transientEntities)
+			throws HibernateException {
 		if ( TRACE_ENABLED && persistenceContext.isRemovingOrphanBeforeUpates() ) {
 			logRemoveOrphanBeforeUpdates( "before continuing", entityName, object );
 		}
@@ -954,12 +954,12 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 	@Override
 	public void load(Object object, Serializable id) throws HibernateException {
-		LoadEvent event = new LoadEvent(id, object, this);
+		LoadEvent event = new LoadEvent( id, object, this );
 		fireLoad( event, LoadEventListener.RELOAD );
 	}
 
 	@Override
-	public Object load(Class entityClass, Serializable id) throws HibernateException {
+	public <T> T load(Class<T> entityClass, Serializable id) throws HibernateException {
 		return this.byId( entityClass ).getReference( id );
 	}
 
@@ -969,7 +969,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	}
 
 	@Override
-	public Object get(Class entityClass, Serializable id) throws HibernateException {
+	public <T> T get(Class<T> entityClass, Serializable id) throws HibernateException {
 		return this.byId( entityClass ).load( id );
 	}
 
@@ -978,7 +978,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		return this.byId( entityName ).load( id );
 	}
 
-	/**	
+	/**
 	 * Load the data for the object with the specified id into a newly created object.
 	 * This is only called when lazily initializing a proxy.
 	 * Do NOT return a proxy.
@@ -986,24 +986,25 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	@Override
 	public Object immediateLoad(String entityName, Serializable id) throws HibernateException {
 		if ( LOG.isDebugEnabled() ) {
-			EntityPersister persister = getFactory().getEntityPersister(entityName);
+			EntityPersister persister = getFactory().getEntityPersister( entityName );
 			LOG.debugf( "Initializing proxy: %s", MessageHelper.infoString( persister, id, getFactory() ) );
 		}
 
-		LoadEvent event = new LoadEvent(id, entityName, true, this);
-		fireLoad(event, LoadEventListener.IMMEDIATE_LOAD);
+		LoadEvent event = new LoadEvent( id, entityName, true, this );
+		fireLoad( event, LoadEventListener.IMMEDIATE_LOAD );
 		return event.getResult();
 	}
 
 	@Override
-	public Object internalLoad(String entityName, Serializable id, boolean eager, boolean nullable) throws HibernateException {
+	public Object internalLoad(String entityName, Serializable id, boolean eager, boolean nullable)
+			throws HibernateException {
 		// todo : remove
 		LoadEventListener.LoadType type = nullable
 				? LoadEventListener.INTERNAL_LOAD_NULLABLE
 				: eager
-						? LoadEventListener.INTERNAL_LOAD_EAGER
-						: LoadEventListener.INTERNAL_LOAD_LAZY;
-		LoadEvent event = new LoadEvent(id, entityName, true, this);
+				? LoadEventListener.INTERNAL_LOAD_EAGER
+				: LoadEventListener.INTERNAL_LOAD_LAZY;
+		LoadEvent event = new LoadEvent( id, entityName, true, this );
 		fireLoad( event, type );
 		if ( !nullable ) {
 			UnresolvableObjectException.throwIfNull( event.getResult(), id, entityName );
@@ -1012,12 +1013,12 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	}
 
 	@Override
-	public Object load(Class entityClass, Serializable id, LockMode lockMode) throws HibernateException {
+	public <T> T load(Class<T> entityClass, Serializable id, LockMode lockMode) throws HibernateException {
 		return this.byId( entityClass ).with( new LockOptions( lockMode ) ).getReference( id );
 	}
 
 	@Override
-	public Object load(Class entityClass, Serializable id, LockOptions lockOptions) throws HibernateException {
+	public <T> T load(Class<T> entityClass, Serializable id, LockOptions lockOptions) throws HibernateException {
 		return this.byId( entityClass ).with( lockOptions ).getReference( id );
 	}
 
@@ -1032,12 +1033,12 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	}
 
 	@Override
-	public Object get(Class entityClass, Serializable id, LockMode lockMode) throws HibernateException {
+	public <T> T get(Class<T> entityClass, Serializable id, LockMode lockMode) throws HibernateException {
 		return this.byId( entityClass ).with( new LockOptions( lockMode ) ).load( id );
 	}
 
 	@Override
-	public Object get(Class entityClass, Serializable id, LockOptions lockOptions) throws HibernateException {
+	public <T> T get(Class<T> entityClass, Serializable id, LockOptions lockOptions) throws HibernateException {
 		return this.byId( entityClass ).with( lockOptions ).load( id );
 	}
 
@@ -1050,7 +1051,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	public Object get(String entityName, Serializable id, LockOptions lockOptions) throws HibernateException {
 		return this.byId( entityName ).with( lockOptions ).load( id );
 	}
-	
+
 	@Override
 	public IdentifierLoadAccessImpl byId(String entityName) {
 		return new IdentifierLoadAccessImpl( entityName );
@@ -1058,7 +1059,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 	@Override
 	public <T> IdentifierLoadAccessImpl<T> byId(Class<T> entityClass) {
-		return new IdentifierLoadAccessImpl( entityClass );
+		return new IdentifierLoadAccessImpl<T>( entityClass );
 	}
 
 	@Override
@@ -1067,8 +1068,8 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	}
 
 	@Override
-	public NaturalIdLoadAccess byNaturalId(Class entityClass) {
-		return new NaturalIdLoadAccessImpl( entityClass );
+	public <T> NaturalIdLoadAccess<T> byNaturalId(Class<T> entityClass) {
+		return new NaturalIdLoadAccessImpl<T>( entityClass );
 	}
 
 	@Override
@@ -1077,8 +1078,8 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	}
 
 	@Override
-	public SimpleNaturalIdLoadAccess bySimpleNaturalId(Class entityClass) {
-		return new SimpleNaturalIdLoadAccessImpl( entityClass );
+	public <T> SimpleNaturalIdLoadAccess<T> bySimpleNaturalId(Class<T> entityClass) {
+		return new SimpleNaturalIdLoadAccessImpl<T>( entityClass );
 	}
 
 	private void fireLoad(LoadEvent event, LoadType loadType) {
@@ -1160,7 +1161,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 	@Override
 	public void replicate(String entityName, Object obj, ReplicationMode replicationMode)
-	throws HibernateException {
+			throws HibernateException {
 		fireReplicate( new ReplicateEvent( entityName, obj, replicationMode, this ) );
 	}
 
@@ -1200,7 +1201,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	 */
 	protected boolean autoFlushIfRequired(Set querySpaces) throws HibernateException {
 		errorIfClosed();
-		if ( ! isTransactionInProgress() ) {
+		if ( !isTransactionInProgress() ) {
 			// do not auto-flush while outside a transaction
 			return false;
 		}
@@ -1234,7 +1235,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		errorIfClosed();
 		checkTransactionSynchStatus();
 		if ( persistenceContext.getCascadeLevel() > 0 ) {
-			throw new HibernateException("Flush during cascade is dangerous");
+			throw new HibernateException( "Flush during cascade is dangerous" );
 		}
 		FlushEvent flushEvent = new FlushEvent( this );
 		for ( FlushEventListener listener : listeners( EventType.FLUSH ) ) {
@@ -1249,14 +1250,15 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		if ( LOG.isDebugEnabled() ) {
 			LOG.debugf(
 					"Flushing to force deletion of re-saved object: %s",
-					MessageHelper.infoString( entityEntry.getPersister(), entityEntry.getId(), getFactory() ) );
+					MessageHelper.infoString( entityEntry.getPersister(), entityEntry.getId(), getFactory() )
+			);
 		}
 
 		if ( persistenceContext.getCascadeLevel() > 0 ) {
 			throw new ObjectDeletedException(
-				"deleted object would be re-saved by cascade (remove deleted object from associations)",
-				entityEntry.getId(),
-				entityEntry.getPersister().getEntityName()
+					"deleted object would be re-saved by cascade (remove deleted object from associations)",
+					entityEntry.getId(),
+					entityEntry.getPersister().getEntityName()
 			);
 		}
 
@@ -1268,12 +1270,12 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		errorIfClosed();
 		checkTransactionSynchStatus();
 		queryParameters.validateParameters();
-		
+
 		HQLQueryPlan plan = queryParameters.getQueryPlan();
-		if (plan == null) {
+		if ( plan == null ) {
 			plan = getHQLQueryPlan( query, false );
 		}
-		
+
 		autoFlushIfRequired( plan.getQuerySpaces() );
 
 		List results = Collections.EMPTY_LIST;
@@ -1314,27 +1316,29 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	}
 
 	@Override
-    public int executeNativeUpdate(NativeSQLQuerySpecification nativeQuerySpecification,
-            QueryParameters queryParameters) throws HibernateException {
-        errorIfClosed();
-        checkTransactionSynchStatus();
-        queryParameters.validateParameters();
-        NativeSQLQueryPlan plan = getNativeSQLQueryPlan( nativeQuerySpecification );
+	public int executeNativeUpdate(
+			NativeSQLQuerySpecification nativeQuerySpecification,
+			QueryParameters queryParameters) throws HibernateException {
+		errorIfClosed();
+		checkTransactionSynchStatus();
+		queryParameters.validateParameters();
+		NativeSQLQueryPlan plan = getNativeSQLQueryPlan( nativeQuerySpecification );
 
 
-        autoFlushIfRequired( plan.getCustomQuery().getQuerySpaces() );
+		autoFlushIfRequired( plan.getCustomQuery().getQuerySpaces() );
 
-        boolean success = false;
-        int result = 0;
-        try {
-            result = plan.performExecuteUpdate(queryParameters, this);
-            success = true;
-        } finally {
-            afterOperation( success );
-    		delayedAfterCompletion();
+		boolean success = false;
+		int result = 0;
+		try {
+			result = plan.performExecuteUpdate( queryParameters, this );
+			success = true;
 		}
-        return result;
-    }
+		finally {
+			afterOperation( success );
+			delayedAfterCompletion();
+		}
+		return result;
+	}
 
 	@Override
 	public Iterator iterate(String query, QueryParameters queryParameters) throws HibernateException {
@@ -1376,9 +1380,9 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		checkTransactionSynchStatus();
 		CollectionFilterImpl filter = new CollectionFilterImpl(
 				queryString,
-		        collection,
-		        this,
-		        getFilterQueryPlan( collection, queryString, null, false ).getParameterMetadata()
+				collection,
+				this,
+				getFilterQueryPlan( collection, queryString, null, false ).getParameterMetadata()
 		);
 		filter.setComment( queryString );
 		delayedAfterCompletion();
@@ -1406,7 +1410,11 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	public Object instantiate(EntityPersister persister, Serializable id) throws HibernateException {
 		errorIfClosed();
 		checkTransactionSynchStatus();
-		Object result = interceptor.instantiate( persister.getEntityName(), persister.getEntityMetamodel().getEntityMode(), id );
+		Object result = interceptor.instantiate(
+				persister.getEntityName(),
+				persister.getEntityMetamodel().getEntityMode(),
+				id
+		);
 		if ( result == null ) {
 			result = persister.instantiate( id, this );
 		}
@@ -1439,7 +1447,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		errorIfClosed();
 		checkTransactionSynchStatus();
 		LOG.tracev( "Setting cache mode to: {0}", cacheMode );
-		this.cacheMode= cacheMode;
+		this.cacheMode = cacheMode;
 	}
 
 	@Override
@@ -1453,7 +1461,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	@Override
 	public EntityPersister getEntityPersister(final String entityName, final Object object) {
 		errorIfClosed();
-		if (entityName==null) {
+		if ( entityName == null ) {
 			return factory.getEntityPersister( guessEntityName( object ) );
 		}
 		else {
@@ -1465,11 +1473,11 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 			try {
 				return factory.getEntityPersister( entityName ).getSubclassEntityPersister( object, getFactory() );
 			}
-			catch( HibernateException e ) {
+			catch (HibernateException e) {
 				try {
 					return getEntityPersister( null, object );
 				}
-				catch( HibernateException e2 ) {
+				catch (HibernateException e2) {
 					throw e;
 				}
 			}
@@ -1489,7 +1497,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 			return li.getIdentifier();
 		}
 		else {
-			EntityEntry entry = persistenceContext.getEntry(object);
+			EntityEntry entry = persistenceContext.getEntry( object );
 			if ( entry == null ) {
 				throw new TransientObjectException( "The instance was not associated with this session" );
 			}
@@ -1508,7 +1516,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 			return getProxyIdentifier( object );
 		}
 		else {
-			EntityEntry entry = persistenceContext.getEntry(object);
+			EntityEntry entry = persistenceContext.getEntry( object );
 			return entry != null ? entry.getId() : null;
 		}
 	}
@@ -1527,7 +1535,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		}
 
 		CollectionEntry entry = persistenceContext.getCollectionEntryOrNull( collection );
-		final CollectionPersister roleBeforeFlush = (entry == null) ? null : entry.getLoadedPersister();
+		final CollectionPersister roleBeforeFlush = ( entry == null ) ? null : entry.getLoadedPersister();
 
 		FilterQueryPlan plan = null;
 		if ( roleBeforeFlush == null ) {
@@ -1535,7 +1543,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 			// get its state into the database in order to execute query
 			flush();
 			entry = persistenceContext.getCollectionEntryOrNull( collection );
-			CollectionPersister roleAfterFlush = (entry == null) ? null : entry.getLoadedPersister();
+			CollectionPersister roleAfterFlush = ( entry == null ) ? null : entry.getLoadedPersister();
 			if ( roleAfterFlush == null ) {
 				throw new QueryException( "The collection was unreferenced" );
 			}
@@ -1559,7 +1567,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 				// might need to run a different filter entirely after the flush
 				// because the collection role may have changed
 				entry = persistenceContext.getCollectionEntryOrNull( collection );
-				CollectionPersister roleAfterFlush = (entry == null) ? null : entry.getLoadedPersister();
+				CollectionPersister roleAfterFlush = ( entry == null ) ? null : entry.getLoadedPersister();
 				if ( roleBeforeFlush != roleAfterFlush ) {
 					if ( roleAfterFlush == null ) {
 						throw new QueryException( "The collection was dereferenced" );
@@ -1584,7 +1592,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 	@Override
 	public List listFilter(Object collection, String filter, QueryParameters queryParameters)
-	throws HibernateException {
+			throws HibernateException {
 		errorIfClosed();
 		checkTransactionSynchStatus();
 		FilterQueryPlan plan = getFilterQueryPlan( collection, filter, queryParameters, false );
@@ -1598,7 +1606,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		}
 		finally {
 			dontFlushFromFind--;
-			afterOperation(success);
+			afterOperation( success );
 			delayedAfterCompletion();
 		}
 		return results;
@@ -1606,7 +1614,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 	@Override
 	public Iterator iterateFilter(Object collection, String filter, QueryParameters queryParameters)
-	throws HibernateException {
+			throws HibernateException {
 		errorIfClosed();
 		checkTransactionSynchStatus();
 		FilterQueryPlan plan = getFilterQueryPlan( collection, filter, queryParameters, true );
@@ -1626,7 +1634,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	public Criteria createCriteria(String entityName, String alias) {
 		errorIfClosed();
 		checkTransactionSynchStatus();
-		return new CriteriaImpl(entityName, alias, this);
+		return new CriteriaImpl( entityName, alias, this );
 	}
 
 	@Override
@@ -1640,19 +1648,19 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	public Criteria createCriteria(String entityName) {
 		errorIfClosed();
 		checkTransactionSynchStatus();
-		return new CriteriaImpl(entityName, this);
+		return new CriteriaImpl( entityName, this );
 	}
 
 	@Override
 	public ScrollableResults scroll(Criteria criteria, ScrollMode scrollMode) {
 		// TODO: Is this guaranteed to always be CriteriaImpl?
 		CriteriaImpl criteriaImpl = (CriteriaImpl) criteria;
-		
+
 		errorIfClosed();
 		checkTransactionSynchStatus();
 		String entityName = criteriaImpl.getEntityOrClassName();
 		CriteriaLoader loader = new CriteriaLoader(
-				getOuterJoinLoadable(entityName),
+				getOuterJoinLoadable( entityName ),
 				factory,
 				criteriaImpl,
 				entityName,
@@ -1661,7 +1669,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		autoFlushIfRequired( loader.getQuerySpaces() );
 		dontFlushFromFind++;
 		try {
-			return loader.scroll(this, scrollMode);
+			return loader.scroll( this, scrollMode );
 		}
 		finally {
 			delayedAfterCompletion();
@@ -1673,7 +1681,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	public List list(Criteria criteria) throws HibernateException {
 		// TODO: Is this guaranteed to always be CriteriaImpl?
 		CriteriaImpl criteriaImpl = (CriteriaImpl) criteria;
-				
+
 		final NaturalIdLoadAccess naturalIdLoadAccess = this.tryNaturalIdLoadAccess( criteriaImpl );
 		if ( naturalIdLoadAccess != null ) {
 			// EARLY EXIT!
@@ -1687,7 +1695,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 		CriteriaLoader[] loaders = new CriteriaLoader[size];
 		Set spaces = new HashSet();
-		for( int i=0; i <size; i++ ) {
+		for ( int i = 0; i < size; i++ ) {
 
 			loaders[i] = new CriteriaLoader(
 					getOuterJoinLoadable( implementors[i] ),
@@ -1695,28 +1703,28 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 					criteriaImpl,
 					implementors[i],
 					getLoadQueryInfluencers()
-				);
+			);
 
 			spaces.addAll( loaders[i].getQuerySpaces() );
 
 		}
 
-		autoFlushIfRequired(spaces);
+		autoFlushIfRequired( spaces );
 
 		List results = Collections.EMPTY_LIST;
 		dontFlushFromFind++;
 		boolean success = false;
 		try {
-			for( int i=0; i<size; i++ ) {
-				final List currentResults = loaders[i].list(this);
-				currentResults.addAll(results);
+			for ( int i = 0; i < size; i++ ) {
+				final List currentResults = loaders[i].list( this );
+				currentResults.addAll( results );
 				results = currentResults;
 			}
 			success = true;
 		}
 		finally {
 			dontFlushFromFind--;
-			afterOperation(success);
+			afterOperation( success );
 			delayedAfterCompletion();
 		}
 
@@ -1730,7 +1738,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	 * @param criteria The criteria to check as a complete natural identifier lookup.
 	 *
 	 * @return A fully configured NaturalIdLoadAccess or null, if null is returned the standard CriteriaImpl execution
-	 *         should be performed
+	 * should be performed
 	 */
 	private NaturalIdLoadAccess tryNaturalIdLoadAccess(CriteriaImpl criteria) {
 		// See if the criteria lookup is by naturalId
@@ -1764,8 +1772,8 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		final NaturalIdLoadAccess naturalIdLoader = this.byNaturalId( entityName );
 
 		// Build NaturalIdLoadAccess and in the process verify all naturalId properties were specified
-		for ( int i = 0; i < naturalIdentifierProperties.length; i++ ) {
-			final String naturalIdProperty = propertyNames[naturalIdentifierProperties[i]];
+		for ( int naturalIdentifierProperty : naturalIdentifierProperties ) {
+			final String naturalIdProperty = propertyNames[naturalIdentifierProperty];
 			final Object naturalIdValue = naturalIdValues.get( naturalIdProperty );
 
 			if ( naturalIdValue == null ) {
@@ -1777,18 +1785,20 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		}
 
 		// Critera query contains a valid naturalId, use the new API
-		LOG.warn( "Session.byNaturalId(" + entityName
-				+ ") should be used for naturalId queries instead of Restrictions.naturalId() from a Criteria" );
+		LOG.warn(
+				"Session.byNaturalId(" + entityName
+						+ ") should be used for naturalId queries instead of Restrictions.naturalId() from a Criteria"
+		);
 
 		return naturalIdLoader;
 	}
 
 	private OuterJoinLoadable getOuterJoinLoadable(String entityName) throws MappingException {
-		EntityPersister persister = factory.getEntityPersister(entityName);
-		if ( !(persister instanceof OuterJoinLoadable) ) {
+		EntityPersister persister = factory.getEntityPersister( entityName );
+		if ( !( persister instanceof OuterJoinLoadable ) ) {
 			throw new MappingException( "class persister is not OuterJoinLoadable: " + entityName );
 		}
-		return ( OuterJoinLoadable ) persister;
+		return (OuterJoinLoadable) persister;
 	}
 
 	@Override
@@ -1804,7 +1814,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 				//if it is an uninitialized proxy, pointing
 				//with this session, then when it is accessed,
 				//the underlying instance will be "contained"
-				return li.getSession()==this;
+				return li.getSession() == this;
 			}
 			else {
 				//if it is initialized, see if the underlying
@@ -1859,7 +1869,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 	@Override
 	public ScrollableResults scrollCustomQuery(CustomQuery customQuery, QueryParameters queryParameters)
-	throws HibernateException {
+			throws HibernateException {
 		errorIfClosed();
 		checkTransactionSynchStatus();
 
@@ -1873,7 +1883,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 		dontFlushFromFind++; //stops flush being called multiple times if this method is recursively called
 		try {
-			return loader.scroll(queryParameters, this);
+			return loader.scroll( queryParameters, this );
 		}
 		finally {
 			delayedAfterCompletion();
@@ -1884,7 +1894,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	// basically just an adapted copy of find(CriteriaImpl)
 	@Override
 	public List listCustomQuery(CustomQuery customQuery, QueryParameters queryParameters)
-	throws HibernateException {
+			throws HibernateException {
 		errorIfClosed();
 		checkTransactionSynchStatus();
 
@@ -1899,14 +1909,14 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		dontFlushFromFind++;
 		boolean success = false;
 		try {
-			List results = loader.list(this, queryParameters);
+			List results = loader.list( this, queryParameters );
 			success = true;
 			return results;
 		}
 		finally {
 			dontFlushFromFind--;
 			delayedAfterCompletion();
-			afterOperation(success);
+			afterOperation( success );
 		}
 	}
 
@@ -1918,7 +1928,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 	@Override
 	public void initializeCollection(PersistentCollection collection, boolean writing)
-	throws HibernateException {
+			throws HibernateException {
 		errorIfClosed();
 		checkTransactionSynchStatus();
 		InitializeCollectionEvent event = new InitializeCollectionEvent( collection, this );
@@ -1930,8 +1940,8 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 	@Override
 	public String bestGuessEntityName(Object object) {
-		if (object instanceof HibernateProxy) {
-			LazyInitializer initializer = ( ( HibernateProxy ) object ).getHibernateLazyInitializer();
+		if ( object instanceof HibernateProxy ) {
+			LazyInitializer initializer = ( (HibernateProxy) object ).getHibernateLazyInitializer();
 			// it is possible for this method to be called during flush processing,
 			// so make certain that we do not accidentally initialize an uninitialized proxy
 			if ( initializer.isUninitialized() ) {
@@ -1939,9 +1949,9 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 			}
 			object = initializer.getImplementation();
 		}
-		EntityEntry entry = persistenceContext.getEntry(object);
-		if (entry==null) {
-			return guessEntityName(object);
+		EntityEntry entry = persistenceContext.getEntry( object );
+		if ( entry == null ) {
+			return guessEntityName( object );
 		}
 		else {
 			return entry.getPersister().getEntityName();
@@ -1952,14 +1962,14 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	public String getEntityName(Object object) {
 		errorIfClosed();
 		checkTransactionSynchStatus();
-		if (object instanceof HibernateProxy) {
+		if ( object instanceof HibernateProxy ) {
 			if ( !persistenceContext.containsProxy( object ) ) {
-				throw new TransientObjectException("proxy was not associated with the session");
+				throw new TransientObjectException( "proxy was not associated with the session" );
 			}
 			object = ( (HibernateProxy) object ).getHibernateLazyInitializer().getImplementation();
 		}
 
-		EntityEntry entry = persistenceContext.getEntry(object);
+		EntityEntry entry = persistenceContext.getEntry( object );
 		if ( entry == null ) {
 			throwTransientObjectException( object );
 		}
@@ -1969,8 +1979,8 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	private void throwTransientObjectException(Object object) throws HibernateException {
 		throw new TransientObjectException(
 				"object references an unsaved transient instance - save the transient instance before flushing: " +
-				guessEntityName(object)
-			);
+						guessEntityName( object )
+		);
 	}
 
 	@Override
@@ -1998,17 +2008,17 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 	@Override
 	public String toString() {
-		StringBuilder buf = new StringBuilder(500)
-			.append( "SessionImpl(" );
+		StringBuilder buf = new StringBuilder( 500 )
+				.append( "SessionImpl(" );
 		if ( !isClosed() ) {
-			buf.append(persistenceContext)
-				.append(";")
-				.append(actionQueue);
+			buf.append( persistenceContext )
+					.append( ";" )
+					.append( actionQueue );
 		}
 		else {
-			buf.append("<closed>");
+			buf.append( "<closed>" );
 		}
-		return buf.append(')').toString();
+		return buf.append( ')' ).toString();
 	}
 
 	@Override
@@ -2028,7 +2038,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	@Override
 	public SessionStatistics getStatistics() {
 		checkTransactionSynchStatus();
-		return new SessionStatisticsImpl(this);
+		return new SessionStatisticsImpl( this );
 	}
 
 	@Override
@@ -2164,6 +2174,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	 * Used by JDK serialization...
 	 *
 	 * @param ois The input stream from which we are being read...
+	 *
 	 * @throws IOException Indicates a general IO stream exception
 	 * @throws ClassNotFoundException Indicates a class resolution issue
 	 */
@@ -2191,7 +2202,10 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 		jdbcCoordinator = JdbcCoordinatorImpl.deserialize( ois, this );
 
-		this.transactionCoordinator = getTransactionCoordinatorBuilder().buildTransactionCoordinator( jdbcCoordinator, this );
+		this.transactionCoordinator = getTransactionCoordinatorBuilder().buildTransactionCoordinator(
+				jdbcCoordinator,
+				this
+		);
 
 		persistenceContext = StatefulPersistenceContext.deserialize( ois, this );
 		actionQueue = ActionQueue.deserialize( ois, this );
@@ -2202,7 +2216,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		// filter, which will fail when called before FilterImpl.afterDeserialize( factory );
 		// Instead lookup the filter by name and then call FilterImpl.afterDeserialize( factory ).
 		for ( String filterName : loadQueryInfluencers.getEnabledFilterNames() ) {
-			((FilterImpl) loadQueryInfluencers.getEnabledFilter( filterName )).afterDeserialize( factory );
+			( (FilterImpl) loadQueryInfluencers.getEnabledFilter( filterName ) ).afterDeserialize( factory );
 		}
 	}
 
@@ -2210,6 +2224,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 	 * Used by JDK serialization...
 	 *
 	 * @param oos The output stream to which we are being written...
+	 *
 	 * @throws IOException Indicates a general IO stream exception
 	 */
 	private void writeObject(ObjectOutputStream oos) throws IOException {
@@ -2353,7 +2368,8 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		}
 	}
 
-	private static class SharedSessionBuilderImpl extends SessionFactoryImpl.SessionBuilderImpl implements SharedSessionBuilder {
+	private static class SharedSessionBuilderImpl extends SessionFactoryImpl.SessionBuilderImpl
+			implements SharedSessionBuilder {
 		private final SessionImpl session;
 		private boolean shareTransactionContext;
 
@@ -2511,9 +2527,10 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 	private class LockRequestImpl implements LockRequest {
 		private final LockOptions lockOptions;
+
 		private LockRequestImpl(LockOptions lo) {
 			lockOptions = new LockOptions();
-			LockOptions.copy(lo, lockOptions);
+			LockOptions.copy( lo, lockOptions );
 		}
 
 		@Override
@@ -2523,7 +2540,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 		@Override
 		public LockRequest setLockMode(LockMode lockMode) {
-			lockOptions.setLockMode(lockMode);
+			lockOptions.setLockMode( lockMode );
 			return this;
 		}
 
@@ -2534,7 +2551,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 		@Override
 		public LockRequest setTimeOut(int timeout) {
-			lockOptions.setTimeOut(timeout);
+			lockOptions.setTimeOut( timeout );
 			return this;
 		}
 
@@ -2545,7 +2562,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 
 		@Override
 		public LockRequest setScope(boolean scope) {
-			lockOptions.setScope(scope);
+			lockOptions.setScope( scope );
 			return this;
 		}
 
@@ -2596,7 +2613,10 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 			try {
 				fireLoad( event, LoadEventListener.LOAD );
 				if ( event.getResult() == null ) {
-					getFactory().getEntityNotFoundDelegate().handleEntityNotFound( entityPersister.getEntityName(), id );
+					getFactory().getEntityNotFoundDelegate().handleEntityNotFound(
+							entityPersister.getEntityName(),
+							id
+					);
 				}
 				success = true;
 				return (T) event.getResult();
@@ -2639,7 +2659,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		return factory.locateEntityPersister( entityName );
 	}
 
-	private abstract class BaseNaturalIdLoadAccessImpl<T>  {
+	private abstract class BaseNaturalIdLoadAccessImpl<T> {
 		private final EntityPersister entityPersister;
 		private LockOptions lockOptions;
 		private boolean synchronizationEnabled = true;
@@ -2647,7 +2667,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		private BaseNaturalIdLoadAccessImpl(EntityPersister entityPersister) {
 			this.entityPersister = entityPersister;
 
-			if ( ! entityPersister.hasNaturalIdentifier() ) {
+			if ( !entityPersister.hasNaturalIdentifier() ) {
 				throw new HibernateException(
 						String.format( "Entity [%s] did not define a natural id", entityPersister.getEntityName() )
 				);
@@ -2679,7 +2699,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		}
 
 		protected void performAnyNeededCrossReferenceSynchronizations() {
-			if ( ! synchronizationEnabled ) {
+			if ( !synchronizationEnabled ) {
 				// synchronization (this process) was disabled
 				return;
 			}
@@ -2687,13 +2707,14 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 				// only mutable natural-ids need this processing
 				return;
 			}
-			if ( ! isTransactionInProgress() ) {
+			if ( !isTransactionInProgress() ) {
 				// not in a transaction so skip synchronization
 				return;
 			}
 
 			final boolean debugEnabled = LOG.isDebugEnabled();
-			for ( Serializable pk : getPersistenceContext().getNaturalIdHelper().getCachedPkResolutions( entityPersister ) ) {
+			for ( Serializable pk : getPersistenceContext().getNaturalIdHelper()
+					.getCachedPkResolutions( entityPersister ) ) {
 				final EntityKey entityKey = generateEntityKey( pk, entityPersister );
 				final Object entity = getPersistenceContext().getEntity( entityKey );
 				final EntityEntry entry = getPersistenceContext().getEntry( entity );
@@ -2742,7 +2763,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		private final Map<String, Object> naturalIdParameters = new LinkedHashMap<String, Object>();
 
 		private NaturalIdLoadAccessImpl(EntityPersister entityPersister) {
-			super(entityPersister);
+			super( entityPersister );
 		}
 
 		private NaturalIdLoadAccessImpl(String entityName) {
@@ -2752,7 +2773,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		private NaturalIdLoadAccessImpl(Class entityClass) {
 			this( locateEntityPersister( entityClass ) );
 		}
-		
+
 		@Override
 		public NaturalIdLoadAccessImpl<T> with(LockOptions lockOptions) {
 			return (NaturalIdLoadAccessImpl<T>) super.with( lockOptions );
@@ -2800,20 +2821,24 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		}
 	}
 
-	private class SimpleNaturalIdLoadAccessImpl<T> extends BaseNaturalIdLoadAccessImpl<T> implements SimpleNaturalIdLoadAccess<T> {
+	private class SimpleNaturalIdLoadAccessImpl<T> extends BaseNaturalIdLoadAccessImpl<T>
+			implements SimpleNaturalIdLoadAccess<T> {
 		private final String naturalIdAttributeName;
 
 		private SimpleNaturalIdLoadAccessImpl(EntityPersister entityPersister) {
-			super(entityPersister);
+			super( entityPersister );
 
 			if ( entityPersister.getNaturalIdentifierProperties().length != 1 ) {
 				throw new HibernateException(
-						String.format( "Entity [%s] did not define a simple natural id", entityPersister.getEntityName() )
+						String.format(
+								"Entity [%s] did not define a simple natural id",
+								entityPersister.getEntityName()
+						)
 				);
 			}
 
 			final int naturalIdAttributePosition = entityPersister.getNaturalIdentifierProperties()[0];
-			this.naturalIdAttributeName = entityPersister.getPropertyNames()[ naturalIdAttributePosition ];
+			this.naturalIdAttributeName = entityPersister.getPropertyNames()[naturalIdAttributePosition];
 		}
 
 		private SimpleNaturalIdLoadAccessImpl(String entityName) {
@@ -2828,7 +2853,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		public final SimpleNaturalIdLoadAccessImpl<T> with(LockOptions lockOptions) {
 			return (SimpleNaturalIdLoadAccessImpl<T>) super.with( lockOptions );
 		}
-		
+
 		private Map<String, Object> getNaturalIdParameters(Object naturalIdValue) {
 			return Collections.singletonMap( naturalIdAttributeName, naturalIdValue );
 		}
@@ -2897,7 +2922,7 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 			return true;
 		}
 		final TransactionStatus status = currentHibernateTransaction.getStatus();
-		return status == TransactionStatus.ACTIVE || status ==TransactionStatus.COMMITTING;
+		return status == TransactionStatus.ACTIVE || status == TransactionStatus.COMMITTING;
 	}
 
 	private static final ExceptionMapper STANDARD_EXCEPTION_MAPPER = new ExceptionMapper() {
@@ -2927,8 +2952,8 @@ public final class SessionImpl extends AbstractSessionImpl implements EventSourc
 		@Override
 		public boolean shouldDoManagedFlush(SessionImpl session) {
 			boolean isFlushModeNever = session.isFlushModeNever();
-			return (!isFlushModeNever &&
-					!session.flushBeforeCompletionEnabled) ||
+			return ( !isFlushModeNever &&
+					!session.flushBeforeCompletionEnabled ) ||
 					!session.isClosed()
 							&& !isFlushModeNever
 							&& session.flushBeforeCompletionEnabled;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
index 3d44720b0d..47237ffeba 100755
--- a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
@@ -80,7 +80,7 @@ import org.hibernate.resource.transaction.spi.TransactionStatus;
  * @author Steve Ebersole
  */
 public class StatelessSessionImpl extends AbstractSessionImpl implements StatelessSession {
-    private static final CoreMessageLogger LOG = CoreLogging.messageLogger( StatelessSessionImpl.class );
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( StatelessSessionImpl.class );
 
 	private TransactionCoordinator transactionCoordinator;
 
@@ -124,7 +124,10 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 		);
 		this.jdbcCoordinator = new JdbcCoordinatorImpl( connection, this );
 
-		this.transactionCoordinator = getTransactionCoordinatorBuilder().buildTransactionCoordinator( jdbcCoordinator, this );
+		this.transactionCoordinator = getTransactionCoordinatorBuilder().buildTransactionCoordinator(
+				jdbcCoordinator,
+				this
+		);
 		this.currentHibernateTransaction = getTransaction();
 		this.timestamp = timestamp;
 	}
@@ -149,7 +152,7 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 	@Override
 	public Serializable insert(Object entity) {
 		errorIfClosed();
-		return insert(null, entity);
+		return insert( null, entity );
 	}
 
 	@Override
@@ -167,10 +170,10 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 			}
 		}
 		if ( id == IdentifierGeneratorHelper.POST_INSERT_INDICATOR ) {
-			id = persister.insert(state, entity, this);
+			id = persister.insert( state, entity, this );
 		}
 		else {
-			persister.insert(id, state, entity, this);
+			persister.insert( id, state, entity, this );
 		}
 		persister.setIdentifier( entity, id, this );
 		return id;
@@ -200,26 +203,26 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 	@Override
 	public void update(Object entity) {
 		errorIfClosed();
-		update(null, entity);
+		update( null, entity );
 	}
 
 	@Override
 	public void update(String entityName, Object entity) {
 		errorIfClosed();
-		EntityPersister persister = getEntityPersister(entityName, entity);
+		EntityPersister persister = getEntityPersister( entityName, entity );
 		Serializable id = persister.getIdentifier( entity, this );
 		Object[] state = persister.getPropertyValues( entity );
 		Object oldVersion;
 		if ( persister.isVersioned() ) {
 			oldVersion = persister.getVersion( entity );
 			Object newVersion = Versioning.increment( oldVersion, persister.getVersionType(), this );
-			Versioning.setVersion(state, newVersion, persister);
+			Versioning.setVersion( state, newVersion, persister );
 			persister.setPropertyValues( entity, state );
 		}
 		else {
 			oldVersion = null;
 		}
-		persister.update(id, state, null, false, null, oldVersion, entity, null, this);
+		persister.update( id, state, null, false, null, oldVersion, entity, null, this );
 	}
 
 
@@ -237,14 +240,14 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 
 	@Override
 	public Object get(String entityName, Serializable id) {
-		return get(entityName, id, LockMode.NONE);
+		return get( entityName, id, LockMode.NONE );
 	}
 
 	@Override
 	public Object get(String entityName, Serializable id, LockMode lockMode) {
 		errorIfClosed();
-		Object result = getFactory().getEntityPersister(entityName)
-				.load(id, null, lockMode, this);
+		Object result = getFactory().getEntityPersister( entityName )
+				.load( id, null, lockMode, this );
 		if ( temporaryPersistenceContext.isLoadFinished() ) {
 			temporaryPersistenceContext.clear();
 		}
@@ -302,20 +305,20 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 	@Override
 	public Object immediateLoad(String entityName, Serializable id)
 			throws HibernateException {
-		throw new SessionException("proxies cannot be fetched by a stateless session");
+		throw new SessionException( "proxies cannot be fetched by a stateless session" );
 	}
 
 	@Override
 	public void initializeCollection(
 			PersistentCollection collection,
-	        boolean writing) throws HibernateException {
-		throw new SessionException("collections cannot be fetched by a stateless session");
+			boolean writing) throws HibernateException {
+		throw new SessionException( "collections cannot be fetched by a stateless session" );
 	}
 
 	@Override
 	public Object instantiate(
 			String entityName,
-	        Serializable id) throws HibernateException {
+			Serializable id) throws HibernateException {
 		errorIfClosed();
 		return getFactory().getEntityPersister( entityName ).instantiate( id, this );
 	}
@@ -323,9 +326,9 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 	@Override
 	public Object internalLoad(
 			String entityName,
-	        Serializable id,
-	        boolean eager,
-	        boolean nullable) throws HibernateException {
+			Serializable id,
+			boolean eager,
+			boolean nullable) throws HibernateException {
 		errorIfClosed();
 		EntityPersister persister = getFactory().getEntityPersister( entityName );
 		// first, try to load it from the temp PC associated to this SS
@@ -351,13 +354,13 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 
 	@Override
 	public Iterator iterateFilter(Object collection, String filter, QueryParameters queryParameters)
-	throws HibernateException {
+			throws HibernateException {
 		throw new UnsupportedOperationException();
 	}
 
 	@Override
 	public List listFilter(Object collection, String filter, QueryParameters queryParameters)
-	throws HibernateException {
+			throws HibernateException {
 		throw new UnsupportedOperationException();
 	}
 
@@ -411,10 +414,10 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 
 	@Override
 	public String bestGuessEntityName(Object object) {
-		if (object instanceof HibernateProxy) {
+		if ( object instanceof HibernateProxy ) {
 			object = ( (HibernateProxy) object ).getHibernateLazyInitializer().getImplementation();
 		}
-		return guessEntityName(object);
+		return guessEntityName( object );
 	}
 
 	@Override
@@ -436,7 +439,7 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 			success = true;
 		}
 		finally {
-			afterOperation(success);
+			afterOperation( success );
 		}
 		temporaryPersistenceContext.clear();
 		return result;
@@ -466,7 +469,7 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 	public EntityPersister getEntityPersister(String entityName, Object object)
 			throws HibernateException {
 		errorIfClosed();
-		if ( entityName==null ) {
+		if ( entityName == null ) {
 			return factory.getEntityPersister( guessEntityName( object ) );
 		}
 		else {
@@ -576,14 +579,14 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 			success = true;
 		}
 		finally {
-			afterOperation(success);
+			afterOperation( success );
 		}
 		temporaryPersistenceContext.clear();
 		return results;
 	}
 
 	public void afterOperation(boolean success) {
-		if ( ! isTransactionInProgress() ) {
+		if ( !isTransactionInProgress() ) {
 			jdbcCoordinator.afterTransaction();
 		}
 	}
@@ -597,7 +600,7 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 	@Override
 	public Criteria createCriteria(String entityName, String alias) {
 		errorIfClosed();
-		return new CriteriaImpl(entityName, alias, this);
+		return new CriteriaImpl( entityName, alias, this );
 	}
 
 	@Override
@@ -609,44 +612,44 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 	@Override
 	public Criteria createCriteria(String entityName) {
 		errorIfClosed();
-		return new CriteriaImpl(entityName, this);
+		return new CriteriaImpl( entityName, this );
 	}
 
 	@Override
 	public ScrollableResults scroll(Criteria criteria, ScrollMode scrollMode) {
 		// TODO: Is this guaranteed to always be CriteriaImpl?
 		CriteriaImpl criteriaImpl = (CriteriaImpl) criteria;
-		
+
 		errorIfClosed();
 		String entityName = criteriaImpl.getEntityOrClassName();
 		CriteriaLoader loader = new CriteriaLoader(
 				getOuterJoinLoadable( entityName ),
-		        factory,
-		        criteriaImpl,
-		        entityName,
-		        getLoadQueryInfluencers()
+				factory,
+				criteriaImpl,
+				entityName,
+				getLoadQueryInfluencers()
 		);
-		return loader.scroll(this, scrollMode);
+		return loader.scroll( this, scrollMode );
 	}
 
 	@Override
-	@SuppressWarnings( {"unchecked"})
+	@SuppressWarnings({"unchecked"})
 	public List list(Criteria criteria) throws HibernateException {
 		// TODO: Is this guaranteed to always be CriteriaImpl?
 		CriteriaImpl criteriaImpl = (CriteriaImpl) criteria;
-		
+
 		errorIfClosed();
 		String[] implementors = factory.getImplementors( criteriaImpl.getEntityOrClassName() );
 		int size = implementors.length;
 
 		CriteriaLoader[] loaders = new CriteriaLoader[size];
-		for( int i=0; i <size; i++ ) {
+		for ( int i = 0; i < size; i++ ) {
 			loaders[i] = new CriteriaLoader(
 					getOuterJoinLoadable( implementors[i] ),
-			        factory,
-			        criteriaImpl,
-			        implementors[i],
-			        getLoadQueryInfluencers()
+					factory,
+					criteriaImpl,
+					implementors[i],
+					getLoadQueryInfluencers()
 			);
 		}
 
@@ -654,42 +657,42 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 		List results = Collections.EMPTY_LIST;
 		boolean success = false;
 		try {
-			for( int i=0; i<size; i++ ) {
-				final List currentResults = loaders[i].list(this);
-				currentResults.addAll(results);
+			for ( int i = 0; i < size; i++ ) {
+				final List currentResults = loaders[i].list( this );
+				currentResults.addAll( results );
 				results = currentResults;
 			}
 			success = true;
 		}
 		finally {
-			afterOperation(success);
+			afterOperation( success );
 		}
 		temporaryPersistenceContext.clear();
 		return results;
 	}
 
 	private OuterJoinLoadable getOuterJoinLoadable(String entityName) throws MappingException {
-		EntityPersister persister = factory.getEntityPersister(entityName);
-		if ( !(persister instanceof OuterJoinLoadable) ) {
+		EntityPersister persister = factory.getEntityPersister( entityName );
+		if ( !( persister instanceof OuterJoinLoadable ) ) {
 			throw new MappingException( "class persister is not OuterJoinLoadable: " + entityName );
 		}
-		return ( OuterJoinLoadable ) persister;
+		return (OuterJoinLoadable) persister;
 	}
 
 	@Override
 	public List listCustomQuery(CustomQuery customQuery, QueryParameters queryParameters)
-	throws HibernateException {
+			throws HibernateException {
 		errorIfClosed();
 		CustomLoader loader = new CustomLoader( customQuery, getFactory() );
 
 		boolean success = false;
 		List results;
 		try {
-			results = loader.list(this, queryParameters);
+			results = loader.list( this, queryParameters );
 			success = true;
 		}
 		finally {
-			afterOperation(success);
+			afterOperation( success );
 		}
 		temporaryPersistenceContext.clear();
 		return results;
@@ -697,7 +700,7 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 
 	@Override
 	public ScrollableResults scrollCustomQuery(CustomQuery customQuery, QueryParameters queryParameters)
-	throws HibernateException {
+			throws HibernateException {
 		errorIfClosed();
 		CustomLoader loader = new CustomLoader( customQuery, getFactory() );
 		return loader.scroll( queryParameters, this );
@@ -725,19 +728,21 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 	}
 
 	@Override
-	public int executeNativeUpdate(NativeSQLQuerySpecification nativeSQLQuerySpecification,
+	public int executeNativeUpdate(
+			NativeSQLQuerySpecification nativeSQLQuerySpecification,
 			QueryParameters queryParameters) throws HibernateException {
 		errorIfClosed();
 		queryParameters.validateParameters();
-		NativeSQLQueryPlan plan = getNativeSQLQueryPlan(nativeSQLQuerySpecification);
+		NativeSQLQueryPlan plan = getNativeSQLQueryPlan( nativeSQLQuerySpecification );
 
 		boolean success = false;
 		int result = 0;
 		try {
-			result = plan.performExecuteUpdate(queryParameters, this);
+			result = plan.performExecuteUpdate( queryParameters, this );
 			success = true;
-		} finally {
-			afterOperation(success);
+		}
+		finally {
+			afterOperation( success );
 		}
 		temporaryPersistenceContext.clear();
 		return result;
@@ -774,7 +779,7 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements Statele
 							&& !isFlushModeNever()
 							&& !JtaStatusHelper.isRollback(
 							getJtaPlatform().getCurrentStatus()
-					));
+					) );
 		}
 		catch (SystemException se) {
 			throw new HibernateException( "could not determine transaction status in beforeCompletion()", se );
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java
index 392c9e64f3..48ddd0434f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/BytesHelper.java
@@ -111,7 +111,7 @@ public final class BytesHelper {
 			throw new IllegalArgumentException( "Expecting 8 byte values to construct a long" );
 		}
 		long value = 0;
-        for (int i=0; i<8; i++) {
+		for (int i=0; i<8; i++) {
 			value = (value << 8) | (bytes[i] & 0xff);
 		}
 		return value;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/Cloneable.java b/hibernate-core/src/main/java/org/hibernate/internal/util/Cloneable.java
index cc02dd80a3..39fbc8d441 100755
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/Cloneable.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/Cloneable.java
@@ -20,7 +20,6 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.internal.util;
 
@@ -35,11 +34,11 @@ import org.hibernate.HibernateException;
 
 /**
  * An object that is shallow-coneable
- * 
+ *
  * @author Steve Ebersole
  */
 public class Cloneable {
-	
+
 	private static final Object[] READER_METHOD_ARGS = new Object[0];
 
 	/**
@@ -51,12 +50,13 @@ public class Cloneable {
 	 */
 	public Object shallowCopy() {
 		return AccessController.doPrivileged(
-		        new PrivilegedAction() {
-			        public Object run() {
-				        return copyListeners();
-			        }
-		        }
-			);
+				new PrivilegedAction() {
+					@Override
+					public Object run() {
+						return copyListeners();
+					}
+				}
+		);
 	}
 
 	/**
@@ -68,13 +68,14 @@ public class Cloneable {
 	 */
 	public void validate() throws HibernateException {
 		AccessController.doPrivileged(
-		        new PrivilegedAction() {
-			        public Object run() {
-				        checkListeners();
-				        return null;
-			        }
-		        }
-			);
+				new PrivilegedAction() {
+					@Override
+					public Object run() {
+						checkListeners();
+						return null;
+					}
+				}
+		);
 
 	}
 
@@ -86,21 +87,19 @@ public class Cloneable {
 			internalCheckListeners( beanInfo );
 			copy = getClass().newInstance();
 			PropertyDescriptor[] pds = beanInfo.getPropertyDescriptors();
-			for ( int i = 0, max = pds.length; i < max; i++ ) {
+			for ( PropertyDescriptor pd : pds ) {
 				try {
-					pds[i].getWriteMethod().invoke(
+					pd.getWriteMethod().invoke(
 							copy,
-							new Object[] {
-								pds[i].getReadMethod().invoke( this, READER_METHOD_ARGS )
-							}
-						);
+							pd.getReadMethod().invoke( this, READER_METHOD_ARGS )
+					);
 				}
-				catch( Throwable t ) {
-					throw new HibernateException( "Unable copy copy listener [" + pds[i].getName() + "]" );
+				catch (Throwable t) {
+					throw new HibernateException( "Unable copy copy listener [" + pd.getName() + "]" );
 				}
 			}
 		}
-		catch( Exception t ) {
+		catch (Exception t) {
 			throw new HibernateException( "Unable to copy listeners", t );
 		}
 		finally {
@@ -110,7 +109,7 @@ public class Cloneable {
 				Introspector.flushFromCaches( getClass() );
 			}
 		}
-		
+
 		return copy;
 	}
 
@@ -120,7 +119,7 @@ public class Cloneable {
 			beanInfo = Introspector.getBeanInfo( getClass(), Object.class );
 			internalCheckListeners( beanInfo );
 		}
-		catch( IntrospectionException t ) {
+		catch (IntrospectionException t) {
 			throw new HibernateException( "Unable to validate listener config", t );
 		}
 		finally {
@@ -135,28 +134,27 @@ public class Cloneable {
 	private void internalCheckListeners(BeanInfo beanInfo) {
 		PropertyDescriptor[] pds = beanInfo.getPropertyDescriptors();
 		try {
-			for ( int i = 0, max = pds.length; i < max; i++ ) {
-				final Object listener = pds[i].getReadMethod().invoke( this, READER_METHOD_ARGS );
+			for ( PropertyDescriptor pd : pds ) {
+				final Object listener = pd.getReadMethod().invoke( this, READER_METHOD_ARGS );
 				if ( listener == null ) {
-					throw new HibernateException( "Listener [" + pds[i].getName() + "] was null" );
+					throw new HibernateException( "Listener [" + pd.getName() + "] was null" );
 				}
 				if ( listener.getClass().isArray() ) {
 					Object[] listenerArray = (Object[]) listener;
-					int length = listenerArray.length;
-					for ( int index = 0 ; index < length ; index++ ) {
-						if ( listenerArray[index] == null ) {
-							throw new HibernateException( "Listener in [" + pds[i].getName() + "] was null" );
+					for ( Object aListenerArray : listenerArray ) {
+						if ( aListenerArray == null ) {
+							throw new HibernateException( "Listener in [" + pd.getName() + "] was null" );
 						}
 					}
 				}
 			}
 		}
-		catch( HibernateException e ) {
+		catch (HibernateException e) {
 			throw e;
 		}
-		catch( Throwable t ) {
+		catch (Throwable t) {
 			throw new HibernateException( "Unable to validate listener config" );
 		}
 	}
-	
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java
index f26abfaa9c..f989694c8d 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java
@@ -33,34 +33,34 @@ import java.util.Properties;
 
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.Environment;
+import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 
-import org.jboss.logging.Logger;
-
 /**
  * A simple class to centralize logic needed to locate config files on the system.
  *
- * @todo : Update usages to use {@link org.hibernate.boot.registry.classloading.spi.ClassLoaderService}
- *
  * @author Steve Ebersole
+ * @todo : Update usages to use {@link org.hibernate.boot.registry.classloading.spi.ClassLoaderService}
  */
 public final class ConfigHelper {
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, ConfigHelper.class.getName());
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( ConfigHelper.class );
 
-	/** Try to locate a local URL representing the incoming path.  The first attempt
+	/**
+	 * Try to locate a local URL representing the incoming path.  The first attempt
 	 * assumes that the incoming path is an actual URL string (file://, etc).  If this
 	 * does not work, then the next attempts try to locate this UURL as a java system
 	 * resource.
 	 *
 	 * @param path The path representing the config location.
+	 *
 	 * @return An appropriate URL or null.
 	 */
 	public static URL locateConfig(final String path) {
 		try {
-			return new URL(path);
+			return new URL( path );
 		}
-		catch(MalformedURLException e) {
-			return findAsResource(path);
+		catch (MalformedURLException e) {
+			return findAsResource( path );
 		}
 	}
 
@@ -70,6 +70,7 @@ public final class ConfigHelper {
 	 * java system resource.
 	 *
 	 * @param path The path representing the config location.
+	 *
 	 * @return An appropriate URL or null.
 	 */
 	public static URL findAsResource(final String path) {
@@ -78,91 +79,101 @@ public final class ConfigHelper {
 		// First, try to locate this resource through the current
 		// context classloader.
 		ClassLoader contextClassLoader = ClassLoaderHelper.getContextClassLoader();
-		if (contextClassLoader!=null) {
-			url = contextClassLoader.getResource(path);
+		if ( contextClassLoader != null ) {
+			url = contextClassLoader.getResource( path );
 		}
-		if (url != null) {
+		if ( url != null ) {
 			return url;
 		}
 
 		// Next, try to locate this resource through this class's classloader
-		url = ConfigHelper.class.getClassLoader().getResource(path);
-		if (url != null) {
+		url = ConfigHelper.class.getClassLoader().getResource( path );
+		if ( url != null ) {
 			return url;
 		}
 
 		// Next, try to locate this resource through the system classloader
-		url = ClassLoader.getSystemClassLoader().getResource(path);
+		url = ClassLoader.getSystemClassLoader().getResource( path );
 
 		// Anywhere else we should look?
 		return url;
 	}
 
-	/** Open an InputStream to the URL represented by the incoming path.  First makes a call
+	/**
+	 * Open an InputStream to the URL represented by the incoming path.  First makes a call
 	 * to {@link #locateConfig(java.lang.String)} in order to find an appropriate URL.
 	 * {@link java.net.URL#openStream()} is then called to obtain the stream.
 	 *
 	 * @param path The path representing the config location.
+	 *
 	 * @return An input stream to the requested config resource.
+	 *
 	 * @throws HibernateException Unable to open stream to that resource.
 	 */
 	public static InputStream getConfigStream(final String path) throws HibernateException {
-		final URL url = ConfigHelper.locateConfig(path);
+		final URL url = ConfigHelper.locateConfig( path );
 
-		if (url == null) {
-            String msg = LOG.unableToLocateConfigFile(path);
-            LOG.error(msg);
-			throw new HibernateException(msg);
+		if ( url == null ) {
+			String msg = LOG.unableToLocateConfigFile( path );
+			LOG.error( msg );
+			throw new HibernateException( msg );
 		}
 
 		try {
 			return url.openStream();
-        }
-		catch(IOException e) {
-	        throw new HibernateException("Unable to open config file: " + path, e);
-        }
+		}
+		catch (IOException e) {
+			throw new HibernateException( "Unable to open config file: " + path, e );
+		}
 	}
 
-	/** Open an Reader to the URL represented by the incoming path.  First makes a call
+	/**
+	 * Open an Reader to the URL represented by the incoming path.  First makes a call
 	 * to {@link #locateConfig(java.lang.String)} in order to find an appropriate URL.
 	 * {@link java.net.URL#openStream()} is then called to obtain a stream, which is then
 	 * wrapped in a Reader.
 	 *
 	 * @param path The path representing the config location.
+	 *
 	 * @return An input stream to the requested config resource.
+	 *
 	 * @throws HibernateException Unable to open reader to that resource.
 	 */
 	public static Reader getConfigStreamReader(final String path) throws HibernateException {
-		return new InputStreamReader( getConfigStream(path) );
+		return new InputStreamReader( getConfigStream( path ) );
 	}
 
-	/** Loads a properties instance based on the data at the incoming config location.
+	/**
+	 * Loads a properties instance based on the data at the incoming config location.
 	 *
 	 * @param path The path representing the config location.
+	 *
 	 * @return The loaded properties instance.
+	 *
 	 * @throws HibernateException Unable to load properties from that resource.
 	 */
 	public static Properties getConfigProperties(String path) throws HibernateException {
 		try {
 			Properties properties = new Properties();
-			properties.load( getConfigStream(path) );
+			properties.load( getConfigStream( path ) );
 			return properties;
 		}
-		catch(IOException e) {
-			throw new HibernateException("Unable to load properties from specified config file: " + path, e);
+		catch (IOException e) {
+			throw new HibernateException( "Unable to load properties from specified config file: " + path, e );
 		}
 	}
 
-	private ConfigHelper() {}
+	private ConfigHelper() {
+	}
 
 	public static InputStream getResourceAsStream(String resource) {
-		String stripped = resource.startsWith("/")
-				? resource.substring(1)
+		String stripped = resource.startsWith( "/" )
+				? resource.substring( 1 )
 				: resource;
 
 		InputStream stream = null;
 		ClassLoader classLoader = ClassLoaderHelper.getContextClassLoader();
-		if (classLoader!=null) {
+		if ( classLoader != null ) {
 			stream = classLoader.getResourceAsStream( stripped );
 		}
 		if ( stream == null ) {
@@ -180,7 +191,7 @@ public final class ConfigHelper {
 
 	public static InputStream getUserResourceAsStream(String resource) {
 		boolean hasLeadingSlash = resource.startsWith( "/" );
-		String stripped = hasLeadingSlash ? resource.substring(1) : resource;
+		String stripped = hasLeadingSlash ? resource.substring( 1 ) : resource;
 
 		InputStream stream = null;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java b/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java
index 5cfce5f089..2e814c9cda 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/EntityPrinter.java
@@ -39,18 +39,20 @@ import org.hibernate.type.Type;
 
 /**
  * Renders entities and query parameters to a nicely readable string.
+ *
  * @author Gavin King
  */
 public final class EntityPrinter {
-    private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityPrinter.class );
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( EntityPrinter.class );
 
-    private SessionFactoryImplementor factory;
+	private SessionFactoryImplementor factory;
 
 	/**
 	 * Renders an entity to a string.
 	 *
 	 * @param entityName the entity name
 	 * @param entity an actual entity object, not a proxy!
+	 *
 	 * @return the entity rendered to a string
 	 */
 	public String toString(String entityName, Object entity) throws HibernateException {
@@ -60,23 +62,26 @@ public final class EntityPrinter {
 			return entity.getClass().getName();
 		}
 
-		Map<String,String> result = new HashMap<String,String>();
+		Map<String, String> result = new HashMap<String, String>();
 
 		if ( entityPersister.hasIdentifierProperty() ) {
 			result.put(
-				entityPersister.getIdentifierPropertyName(),
-				entityPersister.getIdentifierType().toLoggableString( entityPersister.getIdentifier( entity ), factory )
+					entityPersister.getIdentifierPropertyName(),
+					entityPersister.getIdentifierType().toLoggableString(
+							entityPersister.getIdentifier( entity ),
+							factory
+					)
 			);
 		}
 
 		Type[] types = entityPersister.getPropertyTypes();
 		String[] names = entityPersister.getPropertyNames();
 		Object[] values = entityPersister.getPropertyValues( entity );
-		for ( int i=0; i<types.length; i++ ) {
-			if ( !names[i].startsWith("_") ) {
-				String strValue = values[i]==LazyPropertyInitializer.UNFETCHED_PROPERTY ?
-					values[i].toString() :
-					types[i].toLoggableString( values[i], factory );
+		for ( int i = 0; i < types.length; i++ ) {
+			if ( !names[i].startsWith( "_" ) ) {
+				String strValue = values[i] == LazyPropertyInitializer.UNFETCHED_PROPERTY ?
+						values[i].toString() :
+						types[i].toLoggableString( values[i], factory );
 				result.put( names[i], strValue );
 			}
 		}
@@ -85,16 +90,16 @@ public final class EntityPrinter {
 
 	public String toString(Type[] types, Object[] values) throws HibernateException {
 		StringBuilder buffer = new StringBuilder();
-		for ( int i=0; i<types.length; i++ ) {
-			if ( types[i]!=null ) {
+		for ( int i = 0; i < types.length; i++ ) {
+			if ( types[i] != null ) {
 				buffer.append( types[i].toLoggableString( values[i], factory ) ).append( ", " );
 			}
 		}
 		return buffer.toString();
 	}
 
-	public String toString(Map<String,TypedValue> namedTypedValues) throws HibernateException {
-		Map<String,String> result = new HashMap<String,String>();
+	public String toString(Map<String, TypedValue> namedTypedValues) throws HibernateException {
+		Map<String, String> result = new HashMap<String, String>();
 		for ( Map.Entry<String, TypedValue> entry : namedTypedValues.entrySet() ) {
 			result.put(
 					entry.getKey(), entry.getValue().getType().toLoggableString(
@@ -107,19 +112,19 @@ public final class EntityPrinter {
 	}
 
 	// Cannot use Map as an argument because it clashes with the previous method (due to type erasure)
-	public void toString(Iterable<Map.Entry<EntityKey,Object>> entitiesByEntityKey) throws HibernateException {
-        if ( ! LOG.isDebugEnabled() || ! entitiesByEntityKey.iterator().hasNext() ) {
+	public void toString(Iterable<Map.Entry<EntityKey, Object>> entitiesByEntityKey) throws HibernateException {
+		if ( !LOG.isDebugEnabled() || !entitiesByEntityKey.iterator().hasNext() ) {
 			return;
 		}
 
-        LOG.debug( "Listing entities:" );
-		int i=0;
-		for (  Map.Entry<EntityKey,Object> entityKeyAndEntity : entitiesByEntityKey ) {
-			if (i++>20) {
-                LOG.debug("More......");
+		LOG.debug( "Listing entities:" );
+		int i = 0;
+		for ( Map.Entry<EntityKey, Object> entityKeyAndEntity : entitiesByEntityKey ) {
+			if ( i++ > 20 ) {
+				LOG.debug( "More......" );
 				break;
 			}
-            LOG.debug( toString( entityKeyAndEntity.getKey().getEntityName(), entityKeyAndEntity.getValue() ) );
+			LOG.debug( toString( entityKeyAndEntity.getKey().getEntityName(), entityKeyAndEntity.getValue() ) );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java b/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java
index d22d4d5be6..3210ccef2f 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/LockModeConverter.java
@@ -61,7 +61,7 @@ public final class LockModeConverter {
 		else if ( lockMode == LockMode.PESSIMISTIC_WRITE
 				|| lockMode == LockMode.UPGRADE
 				|| lockMode == LockMode.UPGRADE_NOWAIT
-                || lockMode == LockMode.UPGRADE_SKIPLOCKED) {
+				|| lockMode == LockMode.UPGRADE_SKIPLOCKED) {
 			return LockModeType.PESSIMISTIC_WRITE;
 		}
 		else if ( lockMode == LockMode.PESSIMISTIC_FORCE_INCREMENT
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java b/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java
index 86fdae7089..ee8a4845b2 100755
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/MarkerObject.java
@@ -31,12 +31,13 @@ import java.io.Serializable;
  */
 public class MarkerObject implements Serializable {
 	private String name;
-	
+
 	public MarkerObject(String name) {
-		this.name=name;
+		this.name = name;
 	}
+
 	@Override
-    public String toString() {
+	public String toString() {
 		return name;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java
index d94fbf393c..4095cc1de5 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java
@@ -39,8 +39,6 @@ import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.type.SerializationException;
 
-import org.jboss.logging.Logger;
-
 /**
  * <p>Assists with the serialization process and performs additional functionality based
  * on serialization.</p>
@@ -50,7 +48,7 @@ import org.jboss.logging.Logger;
  * <li>Serialize managing finally and IOException
  * <li>Deserialize managing finally and IOException
  * </ul>
- *
+ * <p/>
  * <p>This class throws exceptions for invalid <code>null</code> inputs.
  * Each method documents its behaviour in more detail.</p>
  *
@@ -60,11 +58,11 @@ import org.jboss.logging.Logger;
  * @author Stephen Colebourne
  * @author Jeff Varszegi
  * @author Gary Gregory
- * @version $Id: SerializationHelper.java 9180 2006-01-30 23:51:27Z steveebersole $
+ *
  * @since 1.0
  */
 public final class SerializationHelper {
-    private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SerializationHelper.class );
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SerializationHelper.class );
 
 	private SerializationHelper() {
 	}
@@ -74,7 +72,7 @@ public final class SerializationHelper {
 
 	/**
 	 * <p>Deep clone an <code>Object</code> using serialization.</p>
-	 *
+	 * <p/>
 	 * <p>This is many times slower than writing clone methods by hand
 	 * on all objects in your object graph. However, for complex object
 	 * graphs, or for those that don't support deep cloning this can
@@ -100,11 +98,11 @@ public final class SerializationHelper {
 
 	/**
 	 * <p>Serializes an <code>Object</code> to the specified stream.</p>
-	 *
+	 * <p/>
 	 * <p>The stream will be closed once the object is written.
 	 * This avoids the need for a finally clause, and maybe also exception
 	 * handling, in the application code.</p>
-	 *
+	 * <p/>
 	 * <p>The stream passed in is not buffered internally within this method.
 	 * This is the responsibility of your application if desired.</p>
 	 *
@@ -135,7 +133,7 @@ public final class SerializationHelper {
 			out.writeObject( obj );
 
 		}
-		catch ( IOException ex ) {
+		catch (IOException ex) {
 			throw new SerializationException( "could not serialize", ex );
 		}
 		finally {
@@ -144,7 +142,7 @@ public final class SerializationHelper {
 					out.close();
 				}
 			}
-			catch ( IOException ignored ) {
+			catch (IOException ignored) {
 			}
 		}
 	}
@@ -244,22 +242,22 @@ public final class SerializationHelper {
 			try {
 				return (T) in.readObject();
 			}
-			catch ( ClassNotFoundException e ) {
+			catch (ClassNotFoundException e) {
 				throw new SerializationException( "could not deserialize", e );
 			}
-			catch ( IOException e ) {
+			catch (IOException e) {
 				throw new SerializationException( "could not deserialize", e );
 			}
 			finally {
 				try {
 					in.close();
 				}
-				catch ( IOException ignore ) {
+				catch (IOException ignore) {
 					// ignore
 				}
 			}
 		}
-		catch ( IOException e ) {
+		catch (IOException e) {
 			throw new SerializationException( "could not deserialize", e );
 		}
 	}
@@ -343,7 +341,7 @@ public final class SerializationHelper {
 			try {
 				return Class.forName( className, false, loader1 );
 			}
-			catch ( ClassNotFoundException e ) {
+			catch (ClassNotFoundException e) {
 				LOG.trace( "Unable to locate class using given classloader" );
 			}
 
@@ -351,7 +349,7 @@ public final class SerializationHelper {
 				try {
 					return Class.forName( className, false, loader2 );
 				}
-				catch ( ClassNotFoundException e ) {
+				catch (ClassNotFoundException e) {
 					LOG.trace( "Unable to locate class using given classloader" );
 				}
 			}
@@ -360,7 +358,7 @@ public final class SerializationHelper {
 				try {
 					return Class.forName( className, false, loader3 );
 				}
-				catch ( ClassNotFoundException e ) {
+				catch (ClassNotFoundException e) {
 					LOG.trace( "Unable to locate class using given classloader" );
 				}
 			}
@@ -371,10 +369,10 @@ public final class SerializationHelper {
 		}
 
 		private boolean different(ClassLoader one, ClassLoader other) {
-            if (one == null) {
+			if ( one == null ) {
 				return other != null;
 			}
-            return !one.equals(other);
+			return !one.equals( other );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java
index 226092c73b..dd57a6ead2 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java
@@ -45,14 +45,14 @@ public final class StringHelper {
 	}
 
 	public static int lastIndexOfLetter(String string) {
-		for ( int i=0; i<string.length(); i++ ) {
-			char character = string.charAt(i);
+		for ( int i = 0; i < string.length(); i++ ) {
+			char character = string.charAt( i );
 			// Include "_".  See HHH-8073
-			if ( !Character.isLetter(character) && !('_'==character) ) {
-				return i-1;
+			if ( !Character.isLetter( character ) && !( '_' == character ) ) {
+				return i - 1;
 			}
 		}
-		return string.length()-1;
+		return string.length() - 1;
 	}
 
 	public static String join(String seperator, String[] strings) {
@@ -68,7 +68,11 @@ public final class StringHelper {
 		return buf.toString();
 	}
 
-	public static String joinWithQualifierAndSuffix(String[] values, String qualifier, String suffix, String deliminator) {
+	public static String joinWithQualifierAndSuffix(
+			String[] values,
+			String qualifier,
+			String suffix,
+			String deliminator) {
 		int length = values.length;
 		if ( length == 0 ) {
 			return "";
@@ -113,7 +117,7 @@ public final class StringHelper {
 	}
 
 	public static String repeat(String string, int times, String deliminator) {
-		StringBuilder buf = new StringBuilder(  ( string.length() * times ) + ( deliminator.length() * (times-1) ) )
+		StringBuilder buf = new StringBuilder( ( string.length() * times ) + ( deliminator.length() * ( times - 1 ) ) )
 				.append( string );
 		for ( int i = 1; i < times; i++ ) {
 			buf.append( deliminator ).append( string );
@@ -134,7 +138,7 @@ public final class StringHelper {
 
 	public static String[] replace(String[] templates, String placeholder, String replacement) {
 		String[] result = new String[templates.length];
-		for ( int i =0; i<templates.length; i++ ) {
+		for ( int i = 0; i < templates.length; i++ ) {
 			result[i] = replace( templates[i], placeholder, replacement );
 		}
 		return result;
@@ -160,7 +164,14 @@ public final class StringHelper {
 		else {
 			String beforePlaceholder = template.substring( 0, loc );
 			String afterPlaceholder = template.substring( loc + placeholder.length() );
-			return replace( beforePlaceholder, afterPlaceholder, placeholder, replacement, wholeWords, encloseInParensIfNecessary );
+			return replace(
+					beforePlaceholder,
+					afterPlaceholder,
+					placeholder,
+					replacement,
+					wholeWords,
+					encloseInParensIfNecessary
+			);
 		}
 	}
 
@@ -173,14 +184,14 @@ public final class StringHelper {
 			boolean wholeWords,
 			boolean encloseInParensIfNecessary) {
 		final boolean actuallyReplace =
-				! wholeWords
+				!wholeWords
 						|| afterPlaceholder.length() == 0
-						|| ! Character.isJavaIdentifierPart( afterPlaceholder.charAt( 0 ) );
+						|| !Character.isJavaIdentifierPart( afterPlaceholder.charAt( 0 ) );
 		boolean encloseInParens =
 				actuallyReplace
 						&& encloseInParensIfNecessary
-						&& ! ( getLastNonWhitespaceCharacter( beforePlaceholder ) == '(' )
-						&& ! ( getFirstNonWhitespaceCharacter( afterPlaceholder ) == ')' );
+						&& !( getLastNonWhitespaceCharacter( beforePlaceholder ) == '(' )
+						&& !( getFirstNonWhitespaceCharacter( afterPlaceholder ) == ')' );
 		StringBuilder buf = new StringBuilder( beforePlaceholder );
 		if ( encloseInParens ) {
 			buf.append( '(' );
@@ -203,9 +214,9 @@ public final class StringHelper {
 
 	public static char getLastNonWhitespaceCharacter(String str) {
 		if ( str != null && str.length() > 0 ) {
-			for ( int i = str.length() - 1 ; i >= 0 ; i-- ) {
+			for ( int i = str.length() - 1; i >= 0; i-- ) {
 				char ch = str.charAt( i );
-				if ( ! Character.isWhitespace( ch ) ) {
+				if ( !Character.isWhitespace( ch ) ) {
 					return ch;
 				}
 			}
@@ -215,9 +226,9 @@ public final class StringHelper {
 
 	public static char getFirstNonWhitespaceCharacter(String str) {
 		if ( str != null && str.length() > 0 ) {
-			for ( int i = 0 ; i < str.length() ; i++ ) {
+			for ( int i = 0; i < str.length(); i++ ) {
 				char ch = str.charAt( i );
-				if ( ! Character.isWhitespace( ch ) ) {
+				if ( !Character.isWhitespace( ch ) ) {
 					return ch;
 				}
 			}
@@ -229,7 +240,7 @@ public final class StringHelper {
 		if ( template == null ) {
 			return null;  // returnign null!
 		}
-        int loc = template.indexOf( placeholder );
+		int loc = template.indexOf( placeholder );
 		if ( loc < 0 ) {
 			return template;
 		}
@@ -245,7 +256,7 @@ public final class StringHelper {
 
 	public static String[] split(String seperators, String list, boolean include) {
 		StringTokenizer tokens = new StringTokenizer( list, seperators, include );
-		String[] result = new String[ tokens.countTokens() ];
+		String[] result = new String[tokens.countTokens()];
 		int i = 0;
 		while ( tokens.hasMoreTokens() ) {
 			result[i++] = tokens.nextToken();
@@ -254,12 +265,12 @@ public final class StringHelper {
 	}
 
 	public static String unqualify(String qualifiedName) {
-		int loc = qualifiedName.lastIndexOf(".");
+		int loc = qualifiedName.lastIndexOf( "." );
 		return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( loc + 1 );
 	}
 
 	public static String qualifier(String qualifiedName) {
-		int loc = qualifiedName.lastIndexOf(".");
+		int loc = qualifiedName.lastIndexOf( "." );
 		return ( loc < 0 ) ? "" : qualifiedName.substring( 0, loc );
 	}
 
@@ -269,6 +280,7 @@ public final class StringHelper {
 	 * classname will result in <samp>'o.h.u.StringHelper'<samp>.
 	 *
 	 * @param name The name to collapse.
+	 *
 	 * @return The collapsed name.
 	 */
 	public static String collapse(String name) {
@@ -279,7 +291,10 @@ public final class StringHelper {
 		if ( breakPoint < 0 ) {
 			return name;
 		}
-		return collapseQualifier( name.substring( 0, breakPoint ), true ) + name.substring( breakPoint ); // includes last '.'
+		return collapseQualifier(
+				name.substring( 0, breakPoint ),
+				true
+		) + name.substring( breakPoint ); // includes last '.'
 	}
 
 	/**
@@ -312,7 +327,7 @@ public final class StringHelper {
 	 * @return The name itself, or the partially unqualified form if it begins with the qualifier base.
 	 */
 	public static String partiallyUnqualify(String name, String qualifierBase) {
-		if ( name == null || ! name.startsWith( qualifierBase ) ) {
+		if ( name == null || !name.startsWith( qualifierBase ) ) {
 			return name;
 		}
 		return name.substring( qualifierBase.length() + 1 ); // +1 to start after the following '.'
@@ -329,14 +344,16 @@ public final class StringHelper {
 	 * @return The name itself if it does not begin with the qualifierBase, or the properly collapsed form otherwise.
 	 */
 	public static String collapseQualifierBase(String name, String qualifierBase) {
-		if ( name == null || ! name.startsWith( qualifierBase ) ) {
+		if ( name == null || !name.startsWith( qualifierBase ) ) {
 			return collapse( name );
 		}
 		return collapseQualifier( qualifierBase, true ) + name.substring( qualifierBase.length() );
 	}
 
 	public static String[] suffix(String[] columns, String suffix) {
-		if ( suffix == null ) return columns;
+		if ( suffix == null ) {
+			return columns;
+		}
 		String[] qualified = new String[columns.length];
 		for ( int i = 0; i < columns.length; i++ ) {
 			qualified[i] = suffix( columns[i], suffix );
@@ -355,7 +372,7 @@ public final class StringHelper {
 
 	public static String unroot(String qualifiedName) {
 		int loc = qualifiedName.indexOf( "." );
-		return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( loc+1, qualifiedName.length() );
+		return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( loc + 1, qualifiedName.length() );
 	}
 
 	public static boolean booleanValue(String tfString) {
@@ -370,15 +387,15 @@ public final class StringHelper {
 		}
 		StringBuilder buf = new StringBuilder( len * 12 );
 		for ( int i = 0; i < len - 1; i++ ) {
-			buf.append( array[i] ).append(", ");
+			buf.append( array[i] ).append( ", " );
 		}
 		return buf.append( array[len - 1] ).toString();
 	}
 
 	public static String[] multiply(String string, Iterator placeholders, Iterator replacements) {
-		String[] result = new String[]{string};
+		String[] result = new String[] {string};
 		while ( placeholders.hasNext() ) {
-			result = multiply( result, ( String ) placeholders.next(), ( String[] ) replacements.next() );
+			result = multiply( result, (String) placeholders.next(), (String[]) replacements.next() );
 		}
 		return result;
 	}
@@ -398,8 +415,9 @@ public final class StringHelper {
 		if ( '\'' == character ) {
 			throw new IllegalArgumentException( "Unquoted count of quotes is invalid" );
 		}
-		if (string == null)
+		if ( string == null ) {
 			return 0;
+		}
 		// Impl note: takes advantage of the fact that an escpaed single quote
 		// embedded within a quote-block can really be handled as two seperate
 		// quote-blocks for the purposes of this method...
@@ -427,7 +445,7 @@ public final class StringHelper {
 		if ( '\'' == character ) {
 			throw new IllegalArgumentException( "Unquoted count of quotes is invalid" );
 		}
-		if (string == null) {
+		if ( string == null ) {
 			return new int[0];
 		}
 
@@ -463,7 +481,7 @@ public final class StringHelper {
 		return string == null || string.length() == 0;
 	}
 
-	public static boolean isEmptyOrWhiteSpace(String string){
+	public static boolean isEmptyOrWhiteSpace(String string) {
 		return isEmpty( string ) || isEmpty( string.trim() );
 	}
 
@@ -532,7 +550,7 @@ public final class StringHelper {
 	}
 
 	public static String generateAlias(String description) {
-		return generateAliasRoot(description) + '_';
+		return generateAliasRoot( description ) + '_';
 	}
 
 	/**
@@ -545,8 +563,8 @@ public final class StringHelper {
 	 * @return an alias of the form <samp>foo1_</samp>
 	 */
 	public static String generateAlias(String description, int unique) {
-		return generateAliasRoot(description)
-				+ Integer.toString(unique)
+		return generateAliasRoot( description )
+				+ Integer.toString( unique )
 				+ '_';
 	}
 
@@ -556,15 +574,16 @@ public final class StringHelper {
 	 * alias characters.
 	 *
 	 * @param description The root name from which to generate a root alias.
+	 *
 	 * @return The generated root alias.
 	 */
 	private static String generateAliasRoot(String description) {
-		String result = truncate( unqualifyEntityName(description), ALIAS_TRUNCATE_LENGTH )
-				.toLowerCase(Locale.ROOT)
-		        .replace( '/', '_' ) // entityNames may now include slashes for the representations
+		String result = truncate( unqualifyEntityName( description ), ALIAS_TRUNCATE_LENGTH )
+				.toLowerCase( Locale.ROOT )
+				.replace( '/', '_' ) // entityNames may now include slashes for the representations
 				.replace( '$', '_' ); //classname may be an inner class
 		result = cleanAlias( result );
-		if ( Character.isDigit( result.charAt(result.length()-1) ) ) {
+		if ( Character.isDigit( result.charAt( result.length() - 1 ) ) ) {
 			return result + "x"; //ick!
 		}
 		else {
@@ -577,6 +596,7 @@ public final class StringHelper {
 	 * beginning.
 	 *
 	 * @param alias The generated alias to be cleaned.
+	 *
 	 * @return The cleaned alias, stripped of any leading non-alpha characters.
 	 */
 	private static String cleanAlias(String alias) {
@@ -595,7 +615,7 @@ public final class StringHelper {
 	}
 
 	public static String unqualifyEntityName(String entityName) {
-		String result = unqualify(entityName);
+		String result = unqualify( entityName );
 		int slashPos = result.indexOf( '/' );
 		if ( slashPos > 0 ) {
 			result = result.substring( 0, slashPos - 1 );
@@ -604,10 +624,10 @@ public final class StringHelper {
 	}
 
 	public static String moveAndToBeginning(String filter) {
-		if ( filter.trim().length()>0 ){
+		if ( filter.trim().length() > 0 ) {
 			filter += " and ";
-			if ( filter.startsWith(" and ") ) {
-				filter = filter.substring(4);
+			if ( filter.startsWith( " and " ) ) {
+				filter = filter.substring( 4 );
 			}
 		}
 		return filter;
@@ -617,12 +637,13 @@ public final class StringHelper {
 	 * Determine if the given string is quoted (wrapped by '`' characters at beginning and end).
 	 *
 	 * @param name The name to check.
+	 *
 	 * @return True if the given string starts and ends with '`'; false otherwise.
 	 */
 	public static boolean isQuoted(String name) {
-		return name != null && name.length() != 0 
+		return name != null && name.length() != 0
 				&& ( ( name.charAt( 0 ) == '`' && name.charAt( name.length() - 1 ) == '`' )
-						|| ( name.charAt( 0 ) == '"' && name.charAt( name.length() - 1 ) == '"' ) );
+				|| ( name.charAt( 0 ) == '"' && name.charAt( name.length() - 1 ) == '"' ) );
 	}
 
 	/**
@@ -630,6 +651,7 @@ public final class StringHelper {
 	 * return name.
 	 *
 	 * @param name The name to quote.
+	 *
 	 * @return The quoted version.
 	 */
 	public static String quote(String name) {
@@ -637,9 +659,9 @@ public final class StringHelper {
 			return name;
 		}
 		// Convert the JPA2 specific quoting character (double quote) to Hibernate's (back tick)
-        else if ( name.startsWith( "\"" ) && name.endsWith( "\"" ) ) {
-            name = name.substring( 1, name.length() - 1 );
-        }
+		else if ( name.startsWith( "\"" ) && name.endsWith( "\"" ) ) {
+			name = name.substring( 1, name.length() - 1 );
+		}
 
 		return "`" + name + '`';
 	}
@@ -648,6 +670,7 @@ public final class StringHelper {
 	 * Return the unquoted version of name (stripping the start and end '`' characters if present).
 	 *
 	 * @param name The name to be unquoted.
+	 *
 	 * @return The unquoted version.
 	 */
 	public static String unquote(String name) {
@@ -659,7 +682,7 @@ public final class StringHelper {
 	 * <ol>
 	 * <li>starts AND ends with backticks (`)</li>
 	 * <li>starts with dialect-specified {@link org.hibernate.dialect.Dialect#openQuote() open-quote}
-	 * 		AND ends with dialect-specified {@link org.hibernate.dialect.Dialect#closeQuote() close-quote}</li>
+	 * AND ends with dialect-specified {@link org.hibernate.dialect.Dialect#closeQuote() close-quote}</li>
 	 * </ol>
 	 *
 	 * @param name The name to check
@@ -668,11 +691,11 @@ public final class StringHelper {
 	 * @return True if quoted, false otherwise
 	 */
 	public static boolean isQuoted(String name, Dialect dialect) {
-		return name != null && name.length() != 0 
+		return name != null && name.length() != 0
 				&& ( ( name.charAt( 0 ) == '`' && name.charAt( name.length() - 1 ) == '`' )
-						|| ( name.charAt( 0 ) == '"' && name.charAt( name.length() - 1 ) == '"' )
-						|| ( name.charAt( 0 ) == dialect.openQuote()
-								&& name.charAt( name.length() - 1 ) == dialect.closeQuote() ) );
+				|| ( name.charAt( 0 ) == '"' && name.charAt( name.length() - 1 ) == '"' )
+				|| ( name.charAt( 0 ) == dialect.openQuote()
+				&& name.charAt( name.length() - 1 ) == dialect.closeQuote() ) );
 	}
 
 	/**
@@ -699,7 +722,7 @@ public final class StringHelper {
 		if ( names == null ) {
 			return null;
 		}
-		String[] unquoted = new String[ names.length ];
+		String[] unquoted = new String[names.length];
 		for ( int i = 0; i < names.length; i++ ) {
 			unquoted[i] = unquote( names[i], dialect );
 		}
@@ -765,21 +788,27 @@ public final class StringHelper {
 				return StringHelper.replace( sql, BATCH_ID_PLACEHOLDER, repeat( tuple, ids.length, "," ) );
 			}
 			else {
-				final String keyCheck = "(" +  joinWithQualifierAndSuffix( keyColumnNames, alias, " = ?", " and " ) + ")";
+				final String keyCheck = "(" + joinWithQualifierAndSuffix(
+						keyColumnNames,
+						alias,
+						" = ?",
+						" and "
+				) + ")";
 				return replace( sql, BATCH_ID_PLACEHOLDER, repeat( keyCheck, ids.length, " or " ) );
 			}
 		}
 	}
-	
+
 	/**
 	 * Takes a String s and returns a new String[1] with s as the only element.
 	 * If s is null or "", return String[0].
-	 * 
+	 *
 	 * @param s
+	 *
 	 * @return String[]
 	 */
 	public static String[] toArrayElement(String s) {
-		return ( s == null || s.length() == 0 ) ? new String[0] : new String[] { s };
+		return ( s == null || s.length() == 0 ) ? new String[0] : new String[] {s};
 	}
 
 	public static String nullIfEmpty(String value) {
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java
index 93ae2206ed..a876f76c3b 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java
@@ -22,12 +22,11 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.internal.util.beans;
-import java.beans.BeanInfo;
 
 import org.hibernate.HibernateException;
 
 /**
- * Indicates a problem dealing with {@link BeanInfo} via the {@link BeanInfoHelper} delegate.
+ * Indicates a problem dealing with {@link java.beans.BeanInfo} via the {@link BeanInfoHelper} delegate.
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java
index 697743be59..da42dfe82c 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ArrayHelper.java
@@ -20,7 +20,6 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.internal.util.collections;
 
@@ -38,11 +37,11 @@ import org.hibernate.LockOptions;
 import org.hibernate.type.Type;
 
 public final class ArrayHelper {
-	
+
 	public static boolean contains(Object[] array, Object object) {
 		return indexOf( array, object ) > -1;
 	}
-	
+
 	public static int indexOf(Object[] array, Object object) {
 		for ( int i = 0; i < array.length; i++ ) {
 			if ( array[i].equals( object ) ) {
@@ -59,9 +58,9 @@ public final class ArrayHelper {
 	}*/
 
 	public static String[] toStringArray(Object[] objects) {
-		int length=objects.length;
+		int length = objects.length;
 		String[] result = new String[length];
-		for (int i=0; i<length; i++) {
+		for ( int i = 0; i < length; i++ ) {
 			result[i] = objects[i].toString();
 		}
 		return result;
@@ -69,49 +68,49 @@ public final class ArrayHelper {
 
 	public static String[] fillArray(String value, int length) {
 		String[] result = new String[length];
-		Arrays.fill(result, value);
+		Arrays.fill( result, value );
 		return result;
 	}
 
 	public static int[] fillArray(int value, int length) {
 		int[] result = new int[length];
-		Arrays.fill(result, value);
+		Arrays.fill( result, value );
 		return result;
 	}
 
 	public static LockMode[] fillArray(LockMode lockMode, int length) {
 		LockMode[] array = new LockMode[length];
-		Arrays.fill(array, lockMode);
+		Arrays.fill( array, lockMode );
 		return array;
 	}
 
 	public static LockOptions[] fillArray(LockOptions lockOptions, int length) {
 		LockOptions[] array = new LockOptions[length];
-		Arrays.fill(array, lockOptions);
+		Arrays.fill( array, lockOptions );
 		return array;
 	}
 
 	public static String[] toStringArray(Collection coll) {
 		return (String[]) coll.toArray( new String[coll.size()] );
 	}
-	
+
 	public static String[][] to2DStringArray(Collection coll) {
-		return (String[][]) coll.toArray( new String[ coll.size() ][] );
+		return (String[][]) coll.toArray( new String[coll.size()][] );
 	}
-	
+
 	public static int[][] to2DIntArray(Collection coll) {
-		return (int[][]) coll.toArray( new int[ coll.size() ][] );
+		return (int[][]) coll.toArray( new int[coll.size()][] );
 	}
-	
+
 	public static Type[] toTypeArray(Collection coll) {
 		return (Type[]) coll.toArray( new Type[coll.size()] );
 	}
 
 	public static int[] toIntArray(Collection coll) {
 		Iterator iter = coll.iterator();
-		int[] arr = new int[ coll.size() ];
-		int i=0;
-		while( iter.hasNext() ) {
+		int[] arr = new int[coll.size()];
+		int i = 0;
+		while ( iter.hasNext() ) {
 			arr[i++] = (Integer) iter.next();
 		}
 		return arr;
@@ -119,25 +118,27 @@ public final class ArrayHelper {
 
 	public static boolean[] toBooleanArray(Collection coll) {
 		Iterator iter = coll.iterator();
-		boolean[] arr = new boolean[ coll.size() ];
-		int i=0;
-		while( iter.hasNext() ) {
+		boolean[] arr = new boolean[coll.size()];
+		int i = 0;
+		while ( iter.hasNext() ) {
 			arr[i++] = (Boolean) iter.next();
 		}
 		return arr;
 	}
 
 	public static Object[] typecast(Object[] array, Object[] to) {
-		return java.util.Arrays.asList(array).toArray(to);
+		return java.util.Arrays.asList( array ).toArray( to );
 	}
 
 	//Arrays.asList doesn't do primitive arrays
 	public static List toList(Object array) {
-		if ( array instanceof Object[] ) return Arrays.asList( (Object[]) array ); //faster?
-		int size = Array.getLength(array);
-		ArrayList list = new ArrayList(size);
-		for (int i=0; i<size; i++) {
-			list.add( Array.get(array, i) );
+		if ( array instanceof Object[] ) {
+			return Arrays.asList( (Object[]) array ); //faster?
+		}
+		int size = Array.getLength( array );
+		ArrayList list = new ArrayList( size );
+		for ( int i = 0; i < size; i++ ) {
+			list.add( Array.get( array, i ) );
 		}
 		return list;
 	}
@@ -163,17 +164,17 @@ public final class ArrayHelper {
 	}
 
 	public static String[] join(String[] x, String[] y) {
-		String[] result = new String[ x.length + y.length ];
+		String[] result = new String[x.length + y.length];
 		System.arraycopy( x, 0, result, 0, x.length );
 		System.arraycopy( y, 0, result, x.length, y.length );
 		return result;
 	}
 
 	public static String[] join(String[] x, String[] y, boolean[] use) {
-		String[] result = new String[ x.length + countTrue(use) ];
+		String[] result = new String[x.length + countTrue( use )];
 		System.arraycopy( x, 0, result, 0, x.length );
 		int k = x.length;
-		for ( int i=0; i<y.length; i++ ) {
+		for ( int i = 0; i < y.length; i++ ) {
 			if ( use[i] ) {
 				result[k++] = y[i];
 			}
@@ -182,13 +183,13 @@ public final class ArrayHelper {
 	}
 
 	public static int[] join(int[] x, int[] y) {
-		int[] result = new int[ x.length + y.length ];
+		int[] result = new int[x.length + y.length];
 		System.arraycopy( x, 0, result, 0, x.length );
 		System.arraycopy( y, 0, result, x.length, y.length );
 		return result;
 	}
 
-	@SuppressWarnings( {"unchecked"})
+	@SuppressWarnings({"unchecked"})
 	public static <T> T[] join(T[] x, T... y) {
 		T[] result = (T[]) Array.newInstance( x.getClass().getComponentType(), x.length + y.length );
 		System.arraycopy( x, 0, result, 0, x.length );
@@ -196,21 +197,22 @@ public final class ArrayHelper {
 		return result;
 	}
 
-	public static final boolean[] TRUE = { true };
-	public static final boolean[] FALSE = { false };
+	public static final boolean[] TRUE = {true};
+	public static final boolean[] FALSE = {false};
 
-	private ArrayHelper() {}
+	private ArrayHelper() {
+	}
 
-	public static String toString( Object[] array ) {
+	public static String toString(Object[] array) {
 		StringBuilder sb = new StringBuilder();
-		sb.append("[");
-		for (int i = 0; i < array.length; i++) {
+		sb.append( "[" );
+		for ( int i = 0; i < array.length; i++ ) {
 			sb.append( array[i] );
-			if( i<array.length-1 ) {
-				sb.append(",");
+			if ( i < array.length - 1 ) {
+				sb.append( "," );
 			}
 		}
-		sb.append("]");
+		sb.append( "]" );
 		return sb.toString();
 	}
 
@@ -233,7 +235,7 @@ public final class ArrayHelper {
 	}
 
 	public static int countTrue(boolean[] array) {
-		int result=0;
+		int result = 0;
 		for ( boolean anArray : array ) {
 			if ( anArray ) {
 				result++;
@@ -270,28 +272,28 @@ public final class ArrayHelper {
 	public static final Object[] EMPTY_OBJECT_ARRAY = {};
 	public static final Type[] EMPTY_TYPE_ARRAY = {};
 	public static final byte[] EMPTY_BYTE_ARRAY = {};
-	
+
 	public static int[] getBatchSizes(int maxBatchSize) {
 		int batchSize = maxBatchSize;
-		int n=1;
-		while ( batchSize>1 ) {
-			batchSize = getNextBatchSize(batchSize);
+		int n = 1;
+		while ( batchSize > 1 ) {
+			batchSize = getNextBatchSize( batchSize );
 			n++;
 		}
 		int[] result = new int[n];
 		batchSize = maxBatchSize;
-		for ( int i=0; i<n; i++ ) {
+		for ( int i = 0; i < n; i++ ) {
 			result[i] = batchSize;
-			batchSize = getNextBatchSize(batchSize);
+			batchSize = getNextBatchSize( batchSize );
 		}
 		return result;
 	}
-	
+
 	private static int getNextBatchSize(int batchSize) {
-		if (batchSize<=10) {
-			return batchSize-1; //allow 9,8,7,6,5,4,3,2,1
+		if ( batchSize <= 10 ) {
+			return batchSize - 1; //allow 9,8,7,6,5,4,3,2,1
 		}
-		else if (batchSize/2 < 10) {
+		else if ( batchSize / 2 < 10 ) {
 			return 10;
 		}
 		else {
@@ -346,66 +348,66 @@ public final class ArrayHelper {
 	 * Compare 2 arrays only at the first level
 	 */
 	public static boolean isEquals(Object[] o1, Object[] o2) {
-		if (o1 == o2) {
+		if ( o1 == o2 ) {
 			return true;
 		}
-		if (o1 == null || o2 == null) {
+		if ( o1 == null || o2 == null ) {
 			return false;
 		}
 		int length = o1.length;
-		if (length != o2.length) {
+		if ( length != o2.length ) {
 			return false;
 		}
-		for (int index = 0 ; index < length ; index++) {
-			if ( ! o1[index].equals( o2[index] ) ) {
+		for ( int index = 0; index < length; index++ ) {
+			if ( !o1[index].equals( o2[index] ) ) {
 				return false;
 			}
 		}
-        return true;
+		return true;
 	}
 
 	/**
 	 * Compare 2 arrays only at the first level
 	 */
 	public static boolean isEquals(char[] o1, char[] o2) {
-		if (o1 == o2) {
+		if ( o1 == o2 ) {
 			return true;
 		}
-		if (o1 == null || o2 == null) {
+		if ( o1 == null || o2 == null ) {
 			return false;
 		}
 		int length = o1.length;
-		if (length != o2.length) {
+		if ( length != o2.length ) {
 			return false;
 		}
-		for (int index = 0 ; index < length ; index++) {
-			if ( ! ( o1[index] == o2[index] ) ) {
+		for ( int index = 0; index < length; index++ ) {
+			if ( !( o1[index] == o2[index] ) ) {
 				return false;
 			}
 		}
-        return true;
+		return true;
 	}
 
 	/**
 	 * Compare 2 arrays only at the first level
 	 */
 	public static boolean isEquals(byte[] b1, byte[] b2) {
-		if (b1 == b2) {
+		if ( b1 == b2 ) {
 			return true;
 		}
-		if (b1 == null || b2 == null) {
+		if ( b1 == null || b2 == null ) {
 			return false;
 		}
 		int length = b1.length;
-		if (length != b2.length) {
+		if ( length != b2.length ) {
 			return false;
 		}
-		for (int index = 0 ; index < length ; index++) {
-			if ( ! ( b1[index] == b2[index] ) ) {
+		for ( int index = 0; index < length; index++ ) {
+			if ( !( b1[index] == b2[index] ) ) {
 				return false;
 			}
 		}
-        return true;
+		return true;
 	}
 
 	public static Serializable[] extractNonNull(Serializable[] array) {
@@ -452,7 +454,7 @@ public final class ArrayHelper {
 		}
 
 		System.out.println( "Backward ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" );
-		for ( int i = batchSizes.length-1; i >= 0; i-- ) {
+		for ( int i = batchSizes.length - 1; i >= 0; i-- ) {
 			System.out.println( "[" + i + "] -> " + batchSizes[i] );
 		}
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java
index 5fdc3fc23a..ebadbb78bd 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/BoundedConcurrentHashMap.java
@@ -39,11 +39,9 @@ import java.util.AbstractMap;
 import java.util.AbstractSet;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.ConcurrentModificationException;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -60,7 +58,7 @@ import static java.util.Collections.unmodifiableMap;
 /**
  * A hash table supporting full concurrency of retrievals and
  * adjustable expected concurrency for updates. This class obeys the
- * same functional specification as {@link Hashtable}, and
+ * same functional specification as {@link java.util.Hashtable}, and
  * includes versions of methods corresponding to each method of
  * <tt>Hashtable</tt>. However, even though all operations are
  * thread-safe, retrieval operations do <em>not</em> entail locking,
@@ -68,7 +66,7 @@ import static java.util.Collections.unmodifiableMap;
  * in a way that prevents all access.  This class is fully
  * interoperable with <tt>Hashtable</tt> in programs that rely on its
  * thread safety but not on its synchronization details.
- *
+ * <p/>
  * <p> Retrieval operations (including <tt>get</tt>) generally do not
  * block, so may overlap with update operations (including
  * <tt>put</tt> and <tt>remove</tt>). Retrievals reflect the results
@@ -78,9 +76,9 @@ import static java.util.Collections.unmodifiableMap;
  * removal of only some entries.  Similarly, Iterators and
  * Enumerations return elements reflecting the state of the hash table
  * at some point at or since the creation of the iterator/enumeration.
- * They do <em>not</em> throw {@link ConcurrentModificationException}.
+ * They do <em>not</em> throw {@link java.util.ConcurrentModificationException}.
  * However, iterators are designed to be used by only one thread at a time.
- *
+ * <p/>
  * <p> The allowed concurrency among update operations is guided by
  * the optional <tt>concurrencyLevel</tt> constructor argument
  * (default <tt>16</tt>), which is used as a hint for internal sizing.  The
@@ -98,23 +96,24 @@ import static java.util.Collections.unmodifiableMap;
  * hash table is a relatively slow operation, so, when possible, it is
  * a good idea to provide estimates of expected table sizes in
  * constructors.
- *
+ * <p/>
  * <p>This class and its views and iterators implement all of the
  * <em>optional</em> methods of the {@link Map} and {@link Iterator}
  * interfaces.
- *
+ * <p/>
  * <p>This class is copied from Infinispan, and was originally written
  * by Doug Lea with assistance from members of JCP JSR-166 Expert Group and
  * released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain</p>
- *
- *
- * <p> Like {@link Hashtable} but unlike {@link HashMap}, this class
+ * <p/>
+ * <p/>
+ * <p> Like {@link java.util.Hashtable} but unlike {@link HashMap}, this class
  * does <em>not</em> allow <tt>null</tt> to be used as a key or value.
  *
- * @author Doug Lea
  * @param <K> the type of keys maintained by this map
  * @param <V> the type of mapped values
+ *
+ * @author Doug Lea
  */
 public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		implements ConcurrentMap<K, V>, Serializable {
@@ -183,10 +182,10 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	/**
 	 * The segments, each of which is a specialized hash table
 	 */
-	final Segment<K,V>[] segments;
+	final Segment<K, V>[] segments;
 
 	transient Set<K> keySet;
-	transient Set<Map.Entry<K,V>> entrySet;
+	transient Set<Map.Entry<K, V>> entrySet;
 	transient Collection<V> values;
 
 	/* ---------------- Small Utilities -------------- */
@@ -201,20 +200,22 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	private static int hash(int h) {
 		// Spread bits to regularize both segment and index locations,
 		// using variant of single-word Wang/Jenkins hash.
-		h += h <<  15 ^ 0xffffcd7d;
+		h += h << 15 ^ 0xffffcd7d;
 		h ^= h >>> 10;
-		h += h <<   3;
-		h ^= h >>>  6;
-		h += (h <<   2) + (h << 14);
+		h += h << 3;
+		h ^= h >>> 6;
+		h += ( h << 2 ) + ( h << 14 );
 		return h ^ h >>> 16;
 	}
 
 	/**
 	 * Returns the segment that should be used for key with given hash
+	 *
 	 * @param hash the hash code for the key
+	 *
 	 * @return the segment
 	 */
-	final Segment<K,V> segmentFor(int hash) {
+	final Segment<K, V> segmentFor(int hash) {
 		return segments[hash >>> segmentShift & segmentMask];
 	}
 
@@ -223,7 +224,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	/**
 	 * ConcurrentHashMap list entry. Note that this is never exported
 	 * out as a user-visible Map.Entry.
-	 *
+	 * <p/>
 	 * Because the value field is volatile, not final, it is legal wrt
 	 * the Java Memory Model for an unsynchronized reader to see null
 	 * instead of initial value when read via a data race.  Although a
@@ -256,14 +257,14 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		@Override
 		public boolean equals(Object o) {
 			// HashEntry is internal class, never leaks out of CHM, hence slight optimization
-			if (this == o) {
+			if ( this == o ) {
 				return true;
 			}
-			if (o == null) {
+			if ( o == null ) {
 				return false;
 			}
 			HashEntry<?, ?> other = (HashEntry<?, ?>) o;
-			return hash == other.hash && key.equals(other.key);
+			return hash == other.hash && key.equals( other.key );
 		}
 
 		@SuppressWarnings("unchecked")
@@ -286,13 +287,13 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		LRU {
 			@Override
 			public <K, V> EvictionPolicy<K, V> make(Segment<K, V> s, int capacity, float lf) {
-				return new LRU<K, V>(s,capacity,lf,capacity*10,lf);
+				return new LRU<K, V>( s, capacity, lf, capacity * 10, lf );
 			}
 		},
 		LIRS {
 			@Override
 			public <K, V> EvictionPolicy<K, V> make(Segment<K, V> s, int capacity, float lf) {
-				return new LIRS<K,V>(s,capacity,capacity*10,lf);
+				return new LIRS<K, V>( s, capacity, capacity * 10, lf );
 			}
 		};
 
@@ -301,6 +302,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 	public interface EvictionListener<K, V> {
 		void onEntryEviction(Map<K, V> evicted);
+
 		void onEntryChosenForEviction(V internalCacheEntry);
 	}
 
@@ -309,6 +311,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		public void onEntryEviction(Map<K, V> evicted) {
 			// Do nothing.
 		}
+
 		@Override
 		public void onEntryChosenForEviction(V internalCacheEntry) {
 			// Do nothing.
@@ -323,8 +326,8 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 		/**
 		 * Invokes eviction policy algorithm and returns set of evicted entries.
-		 *
-		 * <p>
+		 * <p/>
+		 * <p/>
 		 * Set cannot be null but could possibly be an empty set.
 		 *
 		 * @return set of evicted entries.
@@ -335,8 +338,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * Invoked to notify EvictionPolicy implementation that there has been an attempt to access
 		 * an entry in Segment, however that entry was not present in Segment.
 		 *
-		 * @param e
-		 *            accessed entry in Segment
+		 * @param e accessed entry in Segment
 		 *
 		 * @return non null set of evicted entries.
 		 */
@@ -345,13 +347,12 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		/**
 		 * Invoked to notify EvictionPolicy implementation that an entry in Segment has been
 		 * accessed. Returns true if batching threshold has been reached, false otherwise.
-		 * <p>
+		 * <p/>
 		 * Note that this method is potentially invoked without holding a lock on Segment.
 		 *
-		 * @return true if batching threshold has been reached, false otherwise.
+		 * @param e accessed entry in Segment
 		 *
-		 * @param e
-		 *            accessed entry in Segment
+		 * @return true if batching threshold has been reached, false otherwise.
 		 */
 		boolean onEntryHit(HashEntry<K, V> e);
 
@@ -359,15 +360,13 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * Invoked to notify EvictionPolicy implementation that an entry e has been removed from
 		 * Segment.
 		 *
-		 * @param e
-		 *            removed entry in Segment
+		 * @param e removed entry in Segment
 		 */
 		void onEntryRemove(HashEntry<K, V> e);
 
 		/**
 		 * Invoked to notify EvictionPolicy implementation that all Segment entries have been
 		 * cleared.
-		 *
 		 */
 		void clear();
 
@@ -380,7 +379,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 		/**
 		 * Returns true if batching threshold has expired, false otherwise.
-		 * <p>
+		 * <p/>
 		 * Note that this method is potentially invoked without holding a lock on Segment.
 		 *
 		 * @return true if batching threshold has expired, false otherwise.
@@ -427,24 +426,26 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 		@Override
 		public HashEntry<K, V> createNewEntry(K key, int hash, HashEntry<K, V> next, V value) {
-			return new HashEntry<K, V>(key, hash, next, value);
+			return new HashEntry<K, V>( key, hash, next, value );
 		}
 	}
 
-	static final class LRU<K, V> extends LinkedHashMap<HashEntry<K,V>, V> implements EvictionPolicy<K, V> {
+	static final class LRU<K, V> extends LinkedHashMap<HashEntry<K, V>, V> implements EvictionPolicy<K, V> {
 
-		/** The serialVersionUID */
+		/**
+		 * The serialVersionUID
+		 */
 		private static final long serialVersionUID = -7645068174197717838L;
 
 		private final ConcurrentLinkedQueue<HashEntry<K, V>> accessQueue;
-		private final Segment<K,V> segment;
+		private final Segment<K, V> segment;
 		private final int maxBatchQueueSize;
 		private final int trimDownSize;
 		private final float batchThresholdFactor;
 		private final Set<HashEntry<K, V>> evicted;
 
-		public LRU(Segment<K,V> s, int capacity, float lf, int maxBatchSize, float batchThresholdFactor) {
-			super(capacity, lf, true);
+		public LRU(Segment<K, V> s, int capacity, float lf, int maxBatchSize, float batchThresholdFactor) {
+			super( capacity, lf, true );
 			this.segment = s;
 			this.trimDownSize = capacity;
 			this.maxBatchQueueSize = maxBatchSize > MAX_BATCH_SIZE ? MAX_BATCH_SIZE : maxBatchSize;
@@ -456,10 +457,10 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		@Override
 		public Set<HashEntry<K, V>> execute() {
 			Set<HashEntry<K, V>> evictedCopy = new HashSet<HashEntry<K, V>>();
-			for (HashEntry<K, V> e : accessQueue) {
-				put(e, e.value);
+			for ( HashEntry<K, V> e : accessQueue ) {
+				put( e, e.value );
 			}
-			evictedCopy.addAll(evicted);
+			evictedCopy.addAll( evicted );
 			accessQueue.clear();
 			evicted.clear();
 			return evictedCopy;
@@ -467,13 +468,14 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 		@Override
 		public Set<HashEntry<K, V>> onEntryMiss(HashEntry<K, V> e) {
-			put(e, e.value);
-			if (!evicted.isEmpty()) {
+			put( e, e.value );
+			if ( !evicted.isEmpty() ) {
 				Set<HashEntry<K, V>> evictedCopy = new HashSet<HashEntry<K, V>>();
-				evictedCopy.addAll(evicted);
+				evictedCopy.addAll( evicted );
 				evicted.clear();
 				return evictedCopy;
-			} else {
+			}
+			else {
 				return Collections.emptySet();
 			}
 		}
@@ -483,7 +485,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			   */
 		@Override
 		public boolean onEntryHit(HashEntry<K, V> e) {
-			accessQueue.add(e);
+			accessQueue.add( e );
 			return accessQueue.size() >= maxBatchQueueSize * batchThresholdFactor;
 		}
 
@@ -497,9 +499,9 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 		@Override
 		public void onEntryRemove(HashEntry<K, V> e) {
-			remove(e);
+			remove( e );
 			// we could have multiple instances of e in accessQueue; remove them all
-			while (accessQueue.remove(e)) {
+			while ( accessQueue.remove( e ) ) {
 				continue;
 			}
 		}
@@ -515,24 +517,24 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			return Eviction.LRU;
 		}
 
-		protected boolean isAboveThreshold(){
+		protected boolean isAboveThreshold() {
 			return size() > trimDownSize;
 		}
 
-		protected boolean removeEldestEntry(Map.Entry<HashEntry<K,V>,V> eldest){
+		protected boolean removeEldestEntry(Map.Entry<HashEntry<K, V>, V> eldest) {
 			boolean aboveThreshold = isAboveThreshold();
-			if(aboveThreshold){
+			if ( aboveThreshold ) {
 				HashEntry<K, V> evictedEntry = eldest.getKey();
-				segment.evictionListener.onEntryChosenForEviction(evictedEntry.value);
-				segment.remove(evictedEntry.key, evictedEntry.hash, null);
-				evicted.add(evictedEntry);
+				segment.evictionListener.onEntryChosenForEviction( evictedEntry.value );
+				segment.remove( evictedEntry.key, evictedEntry.hash, null );
+				evicted.add( evictedEntry );
 			}
 			return aboveThreshold;
 		}
 
 		@Override
 		public HashEntry<K, V> createNewEntry(K key, int hash, HashEntry<K, V> next, V value) {
-			return new HashEntry<K, V>(key, hash, next, value);
+			return new HashEntry<K, V>( key, hash, next, value );
 		}
 	}
 
@@ -540,9 +542,8 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 * Adapted to Infinispan BoundedConcurrentHashMap using LIRS implementation ideas from Charles Fry (fry@google.com)
 	 * See http://code.google.com/p/concurrentlinkedhashmap/source/browse/trunk/src/test/java/com/googlecode/concurrentlinkedhashmap/caches/LirsMap.java
 	 * for original sources
-	 *
 	 */
-	private static final class LIRSHashEntry<K,V> extends HashEntry<K,V> {
+	private static final class LIRSHashEntry<K, V> extends HashEntry<K, V> {
 
 		// LIRS stack S
 		private LIRSHashEntry<K, V> previousInStack;
@@ -557,7 +558,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 
 		LIRSHashEntry(LIRS<K, V> owner, K key, int hash, HashEntry<K, V> next, V value) {
-			super(key,hash,next,value);
+			super( key, hash, next, value );
 			this.owner = owner;
 			this.state = Recency.HIR_RESIDENT;
 
@@ -579,45 +580,45 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		@Override
 		public boolean equals(Object o) {
 			// HashEntry is internal class, never leaks out of CHM, hence slight optimization
-			if (this == o) {
+			if ( this == o ) {
 				return true;
 			}
-			if (o == null) {
+			if ( o == null ) {
 				return false;
 			}
 			HashEntry<?, ?> other = (HashEntry<?, ?>) o;
-			return hash == other.hash && key.equals(other.key);
+			return hash == other.hash && key.equals( other.key );
 		}
 
 		/**
 		 * Returns true if this entry is in the stack, false otherwise.
 		 */
 		public boolean inStack() {
-			return (nextInStack != null);
+			return ( nextInStack != null );
 		}
 
 		/**
 		 * Returns true if this entry is in the queue, false otherwise.
 		 */
 		public boolean inQueue() {
-			return (nextInQueue != null);
+			return ( nextInQueue != null );
 		}
 
 		/**
 		 * Records a cache hit.
 		 */
 		public void hit(Set<HashEntry<K, V>> evicted) {
-			switch (state) {
+			switch ( state ) {
 				case LIR_RESIDENT:
-					hotHit(evicted);
+					hotHit( evicted );
 					break;
 				case HIR_RESIDENT:
-					coldHit(evicted);
+					coldHit( evicted );
 					break;
 				case HIR_NONRESIDENT:
-					throw new IllegalStateException("Can't hit a non-resident entry!");
+					throw new IllegalStateException( "Can't hit a non-resident entry!" );
 				default:
-					throw new AssertionError("Hit with unknown status: " + state);
+					throw new AssertionError( "Hit with unknown status: " + state );
 			}
 		}
 
@@ -630,13 +631,13 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			// This access is guaranteed to be a hit in the cache."
 
 			// "We move it to the top of stack S."
-			boolean onBottom = (owner.stackBottom() == this);
+			boolean onBottom = ( owner.stackBottom() == this );
 			moveToStackTop();
 
 			// "If the LIR block is originally located in the bottom of the stack,
 			// we conduct a stack pruning."
-			if (onBottom) {
-				owner.pruneStack(evicted);
+			if ( onBottom ) {
+				owner.pruneStack( evicted );
 			}
 		}
 
@@ -653,7 +654,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			moveToStackTop();
 
 			// "There are two cases for block X:"
-			if (inStack) {
+			if ( inStack ) {
 				// "(1) If X is in the stack S, we change its status to LIR."
 				hot();
 
@@ -665,8 +666,9 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 				owner.stackBottom().migrateToQueue();
 
 				// "A stack pruning is then conducted."
-				owner.pruneStack(evicted);
-			} else {
+				owner.pruneStack( evicted );
+			}
+			else {
 				// "(2) If X is not in stack S, we leave its status in HIR and move
 				// it to the end of list Q."
 				moveToQueueEnd();
@@ -680,11 +682,12 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 */
 		private Set<HashEntry<K, V>> miss() {
 			Set<HashEntry<K, V>> evicted = Collections.emptySet();
-			if (owner.hotSize < owner.maximumHotSize) {
+			if ( owner.hotSize < owner.maximumHotSize ) {
 				warmupMiss();
-			} else {
-				evicted = new HashSet<HashEntry<K,V>>();
-				fullMiss(evicted);
+			}
+			else {
+				evicted = new HashSet<HashEntry<K, V>>();
+				fullMiss( evicted );
 			}
 
 			// now the missed item is in the cache
@@ -713,11 +716,11 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 			// This condition is unspecified in the paper, but appears to be
 			// necessary.
-			if (owner.size >= owner.maximumSize) {
+			if ( owner.size >= owner.maximumSize ) {
 				// "We remove the HIR resident block at the front of list Q (it then
 				// becomes a non-resident block), and replace it out of the cache."
 				LIRSHashEntry<K, V> evictedNode = owner.queueFront();
-				evicted.add(evictedNode);
+				evicted.add( evictedNode );
 			}
 
 			// "Then we load the requested block X into the freed buffer and place
@@ -726,14 +729,15 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			moveToStackTop();
 
 			// "There are two cases for block X:"
-			if (inStack) {
+			if ( inStack ) {
 				// "(1) If X is in stack S, we change its status to LIR and move the
 				// LIR block in the bottom of stack S to the end of list Q with its
 				// status changed to HIR. A stack pruning is then conducted.
 				hot();
 				owner.stackBottom().migrateToQueue();
-				owner.pruneStack(evicted);
-			} else {
+				owner.pruneStack( evicted );
+			}
+			else {
 				// "(2) If X is not in stack S, we leave its status in HIR and place
 				// it in the end of list Q."
 				cold();
@@ -744,7 +748,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * Marks this entry as hot.
 		 */
 		private void hot() {
-			if (state != Recency.LIR_RESIDENT) {
+			if ( state != Recency.LIR_RESIDENT ) {
 				owner.hotSize++;
 			}
 			state = Recency.LIR_RESIDENT;
@@ -754,7 +758,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * Marks this entry as cold.
 		 */
 		private void cold() {
-			if (state == Recency.LIR_RESIDENT) {
+			if ( state == Recency.LIR_RESIDENT ) {
 				owner.hotSize--;
 			}
 			state = Recency.HIR_RESIDENT;
@@ -766,7 +770,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 */
 		@SuppressWarnings("fallthrough")
 		private void nonResident() {
-			switch (state) {
+			switch ( state ) {
 				case LIR_RESIDENT:
 					owner.hotSize--;
 					// fallthrough
@@ -781,7 +785,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * Returns true if this entry is resident in the cache, false otherwise.
 		 */
 		public boolean isResident() {
-			return (state != Recency.HIR_NONRESIDENT);
+			return ( state != Recency.HIR_NONRESIDENT );
 		}
 
 
@@ -792,7 +796,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * will be subsequently changed.
 		 */
 		private void tempRemoveFromStack() {
-			if (inStack()) {
+			if ( inStack() ) {
 				previousInStack.nextInStack = nextInStack;
 				nextInStack.previousInStack = previousInStack;
 			}
@@ -810,7 +814,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		/**
 		 * Inserts this entry before the specified existing entry in the stack.
 		 */
-		private void addToStackBefore(LIRSHashEntry<K,V> existingEntry) {
+		private void addToStackBefore(LIRSHashEntry<K, V> existingEntry) {
 			previousInStack = existingEntry.previousInStack;
 			nextInStack = existingEntry;
 			previousInStack.nextInStack = this;
@@ -822,7 +826,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 */
 		private void moveToStackTop() {
 			tempRemoveFromStack();
-			addToStackBefore(owner.header.nextInStack);
+			addToStackBefore( owner.header.nextInStack );
 		}
 
 		/**
@@ -830,7 +834,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 */
 		private void moveToStackBottom() {
 			tempRemoveFromStack();
-			addToStackBefore(owner.header);
+			addToStackBefore( owner.header );
 		}
 
 		/**
@@ -839,7 +843,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * node's links will be subsequently changed.
 		 */
 		private void tempRemoveFromQueue() {
-			if (inQueue()) {
+			if ( inQueue() ) {
 				previousInQueue.nextInQueue = nextInQueue;
 				nextInQueue.previousInQueue = previousInQueue;
 			}
@@ -857,7 +861,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		/**
 		 * Inserts this entry before the specified existing entry in the queue.
 		 */
-		private void addToQueueBefore(LIRSHashEntry<K,V> existingEntry) {
+		private void addToQueueBefore(LIRSHashEntry<K, V> existingEntry) {
 			previousInQueue = existingEntry.previousInQueue;
 			nextInQueue = existingEntry;
 			previousInQueue.nextInQueue = this;
@@ -869,7 +873,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 */
 		private void moveToQueueEnd() {
 			tempRemoveFromQueue();
-			addToQueueBefore(owner.header);
+			addToQueueBefore( owner.header );
 		}
 
 
@@ -890,7 +894,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 */
 		private void migrateToStack() {
 			removeFromQueue();
-			if (!inStack()) {
+			if ( !inStack() ) {
 				moveToStackBottom();
 			}
 			hot();
@@ -914,14 +918,14 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * the paper, which does not account for forced eviction.
 		 */
 		private V remove() {
-			boolean wasHot = (state == Recency.LIR_RESIDENT);
+			boolean wasHot = ( state == Recency.LIR_RESIDENT );
 			V result = value;
-			LIRSHashEntry<K,V> end = owner != null? owner.queueEnd():null;
+			LIRSHashEntry<K, V> end = owner != null ? owner.queueEnd() : null;
 			evict();
 
 			// attempt to maintain a constant number of hot entries
-			if (wasHot) {
-				if (end != null) {
+			if ( wasHot ) {
+				if ( end != null ) {
 					end.migrateToStack();
 				}
 			}
@@ -939,28 +943,31 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 */
 		private static final float L_LIRS = 0.95f;
 
-		/** The owning segment */
-		private final Segment<K,V> segment;
+		/**
+		 * The owning segment
+		 */
+		private final Segment<K, V> segment;
 
 		/**
 		 * The accessQueue for reducing lock contention
 		 * See "BP-Wrapper: a system framework making any replacement algorithms
 		 * (almost) lock contention free"
-		 *
+		 * <p/>
 		 * http://www.cse.ohio-state.edu/hpcs/WWW/HTML/publications/abs09-1.html
-		 *
-		 * */
+		 */
 		private final ConcurrentLinkedQueue<LIRSHashEntry<K, V>> accessQueue;
 
 		/**
 		 * The maxBatchQueueSize
-		 *
+		 * <p/>
 		 * See "BP-Wrapper: a system framework making any replacement algorithms (almost) lock
 		 * contention free"
-		 * */
+		 */
 		private final int maxBatchQueueSize;
 
-		/** The number of LIRS entries in a segment */
+		/**
+		 * The number of LIRS entries in a segment
+		 */
 		private int size;
 
 		private final float batchThresholdFactor;
@@ -968,7 +975,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 		/**
 		 * This header encompasses two data structures:
-		 *
+		 * <p/>
 		 * <ul>
 		 * <li>The LIRS stack, S, which is maintains recency information. All hot
 		 * entries are on the stack. All cold and non-resident entries which are more
@@ -977,51 +984,57 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * accessed more recently than the last hot entry are present in the stack).
 		 * The stack is ordered by recency, with its most recently accessed entry
 		 * at the top, and its least recently accessed entry at the bottom.</li>
-		 *
+		 * <p/>
 		 * <li>The LIRS queue, Q, which enqueues all cold entries for eviction. Cold
 		 * entries (by definition in the queue) may be absent from the stack (due to
 		 * pruning of the stack). Cold entries are added to the end of the queue
 		 * and entries are evicted from the front of the queue.</li>
 		 * </ul>
 		 */
-		private final LIRSHashEntry<K,V> header = new LIRSHashEntry<K,V>(null, null,0,null,null);
+		private final LIRSHashEntry<K, V> header = new LIRSHashEntry<K, V>( null, null, 0, null, null );
 
-		/** The maximum number of hot entries (L_lirs in the paper). */
+		/**
+		 * The maximum number of hot entries (L_lirs in the paper).
+		 */
 		private final int maximumHotSize;
 
-		/** The maximum number of resident entries (L in the paper). */
-		private final int maximumSize ;
+		/**
+		 * The maximum number of resident entries (L in the paper).
+		 */
+		private final int maximumSize;
 
-		/** The actual number of hot entries. */
+		/**
+		 * The actual number of hot entries.
+		 */
 		private int hotSize;
 
 
-
-		public LIRS(Segment<K,V> s, int capacity, int maxBatchSize, float batchThresholdFactor) {
+		public LIRS(Segment<K, V> s, int capacity, int maxBatchSize, float batchThresholdFactor) {
 			this.segment = s;
 			this.maximumSize = capacity;
-			this.maximumHotSize = calculateLIRSize(capacity);
+			this.maximumHotSize = calculateLIRSize( capacity );
 			this.maxBatchQueueSize = maxBatchSize > MAX_BATCH_SIZE ? MAX_BATCH_SIZE : maxBatchSize;
 			this.batchThresholdFactor = batchThresholdFactor;
 			this.accessQueue = new ConcurrentLinkedQueue<LIRSHashEntry<K, V>>();
 		}
 
 		private static int calculateLIRSize(int maximumSize) {
-			int result = (int) (L_LIRS * maximumSize);
-			return (result == maximumSize) ? maximumSize - 1 : result;
+			int result = (int) ( L_LIRS * maximumSize );
+			return ( result == maximumSize ) ? maximumSize - 1 : result;
 		}
 
 		@Override
 		public Set<HashEntry<K, V>> execute() {
 			Set<HashEntry<K, V>> evicted = new HashSet<HashEntry<K, V>>();
 			try {
-				for (LIRSHashEntry<K, V> e : accessQueue) {
-					if(e.isResident()){
-						e.hit(evicted);
+				for ( LIRSHashEntry<K, V> e : accessQueue ) {
+					if ( e.isResident() ) {
+						e.hit( evicted );
 					}
 				}
-				removeFromSegment(evicted);
-			} finally {
+				removeFromSegment( evicted );
+			}
+			finally {
 				accessQueue.clear();
 			}
 			return evicted;
@@ -1033,7 +1046,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * remain in the queue; otherwise they are no longer referenced, and are thus
 		 * removed from the backing map.
 		 */
-		private void pruneStack(Set<HashEntry<K,V>> evicted) {
+		private void pruneStack(Set<HashEntry<K, V>> evicted) {
 			// See section 3.3:
 			// "We define an operation called "stack pruning" on the LIRS
 			// stack S, which removes the HIR blocks in the bottom of
@@ -1045,10 +1058,10 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			// change their status from HIR to LIR, because their recencies
 			// are larger than the new maximum recency of LIR blocks."
 			LIRSHashEntry<K, V> bottom = stackBottom();
-			while (bottom != null && bottom.state != Recency.LIR_RESIDENT) {
+			while ( bottom != null && bottom.state != Recency.LIR_RESIDENT ) {
 				bottom.removeFromStack();
-				if (bottom.state == Recency.HIR_NONRESIDENT) {
-					evicted.add(bottom);
+				if ( bottom.state == Recency.HIR_NONRESIDENT ) {
+					evicted.add( bottom );
 				}
 				bottom = stackBottom();
 			}
@@ -1058,15 +1071,15 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		public Set<HashEntry<K, V>> onEntryMiss(HashEntry<K, V> en) {
 			LIRSHashEntry<K, V> e = (LIRSHashEntry<K, V>) en;
 			Set<HashEntry<K, V>> evicted = e.miss();
-			removeFromSegment(evicted);
+			removeFromSegment( evicted );
 			return evicted;
 		}
 
 		private void removeFromSegment(Set<HashEntry<K, V>> evicted) {
-			for (HashEntry<K, V> e : evicted) {
-				((LIRSHashEntry<K, V>)e).evict();
-				segment.evictionListener.onEntryChosenForEviction(e.value);
-				segment.remove(e.key, e.hash, null);
+			for ( HashEntry<K, V> e : evicted ) {
+				( (LIRSHashEntry<K, V>) e ).evict();
+				segment.evictionListener.onEntryChosenForEviction( e.value );
+				segment.remove( e.key, e.hash, null );
 			}
 		}
 
@@ -1075,7 +1088,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			   */
 		@Override
 		public boolean onEntryHit(HashEntry<K, V> e) {
-			accessQueue.add((LIRSHashEntry<K, V>) e);
+			accessQueue.add( (LIRSHashEntry<K, V>) e );
 			return accessQueue.size() >= maxBatchQueueSize * batchThresholdFactor;
 		}
 
@@ -1090,9 +1103,9 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		@Override
 		public void onEntryRemove(HashEntry<K, V> e) {
 
-			((LIRSHashEntry<K,V>)e).remove();
+			( (LIRSHashEntry<K, V>) e ).remove();
 			// we could have multiple instances of e in accessQueue; remove them all
-			while (accessQueue.remove(e)) {
+			while ( accessQueue.remove( e ) ) {
 			}
 		}
 
@@ -1111,7 +1124,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 */
 		private LIRSHashEntry<K, V> stackBottom() {
 			LIRSHashEntry<K, V> bottom = header.previousInStack;
-			return (bottom == header) ? null : bottom;
+			return ( bottom == header ) ? null : bottom;
 		}
 
 		/**
@@ -1119,7 +1132,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 */
 		private LIRSHashEntry<K, V> queueFront() {
 			LIRSHashEntry<K, V> front = header.nextInQueue;
-			return (front == header) ? null : front;
+			return ( front == header ) ? null : front;
 		}
 
 		/**
@@ -1127,13 +1140,13 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 */
 		private LIRSHashEntry<K, V> queueEnd() {
 			LIRSHashEntry<K, V> end = header.previousInQueue;
-			return (end == header) ? null : end;
+			return ( end == header ) ? null : end;
 		}
 
 
 		@Override
 		public HashEntry<K, V> createNewEntry(K key, int hash, HashEntry<K, V> next, V value) {
-			return new LIRSHashEntry<K, V>(this,key, hash, next, value);
+			return new LIRSHashEntry<K, V>( this, key, hash, next, value );
 		}
 	}
 
@@ -1142,7 +1155,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 * subclasses from ReentrantLock opportunistically, just to
 	 * simplify some locking and avoid separate construction.
 	 */
-	static final class Segment<K,V> extends ReentrantLock {
+	static final class Segment<K, V> extends ReentrantLock {
 		/*
 			   * Segments maintain a table of entry lists that are ALWAYS
 			   * kept in a consistent state, so can be read without locking.
@@ -1207,12 +1220,13 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		/**
 		 * The per-segment table.
 		 */
-		transient volatile HashEntry<K,V>[] table;
+		transient volatile HashEntry<K, V>[] table;
 
 		/**
 		 * The load factor for the hash table.  Even though this value
 		 * is same for all segments, it is replicated to avoid needing
 		 * links to outer object.
+		 *
 		 * @serial
 		 */
 		final float loadFactor;
@@ -1226,13 +1240,13 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		Segment(int cap, int evictCap, float lf, Eviction es, EvictionListener<K, V> listener) {
 			loadFactor = lf;
 			this.evictCap = evictCap;
-			eviction = es.make(this, evictCap, lf);
+			eviction = es.make( this, evictCap, lf );
 			evictionListener = listener;
-			setTable(HashEntry.<K, V> newArray(cap));
+			setTable( HashEntry.<K, V>newArray( cap ) );
 		}
 
 		@SuppressWarnings("unchecked")
-		static <K,V> Segment<K,V>[] newArray(int i) {
+		static <K, V> Segment<K, V>[] newArray(int i) {
 			return new Segment[i];
 		}
 
@@ -1244,16 +1258,16 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * Sets table to new HashEntry array.
 		 * Call only while holding lock or in constructor.
 		 */
-		void setTable(HashEntry<K,V>[] newTable) {
-			threshold = (int)(newTable.length * loadFactor);
+		void setTable(HashEntry<K, V>[] newTable) {
+			threshold = (int) ( newTable.length * loadFactor );
 			table = newTable;
 		}
 
 		/**
 		 * Returns properly casted first entry of bin for given hash.
 		 */
-		HashEntry<K,V> getFirst(int hash) {
-			HashEntry<K,V>[] tab = table;
+		HashEntry<K, V> getFirst(int hash) {
+			HashEntry<K, V>[] tab = table;
 			return tab[hash & tab.length - 1];
 		}
 
@@ -1264,11 +1278,12 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 * its table assignment, which is legal under memory model
 		 * but is not known to ever occur.
 		 */
-		V readValueUnderLock(HashEntry<K,V> e) {
+		V readValueUnderLock(HashEntry<K, V> e) {
 			lock();
 			try {
 				return e.value;
-			} finally {
+			}
+			finally {
 				unlock();
 			}
 		}
@@ -1277,27 +1292,28 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 		V get(Object key, int hash) {
 			int c = count;
-			if (c != 0) { // read-volatile
+			if ( c != 0 ) { // read-volatile
 				V result = null;
-				HashEntry<K, V> e = getFirst(hash);
-				while (e != null) {
-					if (e.hash == hash && key.equals(e.key)) {
+				HashEntry<K, V> e = getFirst( hash );
+				while ( e != null ) {
+					if ( e.hash == hash && key.equals( e.key ) ) {
 						V v = e.value;
-						if (v != null) {
+						if ( v != null ) {
 							result = v;
 							break;
-						} else {
-							result = readValueUnderLock(e); // recheck
+						}
+						else {
+							result = readValueUnderLock( e ); // recheck
 							break;
 						}
 					}
 					e = e.next;
 				}
 				// a hit
-				if (result != null) {
-					if (eviction.onEntryHit(e)) {
-						Set<HashEntry<K, V>> evicted = attemptEviction(false);
-						notifyEvictionListener(evicted);
+				if ( result != null ) {
+					if ( eviction.onEntryHit( e ) ) {
+						Set<HashEntry<K, V>> evicted = attemptEviction( false );
+						notifyEvictionListener( evicted );
 					}
 				}
 				return result;
@@ -1306,10 +1322,10 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		}
 
 		boolean containsKey(Object key, int hash) {
-			if (count != 0) { // read-volatile
-				HashEntry<K,V> e = getFirst(hash);
-				while (e != null) {
-					if (e.hash == hash && key.equals(e.key)) {
+			if ( count != 0 ) { // read-volatile
+				HashEntry<K, V> e = getFirst( hash );
+				while ( e != null ) {
+					if ( e.hash == hash && key.equals( e.key ) ) {
 						return true;
 					}
 					e = e.next;
@@ -1319,16 +1335,16 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		}
 
 		boolean containsValue(Object value) {
-			if (count != 0) { // read-volatile
-				HashEntry<K,V>[] tab = table;
+			if ( count != 0 ) { // read-volatile
+				HashEntry<K, V>[] tab = table;
 				int len = tab.length;
-				for (int i = 0 ; i < len; i++) {
-					for (HashEntry<K,V> e = tab[i]; e != null; e = e.next) {
+				for ( int i = 0; i < len; i++ ) {
+					for ( HashEntry<K, V> e = tab[i]; e != null; e = e.next ) {
 						V v = e.value;
-						if (v == null) {
-							v = readValueUnderLock(e);
+						if ( v == null ) {
+							v = readValueUnderLock( e );
 						}
-						if (value.equals(v)) {
+						if ( value.equals( v ) ) {
 							return true;
 						}
 					}
@@ -1341,23 +1357,24 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			lock();
 			Set<HashEntry<K, V>> evicted = null;
 			try {
-				HashEntry<K, V> e = getFirst(hash);
-				while (e != null && (e.hash != hash || !key.equals(e.key))) {
+				HashEntry<K, V> e = getFirst( hash );
+				while ( e != null && ( e.hash != hash || !key.equals( e.key ) ) ) {
 					e = e.next;
 				}
 
 				boolean replaced = false;
-				if (e != null && oldValue.equals(e.value)) {
+				if ( e != null && oldValue.equals( e.value ) ) {
 					replaced = true;
 					e.value = newValue;
-					if (eviction.onEntryHit(e)) {
-						evicted = attemptEviction(true);
+					if ( eviction.onEntryHit( e ) ) {
+						evicted = attemptEviction( true );
 					}
 				}
 				return replaced;
-			} finally {
+			}
+			finally {
 				unlock();
-				notifyEvictionListener(evicted);
+				notifyEvictionListener( evicted );
 			}
 		}
 
@@ -1365,23 +1382,24 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			lock();
 			Set<HashEntry<K, V>> evicted = null;
 			try {
-				HashEntry<K, V> e = getFirst(hash);
-				while (e != null && (e.hash != hash || !key.equals(e.key))) {
+				HashEntry<K, V> e = getFirst( hash );
+				while ( e != null && ( e.hash != hash || !key.equals( e.key ) ) ) {
 					e = e.next;
 				}
 
 				V oldValue = null;
-				if (e != null) {
+				if ( e != null ) {
 					oldValue = e.value;
 					e.value = newValue;
-					if (eviction.onEntryHit(e)) {
-						evicted = attemptEviction(true);
+					if ( eviction.onEntryHit( e ) ) {
+						evicted = attemptEviction( true );
 					}
 				}
 				return oldValue;
-			} finally {
+			}
+			finally {
 				unlock();
-				notifyEvictionListener(evicted);
+				notifyEvictionListener( evicted );
 			}
 		}
 
@@ -1390,61 +1408,65 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			Set<HashEntry<K, V>> evicted = null;
 			try {
 				int c = count;
-				if (c++ > threshold && eviction.strategy() == Eviction.NONE) {
+				if ( c++ > threshold && eviction.strategy() == Eviction.NONE ) {
 					rehash();
 				}
 				HashEntry<K, V>[] tab = table;
 				int index = hash & tab.length - 1;
 				HashEntry<K, V> first = tab[index];
 				HashEntry<K, V> e = first;
-				while (e != null && (e.hash != hash || !key.equals(e.key))) {
+				while ( e != null && ( e.hash != hash || !key.equals( e.key ) ) ) {
 					e = e.next;
 				}
 
 				V oldValue;
-				if (e != null) {
+				if ( e != null ) {
 					oldValue = e.value;
-					if (!onlyIfAbsent) {
+					if ( !onlyIfAbsent ) {
 						e.value = value;
-						eviction.onEntryHit(e);
+						eviction.onEntryHit( e );
 					}
-				} else {
+				}
+				else {
 					oldValue = null;
 					++modCount;
 					count = c; // write-volatile
-					if (eviction.strategy() != Eviction.NONE) {
-						if (c > evictCap) {
+					if ( eviction.strategy() != Eviction.NONE ) {
+						if ( c > evictCap ) {
 							// remove entries;lower count
 							evicted = eviction.execute();
 							// re-read first
 							first = tab[index];
 						}
 						// add a new entry
-						tab[index] = eviction.createNewEntry(key, hash, first, value);
+						tab[index] = eviction.createNewEntry( key, hash, first, value );
 						// notify a miss
-						Set<HashEntry<K, V>> newlyEvicted = eviction.onEntryMiss(tab[index]);
-						if (!newlyEvicted.isEmpty()) {
-							if (evicted != null) {
-								evicted.addAll(newlyEvicted);
-							} else {
+						Set<HashEntry<K, V>> newlyEvicted = eviction.onEntryMiss( tab[index] );
+						if ( !newlyEvicted.isEmpty() ) {
+							if ( evicted != null ) {
+								evicted.addAll( newlyEvicted );
+							}
+							else {
 								evicted = newlyEvicted;
 							}
 						}
-					} else {
-						tab[index] = eviction.createNewEntry(key, hash, first, value);
+					}
+					else {
+						tab[index] = eviction.createNewEntry( key, hash, first, value );
 					}
 				}
 				return oldValue;
-			} finally {
+			}
+			finally {
 				unlock();
-				notifyEvictionListener(evicted);
+				notifyEvictionListener( evicted );
 			}
 		}
 
 		void rehash() {
-			HashEntry<K,V>[] oldTable = table;
+			HashEntry<K, V>[] oldTable = table;
 			int oldCapacity = oldTable.length;
-			if (oldCapacity >= MAXIMUM_CAPACITY) {
+			if ( oldCapacity >= MAXIMUM_CAPACITY ) {
 				return;
 			}
 
@@ -1462,30 +1484,31 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 					  * right now.
 					  */
 
-			HashEntry<K,V>[] newTable = HashEntry.newArray(oldCapacity<<1);
-			threshold = (int)(newTable.length * loadFactor);
+			HashEntry<K, V>[] newTable = HashEntry.newArray( oldCapacity << 1 );
+			threshold = (int) ( newTable.length * loadFactor );
 			int sizeMask = newTable.length - 1;
-			for (int i = 0; i < oldCapacity ; i++) {
+			for ( int i = 0; i < oldCapacity; i++ ) {
 				// We need to guarantee that any existing reads of old Map can
 				//  proceed. So we cannot yet null out each bin.
-				HashEntry<K,V> e = oldTable[i];
+				HashEntry<K, V> e = oldTable[i];
 
-				if (e != null) {
-					HashEntry<K,V> next = e.next;
+				if ( e != null ) {
+					HashEntry<K, V> next = e.next;
 					int idx = e.hash & sizeMask;
 
 					//  Single node on list
-					if (next == null) {
+					if ( next == null ) {
 						newTable[idx] = e;
-					} else {
+					}
+					else {
 						// Reuse trailing consecutive sequence at same slot
-						HashEntry<K,V> lastRun = e;
+						HashEntry<K, V> lastRun = e;
 						int lastIdx = idx;
-						for (HashEntry<K,V> last = next;
-							 last != null;
-							 last = last.next) {
+						for ( HashEntry<K, V> last = next;
+							  last != null;
+							  last = last.next ) {
 							int k = last.hash & sizeMask;
-							if (k != lastIdx) {
+							if ( k != lastIdx ) {
 								lastIdx = k;
 								lastRun = last;
 							}
@@ -1493,10 +1516,10 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 						newTable[lastIdx] = lastRun;
 
 						// Clone all remaining nodes
-						for (HashEntry<K,V> p = e; p != lastRun; p = p.next) {
+						for ( HashEntry<K, V> p = e; p != lastRun; p = p.next ) {
 							int k = p.hash & sizeMask;
-							HashEntry<K,V> n = newTable[k];
-							newTable[k] = eviction.createNewEntry(p.key, p.hash, n, p.value);
+							HashEntry<K, V> n = newTable[k];
+							newTable[k] = eviction.createNewEntry( p.key, p.hash, n, p.value );
 						}
 					}
 				}
@@ -1515,14 +1538,14 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 				int index = hash & tab.length - 1;
 				HashEntry<K, V> first = tab[index];
 				HashEntry<K, V> e = first;
-				while (e != null && (e.hash != hash || !key.equals(e.key))) {
+				while ( e != null && ( e.hash != hash || !key.equals( e.key ) ) ) {
 					e = e.next;
 				}
 
 				V oldValue = null;
-				if (e != null) {
+				if ( e != null ) {
 					V v = e.value;
-					if (value == null || value.equals(v)) {
+					if ( value == null || value.equals( v ) ) {
 						oldValue = v;
 						// All entries following removed node can stay
 						// in list, but all preceding ones need to be
@@ -1530,16 +1553,16 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 						++modCount;
 
 						// e was removed
-						eviction.onEntryRemove(e);
+						eviction.onEntryRemove( e );
 
 						HashEntry<K, V> newFirst = e.next;
-						for (HashEntry<K, V> p = first; p != e; p = p.next) {
+						for ( HashEntry<K, V> p = first; p != e; p = p.next ) {
 							// TODO A remove operation makes the map behave like all the other keys in the bucket were just added???
 							// allow p to be GC-ed
-							eviction.onEntryRemove(p);
-							newFirst = eviction.createNewEntry(p.key, p.hash, newFirst, p.value);
+							eviction.onEntryRemove( p );
+							newFirst = eviction.createNewEntry( p.key, p.hash, newFirst, p.value );
 							// and notify eviction algorithm about new hash entries
-							eviction.onEntryMiss(newFirst);
+							eviction.onEntryMiss( newFirst );
 						}
 
 						tab[index] = newFirst;
@@ -1547,23 +1570,25 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 					}
 				}
 				return oldValue;
-			} finally {
+			}
+			finally {
 				unlock();
 			}
 		}
 
 		void clear() {
-			if (count != 0) {
+			if ( count != 0 ) {
 				lock();
 				try {
 					HashEntry<K, V>[] tab = table;
-					for (int i = 0; i < tab.length; i++) {
+					for ( int i = 0; i < tab.length; i++ ) {
 						tab[i] = null;
 					}
 					++modCount;
 					eviction.clear();
 					count = 0; // write-volatile
-				} finally {
+				}
+				finally {
 					unlock();
 				}
 			}
@@ -1572,17 +1597,18 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		private Set<HashEntry<K, V>> attemptEviction(boolean lockedAlready) {
 			Set<HashEntry<K, V>> evicted = null;
 			boolean obtainedLock = lockedAlready || tryLock();
-			if (!obtainedLock && eviction.thresholdExpired()) {
+			if ( !obtainedLock && eviction.thresholdExpired() ) {
 				lock();
 				obtainedLock = true;
 			}
-			if (obtainedLock) {
+			if ( obtainedLock ) {
 				try {
-					if (eviction.thresholdExpired()) {
+					if ( eviction.thresholdExpired() ) {
 						evicted = eviction.execute();
 					}
-				} finally {
-					if (!lockedAlready) {
+				}
+				finally {
+					if ( !lockedAlready ) {
 						unlock();
 					}
 				}
@@ -1592,19 +1618,20 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 		private void notifyEvictionListener(Set<HashEntry<K, V>> evicted) {
 			// piggyback listener invocation on callers thread outside lock
-			if (evicted != null) {
+			if ( evicted != null ) {
 				Map<K, V> evictedCopy;
-				if (evicted.size() == 1) {
+				if ( evicted.size() == 1 ) {
 					HashEntry<K, V> evictedEntry = evicted.iterator().next();
-					evictedCopy = singletonMap(evictedEntry.key, evictedEntry.value);
-				} else {
-					evictedCopy = new HashMap<K, V>(evicted.size());
-					for (HashEntry<K, V> he : evicted) {
-						evictedCopy.put(he.key, he.value);
-					}
-					evictedCopy = unmodifiableMap(evictedCopy);
+					evictedCopy = singletonMap( evictedEntry.key, evictedEntry.value );
 				}
-				evictionListener.onEntryEviction(evictedCopy);
+				else {
+					evictedCopy = new HashMap<K, V>( evicted.size() );
+					for ( HashEntry<K, V> he : evicted ) {
+						evictedCopy.put( he.key, he.value );
+					}
+					evictedCopy = unmodifiableMap( evictedCopy );
+				}
+				evictionListener.onEntryEviction( evictedCopy );
 			}
 		}
 	}
@@ -1617,67 +1644,60 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 * Creates a new, empty map with the specified maximum capacity, load factor and concurrency
 	 * level.
 	 *
-	 * @param capacity
-	 *            is the upper bound capacity for the number of elements in this map
+	 * @param capacity is the upper bound capacity for the number of elements in this map
+	 * @param concurrencyLevel the estimated number of concurrently updating threads. The implementation performs
+	 * internal sizing to try to accommodate this many threads.
+	 * @param evictionStrategy the algorithm used to evict elements from this map
+	 * @param evictionListener the evicton listener callback to be notified about evicted elements
 	 *
-	 * @param concurrencyLevel
-	 *            the estimated number of concurrently updating threads. The implementation performs
-	 *            internal sizing to try to accommodate this many threads.
-	 *
-	 * @param evictionStrategy
-	 *            the algorithm used to evict elements from this map
-	 *
-	 * @param evictionListener
-	 *            the evicton listener callback to be notified about evicted elements
-	 *
-	 * @throws IllegalArgumentException
-	 *             if the initial capacity is negative or the load factor or concurrencyLevel are
-	 *             nonpositive.
+	 * @throws IllegalArgumentException if the initial capacity is negative or the load factor or concurrencyLevel are
+	 * nonpositive.
 	 */
-	public BoundedConcurrentHashMap(int capacity, int concurrencyLevel,
-									Eviction evictionStrategy, EvictionListener<K, V> evictionListener) {
-		if (capacity < 0 || concurrencyLevel <= 0) {
+	public BoundedConcurrentHashMap(
+			int capacity, int concurrencyLevel,
+			Eviction evictionStrategy, EvictionListener<K, V> evictionListener) {
+		if ( capacity < 0 || concurrencyLevel <= 0 ) {
 			throw new IllegalArgumentException();
 		}
 
-		concurrencyLevel = Math.min(capacity / 2, concurrencyLevel); // concurrencyLevel cannot be > capacity/2
-		concurrencyLevel = Math.max(concurrencyLevel, 1); // concurrencyLevel cannot be less than 1
+		concurrencyLevel = Math.min( capacity / 2, concurrencyLevel ); // concurrencyLevel cannot be > capacity/2
+		concurrencyLevel = Math.max( concurrencyLevel, 1 ); // concurrencyLevel cannot be less than 1
 
 		// minimum two elements per segment
-		if (capacity < concurrencyLevel * 2 && capacity != 1) {
-			throw new IllegalArgumentException("Maximum capacity has to be at least twice the concurrencyLevel");
+		if ( capacity < concurrencyLevel * 2 && capacity != 1 ) {
+			throw new IllegalArgumentException( "Maximum capacity has to be at least twice the concurrencyLevel" );
 		}
 
-		if (evictionStrategy == null || evictionListener == null) {
+		if ( evictionStrategy == null || evictionListener == null ) {
 			throw new IllegalArgumentException();
 		}
 
-		if (concurrencyLevel > MAX_SEGMENTS) {
+		if ( concurrencyLevel > MAX_SEGMENTS ) {
 			concurrencyLevel = MAX_SEGMENTS;
 		}
 
 		// Find power-of-two sizes best matching arguments
 		int sshift = 0;
 		int ssize = 1;
-		while (ssize < concurrencyLevel) {
+		while ( ssize < concurrencyLevel ) {
 			++sshift;
 			ssize <<= 1;
 		}
 		segmentShift = 32 - sshift;
 		segmentMask = ssize - 1;
-		this.segments = Segment.newArray(ssize);
+		this.segments = Segment.newArray( ssize );
 
-		if (capacity > MAXIMUM_CAPACITY) {
+		if ( capacity > MAXIMUM_CAPACITY ) {
 			capacity = MAXIMUM_CAPACITY;
 		}
 		int c = capacity / ssize;
 		int cap = 1;
-		while (cap < c) {
+		while ( cap < c ) {
 			cap <<= 1;
 		}
 
-		for (int i = 0; i < this.segments.length; ++i) {
-			this.segments[i] = new Segment<K, V>(cap, c, DEFAULT_LOAD_FACTOR, evictionStrategy, evictionListener);
+		for ( int i = 0; i < this.segments.length; ++i ) {
+			this.segments[i] = new Segment<K, V>( cap, c, DEFAULT_LOAD_FACTOR, evictionStrategy, evictionListener );
 		}
 	}
 
@@ -1685,65 +1705,52 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 * Creates a new, empty map with the specified maximum capacity, load factor, concurrency
 	 * level and LRU eviction policy.
 	 *
-	 * @param capacity
-	 *            is the upper bound capacity for the number of elements in this map
+	 * @param capacity is the upper bound capacity for the number of elements in this map
+	 * @param concurrencyLevel the estimated number of concurrently updating threads. The implementation performs
+	 * internal sizing to try to accommodate this many threads.
 	 *
-	 * @param concurrencyLevel
-	 *            the estimated number of concurrently updating threads. The implementation performs
-	 *            internal sizing to try to accommodate this many threads.
-	 *
-	 * @throws IllegalArgumentException
-	 *             if the initial capacity is negative or the load factor or concurrencyLevel are
-	 *             nonpositive.
+	 * @throws IllegalArgumentException if the initial capacity is negative or the load factor or concurrencyLevel are
+	 * nonpositive.
 	 */
 	public BoundedConcurrentHashMap(int capacity, int concurrencyLevel) {
-		this(capacity, concurrencyLevel, Eviction.LRU);
+		this( capacity, concurrencyLevel, Eviction.LRU );
 	}
 
 	/**
 	 * Creates a new, empty map with the specified maximum capacity, load factor, concurrency
 	 * level and eviction strategy.
 	 *
-	 * @param capacity
-	 *            is the upper bound capacity for the number of elements in this map
+	 * @param capacity is the upper bound capacity for the number of elements in this map
+	 * @param concurrencyLevel the estimated number of concurrently updating threads. The implementation performs
+	 * internal sizing to try to accommodate this many threads.
+	 * @param evictionStrategy the algorithm used to evict elements from this map
 	 *
-	 * @param concurrencyLevel
-	 *            the estimated number of concurrently updating threads. The implementation performs
-	 *            internal sizing to try to accommodate this many threads.
-	 *
-	 * @param evictionStrategy
-	 *            the algorithm used to evict elements from this map
-	 *
-	 * @throws IllegalArgumentException
-	 *             if the initial capacity is negative or the load factor or concurrencyLevel are
-	 *             nonpositive.
+	 * @throws IllegalArgumentException if the initial capacity is negative or the load factor or concurrencyLevel are
+	 * nonpositive.
 	 */
 	public BoundedConcurrentHashMap(int capacity, int concurrencyLevel, Eviction evictionStrategy) {
-		this(capacity, concurrencyLevel, evictionStrategy, new NullEvictionListener<K, V>());
+		this( capacity, concurrencyLevel, evictionStrategy, new NullEvictionListener<K, V>() );
 	}
 
 	/**
 	 * Creates a new, empty map with the specified maximum capacity, default concurrency
 	 * level and LRU eviction policy.
 	 *
-	 *  @param capacity
-	 *            is the upper bound capacity for the number of elements in this map
-	 *
+	 * @param capacity is the upper bound capacity for the number of elements in this map
 	 *
 	 * @throws IllegalArgumentException if the initial capacity of
 	 * elements is negative or the load factor is nonpositive
-	 *
 	 * @since 1.6
 	 */
 	public BoundedConcurrentHashMap(int capacity) {
-		this(capacity, DEFAULT_CONCURRENCY_LEVEL);
+		this( capacity, DEFAULT_CONCURRENCY_LEVEL );
 	}
 
 	/**
 	 * Creates a new, empty map with the default maximum capacity
 	 */
 	public BoundedConcurrentHashMap() {
-		this(DEFAULT_MAXIMUM_CAPACITY, DEFAULT_CONCURRENCY_LEVEL);
+		this( DEFAULT_MAXIMUM_CAPACITY, DEFAULT_CONCURRENCY_LEVEL );
 	}
 
 	/**
@@ -1753,7 +1760,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 */
 	@Override
 	public boolean isEmpty() {
-		final Segment<K,V>[] segments = this.segments;
+		final Segment<K, V>[] segments = this.segments;
 		/*
 			   * We keep track of per-segment modCounts to avoid ABA
 			   * problems in which an element in one segment was added and
@@ -1765,19 +1772,20 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 			   */
 		int[] mc = new int[segments.length];
 		int mcsum = 0;
-		for (int i = 0; i < segments.length; ++i) {
-			if (segments[i].count != 0) {
+		for ( int i = 0; i < segments.length; ++i ) {
+			if ( segments[i].count != 0 ) {
 				return false;
-			} else {
+			}
+			else {
 				mcsum += mc[i] = segments[i].modCount;
 			}
 		}
 		// If mcsum happens to be zero, then we know we got a snapshot
 		// before any modifications at all were made.  This is
 		// probably common enough to bother tracking.
-		if (mcsum != 0) {
-			for (int i = 0; i < segments.length; ++i) {
-				if (segments[i].count != 0 || mc[i] != segments[i].modCount) {
+		if ( mcsum != 0 ) {
+			for ( int i = 0; i < segments.length; ++i ) {
+				if ( segments[i].count != 0 || mc[i] != segments[i].modCount ) {
 					return false;
 				}
 			}
@@ -1794,51 +1802,53 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 */
 	@Override
 	public int size() {
-		final Segment<K,V>[] segments = this.segments;
+		final Segment<K, V>[] segments = this.segments;
 		long sum = 0;
 		long check = 0;
 		int[] mc = new int[segments.length];
 		// Try a few times to get accurate count. On failure due to
 		// continuous async changes in table, resort to locking.
-		for (int k = 0; k < RETRIES_BEFORE_LOCK; ++ k) {
+		for ( int k = 0; k < RETRIES_BEFORE_LOCK; ++k ) {
 			check = 0;
 			sum = 0;
 			int mcsum = 0;
-			for (int i = 0; i < segments.length; ++ i) {
+			for ( int i = 0; i < segments.length; ++i ) {
 				sum += segments[i].count;
 				mcsum += mc[i] = segments[i].modCount;
 			}
-			if (mcsum != 0) {
-				for (int i = 0; i < segments.length; ++ i) {
+			if ( mcsum != 0 ) {
+				for ( int i = 0; i < segments.length; ++i ) {
 					check += segments[i].count;
-					if (mc[i] != segments[i].modCount) {
+					if ( mc[i] != segments[i].modCount ) {
 						check = -1; // force retry
 						break;
 					}
 				}
 			}
-			if (check == sum) {
+			if ( check == sum ) {
 				break;
 			}
 		}
-		if (check != sum) { // Resort to locking all segments
+		if ( check != sum ) { // Resort to locking all segments
 			sum = 0;
-			for (int i = 0; i < segments.length; ++ i) {
+			for ( int i = 0; i < segments.length; ++i ) {
 				segments[i].lock();
 			}
 			try {
-				for (int i = 0; i < segments.length; ++ i) {
+				for ( int i = 0; i < segments.length; ++i ) {
 					sum += segments[i].count;
 				}
-			} finally {
-				for (int i = 0; i < segments.length; ++ i) {
+			}
+			finally {
+				for ( int i = 0; i < segments.length; ++i ) {
 					segments[i].unlock();
 				}
 			}
 		}
-		if (sum > Integer.MAX_VALUE) {
+		if ( sum > Integer.MAX_VALUE ) {
 			return Integer.MAX_VALUE;
-		} else {
+		}
+		else {
 			return (int) sum;
 		}
 	}
@@ -1846,7 +1856,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	/**
 	 * Returns the value to which the specified key is mapped,
 	 * or {@code null} if this map contains no mapping for the key.
-	 *
+	 * <p/>
 	 * <p>More formally, if this map contains a mapping from a key
 	 * {@code k} to a value {@code v} such that {@code key.equals(k)},
 	 * then this method returns {@code v}; otherwise it returns
@@ -1856,23 +1866,25 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 */
 	@Override
 	public V get(Object key) {
-		int hash = hash(key.hashCode());
-		return segmentFor(hash).get(key, hash);
+		int hash = hash( key.hashCode() );
+		return segmentFor( hash ).get( key, hash );
 	}
 
 	/**
 	 * Tests if the specified object is a key in this table.
 	 *
-	 * @param  key   possible key
+	 * @param key possible key
+	 *
 	 * @return <tt>true</tt> if and only if the specified object
-	 *         is a key in this table, as determined by the
-	 *         <tt>equals</tt> method; <tt>false</tt> otherwise.
+	 * is a key in this table, as determined by the
+	 * <tt>equals</tt> method; <tt>false</tt> otherwise.
+	 *
 	 * @throws NullPointerException if the specified key is null
 	 */
 	@Override
 	public boolean containsKey(Object key) {
-		int hash = hash(key.hashCode());
-		return segmentFor(hash).containsKey(key, hash);
+		int hash = hash( key.hashCode() );
+		return segmentFor( hash ).containsKey( key, hash );
 	}
 
 	/**
@@ -1882,13 +1894,15 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 * method <tt>containsKey</tt>.
 	 *
 	 * @param value value whose presence in this map is to be tested
+	 *
 	 * @return <tt>true</tt> if this map maps one or more keys to the
-	 *         specified value
+	 * specified value
+	 *
 	 * @throws NullPointerException if the specified value is null
 	 */
 	@Override
 	public boolean containsValue(Object value) {
-		if (value == null) {
+		if ( value == null ) {
 			throw new NullPointerException();
 		}
 
@@ -1898,45 +1912,46 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		int[] mc = new int[segments.length];
 
 		// Try a few times without locking
-		for (int k = 0; k < RETRIES_BEFORE_LOCK; ++ k) {
+		for ( int k = 0; k < RETRIES_BEFORE_LOCK; ++k ) {
 			int mcsum = 0;
-			for (int i = 0; i < segments.length; ++ i) {
+			for ( int i = 0; i < segments.length; ++i ) {
 				@SuppressWarnings("unused")
 				int c = segments[i].count; // read-volatile
 				mcsum += mc[i] = segments[i].modCount;
-				if (segments[i].containsValue(value)) {
+				if ( segments[i].containsValue( value ) ) {
 					return true;
 				}
 			}
 			boolean cleanSweep = true;
-			if (mcsum != 0) {
-				for (int i = 0; i < segments.length; ++ i) {
+			if ( mcsum != 0 ) {
+				for ( int i = 0; i < segments.length; ++i ) {
 					@SuppressWarnings("unused")
 					int c = segments[i].count; // read-volatile
-					if (mc[i] != segments[i].modCount) {
+					if ( mc[i] != segments[i].modCount ) {
 						cleanSweep = false;
 						break;
 					}
 				}
 			}
-			if (cleanSweep) {
+			if ( cleanSweep ) {
 				return false;
 			}
 		}
 		// Resort to locking all segments
-		for (int i = 0; i < segments.length; ++ i) {
+		for ( int i = 0; i < segments.length; ++i ) {
 			segments[i].lock();
 		}
 		boolean found = false;
 		try {
-			for (int i = 0; i < segments.length; ++ i) {
-				if (segments[i].containsValue(value)) {
+			for ( int i = 0; i < segments.length; ++i ) {
+				if ( segments[i].containsValue( value ) ) {
 					found = true;
 					break;
 				}
 			}
-		} finally {
-			for (int i = 0; i < segments.length; ++ i) {
+		}
+		finally {
+			for ( int i = 0; i < segments.length; ++i ) {
 				segments[i].unlock();
 			}
 		}
@@ -1947,57 +1962,62 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 * Legacy method testing if some key maps into the specified value
 	 * in this table.  This method is identical in functionality to
 	 * {@link #containsValue}, and exists solely to ensure
-	 * full compatibility with class {@link Hashtable},
+	 * full compatibility with class {@link java.util.Hashtable},
 	 * which supported this method prior to introduction of the
 	 * Java Collections framework.
-
-	 * @param  value a value to search for
+	 *
+	 * @param value a value to search for
+	 *
 	 * @return <tt>true</tt> if and only if some key maps to the
-	 *         <tt>value</tt> argument in this table as
-	 *         determined by the <tt>equals</tt> method;
-	 *         <tt>false</tt> otherwise
+	 * <tt>value</tt> argument in this table as
+	 * determined by the <tt>equals</tt> method;
+	 * <tt>false</tt> otherwise
+	 *
 	 * @throws NullPointerException if the specified value is null
 	 */
 	public boolean contains(Object value) {
-		return containsValue(value);
+		return containsValue( value );
 	}
 
 	/**
 	 * Maps the specified key to the specified value in this table.
 	 * Neither the key nor the value can be null.
-	 *
+	 * <p/>
 	 * <p> The value can be retrieved by calling the <tt>get</tt> method
 	 * with a key that is equal to the original key.
 	 *
 	 * @param key key with which the specified value is to be associated
 	 * @param value value to be associated with the specified key
+	 *
 	 * @return the previous value associated with <tt>key</tt>, or
-	 *         <tt>null</tt> if there was no mapping for <tt>key</tt>
+	 * <tt>null</tt> if there was no mapping for <tt>key</tt>
+	 *
 	 * @throws NullPointerException if the specified key or value is null
 	 */
 	@Override
 	public V put(K key, V value) {
-		if (value == null) {
+		if ( value == null ) {
 			throw new NullPointerException();
 		}
-		int hash = hash(key.hashCode());
-		return segmentFor(hash).put(key, hash, value, false);
+		int hash = hash( key.hashCode() );
+		return segmentFor( hash ).put( key, hash, value, false );
 	}
 
 	/**
 	 * {@inheritDoc}
 	 *
 	 * @return the previous value associated with the specified key,
-	 *         or <tt>null</tt> if there was no mapping for the key
+	 * or <tt>null</tt> if there was no mapping for the key
+	 *
 	 * @throws NullPointerException if the specified key or value is null
 	 */
 	@Override
 	public V putIfAbsent(K key, V value) {
-		if (value == null) {
+		if ( value == null ) {
 			throw new NullPointerException();
 		}
-		int hash = hash(key.hashCode());
-		return segmentFor(hash).put(key, hash, value, true);
+		int hash = hash( key.hashCode() );
+		return segmentFor( hash ).put( key, hash, value, true );
 	}
 
 	/**
@@ -2009,8 +2029,8 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 */
 	@Override
 	public void putAll(Map<? extends K, ? extends V> m) {
-		for (Map.Entry<? extends K, ? extends V> e: m.entrySet()) {
-			put(e.getKey(), e.getValue());
+		for ( Map.Entry<? extends K, ? extends V> e : m.entrySet() ) {
+			put( e.getKey(), e.getValue() );
 		}
 	}
 
@@ -2018,15 +2038,17 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 * Removes the key (and its corresponding value) from this map.
 	 * This method does nothing if the key is not in the map.
 	 *
-	 * @param  key the key that needs to be removed
+	 * @param key the key that needs to be removed
+	 *
 	 * @return the previous value associated with <tt>key</tt>, or
-	 *         <tt>null</tt> if there was no mapping for <tt>key</tt>
+	 * <tt>null</tt> if there was no mapping for <tt>key</tt>
+	 *
 	 * @throws NullPointerException if the specified key is null
 	 */
 	@Override
 	public V remove(Object key) {
-		int hash = hash(key.hashCode());
-		return segmentFor(hash).remove(key, hash, null);
+		int hash = hash( key.hashCode() );
+		return segmentFor( hash ).remove( key, hash, null );
 	}
 
 	/**
@@ -2036,11 +2058,11 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 */
 	@Override
 	public boolean remove(Object key, Object value) {
-		int hash = hash(key.hashCode());
-		if (value == null) {
+		int hash = hash( key.hashCode() );
+		if ( value == null ) {
 			return false;
 		}
-		return segmentFor(hash).remove(key, hash, value) != null;
+		return segmentFor( hash ).remove( key, hash, value ) != null;
 	}
 
 	/**
@@ -2050,27 +2072,28 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 */
 	@Override
 	public boolean replace(K key, V oldValue, V newValue) {
-		if (oldValue == null || newValue == null) {
+		if ( oldValue == null || newValue == null ) {
 			throw new NullPointerException();
 		}
-		int hash = hash(key.hashCode());
-		return segmentFor(hash).replace(key, hash, oldValue, newValue);
+		int hash = hash( key.hashCode() );
+		return segmentFor( hash ).replace( key, hash, oldValue, newValue );
 	}
 
 	/**
 	 * {@inheritDoc}
 	 *
 	 * @return the previous value associated with the specified key,
-	 *         or <tt>null</tt> if there was no mapping for the key
+	 * or <tt>null</tt> if there was no mapping for the key
+	 *
 	 * @throws NullPointerException if the specified key or value is null
 	 */
 	@Override
 	public V replace(K key, V value) {
-		if (value == null) {
+		if ( value == null ) {
 			throw new NullPointerException();
 		}
-		int hash = hash(key.hashCode());
-		return segmentFor(hash).replace(key, hash, value);
+		int hash = hash( key.hashCode() );
+		return segmentFor( hash ).replace( key, hash, value );
 	}
 
 	/**
@@ -2078,7 +2101,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 */
 	@Override
 	public void clear() {
-		for (int i = 0; i < segments.length; ++ i) {
+		for ( int i = 0; i < segments.length; ++i ) {
 			segments[i].clear();
 		}
 	}
@@ -2092,9 +2115,9 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
 	 * operations.  It does not support the <tt>add</tt> or
 	 * <tt>addAll</tt> operations.
-	 *
+	 * <p/>
 	 * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
-	 * that will never throw {@link ConcurrentModificationException},
+	 * that will never throw {@link java.util.ConcurrentModificationException},
 	 * and guarantees to traverse elements as they existed upon
 	 * construction of the iterator, and may (but is not guaranteed to)
 	 * reflect any modifications subsequent to construction.
@@ -2102,7 +2125,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	@Override
 	public Set<K> keySet() {
 		Set<K> ks = keySet;
-		return ks != null? ks : (keySet = new KeySet());
+		return ks != null ? ks : ( keySet = new KeySet() );
 	}
 
 	/**
@@ -2114,9 +2137,9 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
 	 * <tt>retainAll</tt>, and <tt>clear</tt> operations.  It does not
 	 * support the <tt>add</tt> or <tt>addAll</tt> operations.
-	 *
+	 * <p/>
 	 * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
-	 * that will never throw {@link ConcurrentModificationException},
+	 * that will never throw {@link java.util.ConcurrentModificationException},
 	 * and guarantees to traverse elements as they existed upon
 	 * construction of the iterator, and may (but is not guaranteed to)
 	 * reflect any modifications subsequent to construction.
@@ -2124,7 +2147,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	@Override
 	public Collection<V> values() {
 		Collection<V> vs = values;
-		return vs != null? vs : (values = new Values());
+		return vs != null ? vs : ( values = new Values() );
 	}
 
 	/**
@@ -2136,9 +2159,9 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
 	 * operations.  It does not support the <tt>add</tt> or
 	 * <tt>addAll</tt> operations.
-	 *
+	 * <p/>
 	 * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
-	 * that will never throw {@link ConcurrentModificationException},
+	 * that will never throw {@link java.util.ConcurrentModificationException},
 	 * and guarantees to traverse elements as they existed upon
 	 * construction of the iterator, and may (but is not guaranteed to)
 	 * reflect any modifications subsequent to construction.
@@ -2146,13 +2169,14 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	@Override
 	public Set<Map.Entry<K, V>> entrySet() {
 		Set<Map.Entry<K, V>> es = entrySet;
-		return es != null? es : (entrySet = new EntrySet());
+		return es != null ? es : ( entrySet = new EntrySet() );
 	}
 
 	/**
 	 * Returns an enumeration of the keys in this table.
 	 *
 	 * @return an enumeration of the keys in this table
+	 *
 	 * @see #keySet()
 	 */
 	public Enumeration<K> keys() {
@@ -2163,6 +2187,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	 * Returns an enumeration of the values in this table.
 	 *
 	 * @return an enumeration of the values in this table
+	 *
 	 * @see #values()
 	 */
 	public Enumeration<V> elements() {
@@ -2193,22 +2218,22 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		}
 
 		final void advance() {
-			if (nextEntry != null && (nextEntry = nextEntry.next) != null) {
+			if ( nextEntry != null && ( nextEntry = nextEntry.next ) != null ) {
 				return;
 			}
 
-			while (nextTableIndex >= 0) {
-				if ((nextEntry = currentTable[nextTableIndex --]) != null) {
+			while ( nextTableIndex >= 0 ) {
+				if ( ( nextEntry = currentTable[nextTableIndex--] ) != null ) {
 					return;
 				}
 			}
 
-			while (nextSegmentIndex >= 0) {
-				Segment<K, V> seg = segments[nextSegmentIndex --];
-				if (seg.count != 0) {
+			while ( nextSegmentIndex >= 0 ) {
+				Segment<K, V> seg = segments[nextSegmentIndex--];
+				if ( seg.count != 0 ) {
 					currentTable = seg.table;
-					for (int j = currentTable.length - 1; j >= 0; -- j) {
-						if ((nextEntry = currentTable[j]) != null) {
+					for ( int j = currentTable.length - 1; j >= 0; --j ) {
+						if ( ( nextEntry = currentTable[j] ) != null ) {
 							nextTableIndex = j - 1;
 							return;
 						}
@@ -2222,7 +2247,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		}
 
 		HashEntry<K, V> nextEntry() {
-			if (nextEntry == null) {
+			if ( nextEntry == null ) {
 				throw new NoSuchElementException();
 			}
 			lastReturned = nextEntry;
@@ -2231,10 +2256,10 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		}
 
 		public void remove() {
-			if (lastReturned == null) {
+			if ( lastReturned == null ) {
 				throw new IllegalStateException();
 			}
-			BoundedConcurrentHashMap.this.remove(lastReturned.key);
+			BoundedConcurrentHashMap.this.remove( lastReturned.key );
 			lastReturned = null;
 		}
 	}
@@ -2272,7 +2297,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		private static final long serialVersionUID = -7041346694785573824L;
 
 		WriteThroughEntry(K k, V v) {
-			super(k, v);
+			super( k, v );
 		}
 
 		/**
@@ -2286,11 +2311,11 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		 */
 		@Override
 		public V setValue(V value) {
-			if (value == null) {
+			if ( value == null ) {
 				throw new NullPointerException();
 			}
-			V v = super.setValue(value);
-			BoundedConcurrentHashMap.this.put(getKey(), value);
+			V v = super.setValue( value );
+			BoundedConcurrentHashMap.this.put( getKey(), value );
 			return v;
 		}
 	}
@@ -2299,7 +2324,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		@Override
 		public Map.Entry<K, V> next() {
 			HashEntry<K, V> e = super.nextEntry();
-			return new WriteThroughEntry(e.key, e.value);
+			return new WriteThroughEntry( e.key, e.value );
 		}
 	}
 
@@ -2321,12 +2346,12 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 		@Override
 		public boolean contains(Object o) {
-			return BoundedConcurrentHashMap.this.containsKey(o);
+			return BoundedConcurrentHashMap.this.containsKey( o );
 		}
 
 		@Override
 		public boolean remove(Object o) {
-			return BoundedConcurrentHashMap.this.remove(o) != null;
+			return BoundedConcurrentHashMap.this.remove( o ) != null;
 		}
 
 		@Override
@@ -2353,7 +2378,7 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 		@Override
 		public boolean contains(Object o) {
-			return BoundedConcurrentHashMap.this.containsValue(o);
+			return BoundedConcurrentHashMap.this.containsValue( o );
 		}
 
 		@Override
@@ -2370,21 +2395,21 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
 		@Override
 		public boolean contains(Object o) {
-			if (!(o instanceof Map.Entry)) {
+			if ( !( o instanceof Map.Entry ) ) {
 				return false;
 			}
 			Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
-			V v = BoundedConcurrentHashMap.this.get(e.getKey());
-			return v != null && v.equals(e.getValue());
+			V v = BoundedConcurrentHashMap.this.get( e.getKey() );
+			return v != null && v.equals( e.getValue() );
 		}
 
 		@Override
 		public boolean remove(Object o) {
-			if (!(o instanceof Map.Entry)) {
+			if ( !( o instanceof Map.Entry ) ) {
 				return false;
 			}
 			Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
-			return BoundedConcurrentHashMap.this.remove(e.getKey(), e.getValue());
+			return BoundedConcurrentHashMap.this.remove( e.getKey(), e.getValue() );
 		}
 
 		@Override
@@ -2408,37 +2433,40 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 	/**
 	 * Save the state of the <tt>ConcurrentHashMap</tt> instance to a
 	 * stream (i.e., serialize it).
+	 *
 	 * @param s the stream
-	 * @serialData
-	 * the key (Object) and value (Object)
+	 *
+	 * @serialData the key (Object) and value (Object)
 	 * for each key-value mapping, followed by a null pair.
 	 * The key-value mappings are emitted in no particular order.
 	 */
 	private void writeObject(java.io.ObjectOutputStream s) throws IOException {
 		s.defaultWriteObject();
 
-		for (int k = 0; k < segments.length; ++ k) {
+		for ( int k = 0; k < segments.length; ++k ) {
 			Segment<K, V> seg = segments[k];
 			seg.lock();
 			try {
 				HashEntry<K, V>[] tab = seg.table;
-				for (int i = 0; i < tab.length; ++ i) {
-					for (HashEntry<K, V> e = tab[i]; e != null; e = e.next) {
-						s.writeObject(e.key);
-						s.writeObject(e.value);
+				for ( int i = 0; i < tab.length; ++i ) {
+					for ( HashEntry<K, V> e = tab[i]; e != null; e = e.next ) {
+						s.writeObject( e.key );
+						s.writeObject( e.value );
 					}
 				}
-			} finally {
+			}
+			finally {
 				seg.unlock();
 			}
 		}
-		s.writeObject(null);
-		s.writeObject(null);
+		s.writeObject( null );
+		s.writeObject( null );
 	}
 
 	/**
 	 * Reconstitute the <tt>ConcurrentHashMap</tt> instance from a
 	 * stream (i.e., deserialize it).
+	 *
 	 * @param s the stream
 	 */
 	@SuppressWarnings("unchecked")
@@ -2447,18 +2475,18 @@ public class BoundedConcurrentHashMap<K, V> extends AbstractMap<K, V>
 		s.defaultReadObject();
 
 		// Initialize each segment to be minimally sized, and let grow.
-		for (int i = 0; i < segments.length; ++ i) {
-			segments[i].setTable(new HashEntry[1]);
+		for ( int i = 0; i < segments.length; ++i ) {
+			segments[i].setTable( new HashEntry[1] );
 		}
 
 		// Read the keys and values, and put the mappings in the table
-		for (;;) {
+		for (; ; ) {
 			K key = (K) s.readObject();
 			V value = (V) s.readObject();
-			if (key == null) {
+			if ( key == null ) {
 				break;
 			}
-			put(key, value);
+			put( key, value );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java
index 9bf9fb456d..1f88c68a29 100755
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java
@@ -40,7 +40,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @author Steve Ebersole
  */
 public final class CollectionHelper {
-    public static final int MINIMUM_INITIAL_CAPACITY = 16;
+	public static final int MINIMUM_INITIAL_CAPACITY = 16;
 	public static final float LOAD_FACTOR = 0.75f;
 
 	/**
@@ -68,10 +68,11 @@ public final class CollectionHelper {
 	 * Especially helpful for copy map contents.
 	 *
 	 * @param size The size to make the map.
+	 *
 	 * @return The sized map.
 	 */
-	public static <K,V> Map<K,V> mapOfSize(int size) {
-		return new HashMap<K,V>( determineProperSizing( size ), LOAD_FACTOR );
+	public static <K, V> Map<K, V> mapOfSize(int size) {
+		return new HashMap<K, V>( determineProperSizing( size ), LOAD_FACTOR );
 	}
 
 	/**
@@ -79,6 +80,7 @@ public final class CollectionHelper {
 	 * Specifically we want to account for load size and load factor to prevent immediate resizing.
 	 *
 	 * @param original The original map
+	 *
 	 * @return The proper size.
 	 */
 	public static int determineProperSizing(Map original) {
@@ -90,6 +92,7 @@ public final class CollectionHelper {
 	 * Specifically we want to account for load size and load factor to prevent immediate resizing.
 	 *
 	 * @param original The original set
+	 *
 	 * @return The proper size.
 	 */
 	public static int determineProperSizing(Set original) {
@@ -101,10 +104,11 @@ public final class CollectionHelper {
 	 * Specifically we want to account for load size and load factor to prevent immediate resizing.
 	 *
 	 * @param numberOfElements The number of elements to be stored.
+	 *
 	 * @return The proper size.
 	 */
 	public static int determineProperSizing(int numberOfElements) {
-		int actual = ( (int) (numberOfElements / LOAD_FACTOR) ) + 1;
+		int actual = ( (int) ( numberOfElements / LOAD_FACTOR ) ) + 1;
 		return Math.max( actual, MINIMUM_INITIAL_CAPACITY );
 	}
 
@@ -117,7 +121,7 @@ public final class CollectionHelper {
 	 *
 	 * @return The created map.
 	 */
-	public static <K,V> ConcurrentHashMap<K,V> concurrentMap(int expectedNumberOfElements) {
+	public static <K, V> ConcurrentHashMap<K, V> concurrentMap(int expectedNumberOfElements) {
 		return concurrentMap( expectedNumberOfElements, LOAD_FACTOR );
 	}
 
@@ -132,7 +136,7 @@ public final class CollectionHelper {
 	 *
 	 * @return The created map.
 	 */
-	public static <K,V> ConcurrentHashMap<K,V> concurrentMap(int expectedNumberOfElements, float loadFactor) {
+	public static <K, V> ConcurrentHashMap<K, V> concurrentMap(int expectedNumberOfElements, float loadFactor) {
 		final int size = expectedNumberOfElements + 1 + (int) ( expectedNumberOfElements * loadFactor );
 		return new ConcurrentHashMap<K, V>( size, loadFactor );
 	}
@@ -152,28 +156,28 @@ public final class CollectionHelper {
 		return copy;
 	}
 
-    public static boolean isEmpty(Collection collection) {
-        return collection == null || collection.isEmpty();
-    }
-
-    public static boolean isEmpty(Map map) {
-        return map == null || map.isEmpty();
-    }
-
-    public static boolean isNotEmpty(Collection collection) {
-        return !isEmpty( collection );
-    }
-
-    public static boolean isNotEmpty(Map map) {
-        return !isEmpty( map );
-    }
-
-	public static boolean isEmpty(Object[] objects){
-		return objects == null || objects.length==0;
+	public static boolean isEmpty(Collection collection) {
+		return collection == null || collection.isEmpty();
 	}
 
-	public static <X,Y> Map<X, Y> makeCopy(Map<X, Y> map) {
-		final Map<X,Y> copy = mapOfSize( map.size() + 1 );
+	public static boolean isEmpty(Map map) {
+		return map == null || map.isEmpty();
+	}
+
+	public static boolean isNotEmpty(Collection collection) {
+		return !isEmpty( collection );
+	}
+
+	public static boolean isNotEmpty(Map map) {
+		return !isEmpty( map );
+	}
+
+	public static boolean isEmpty(Object[] objects) {
+		return objects == null || objects.length == 0;
+	}
+
+	public static <X, Y> Map<X, Y> makeCopy(Map<X, Y> map) {
+		final Map<X, Y> copy = mapOfSize( map.size() + 1 );
 		copy.putAll( map );
 		return copy;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java
index 9fb8a40ea8..a216939605 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/ConcurrentReferenceHashMap.java
@@ -40,11 +40,8 @@ import java.util.AbstractCollection;
 import java.util.AbstractMap;
 import java.util.AbstractSet;
 import java.util.Collection;
-import java.util.ConcurrentModificationException;
 import java.util.EnumSet;
 import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -56,11 +53,11 @@ import java.util.concurrent.locks.ReentrantLock;
  * An advanced hash table supporting configurable garbage collection semantics
  * of keys and values, optional referential-equality, full concurrency of
  * retrievals, and adjustable expected concurrency for updates.
- *
+ * <p/>
  * This table is designed around specific advanced use-cases. If there is any
  * doubt whether this table is for you, you most likely should be using
  * {@link java.util.concurrent.ConcurrentHashMap} instead.
- *
+ * <p/>
  * This table supports strong, weak, and soft keys and values. By default keys
  * are weak, and values are strong. Such a configuration offers similar behavior
  * to {@link java.util.WeakHashMap}, entries of this table are periodically
@@ -73,13 +70,13 @@ import java.util.concurrent.locks.ReentrantLock;
  * <tt>isEmpty</tt> might return a value greater than the observed number of
  * entries. In order to support a high level of concurrency, stale entries are
  * only reclaimed during blocking (usually mutating) operations.
- *
+ * <p/>
  * Enabling soft keys allows entries in this table to remain until their space
  * is absolutely needed by the garbage collector. This is unlike weak keys which
  * can be reclaimed as soon as they are no longer referenced by a normal strong
  * reference. The primary use case for soft keys is a cache, which ideally
  * occupies memory that is not in use for as long as possible.
- *
+ * <p/>
  * By default, values are held using a normal strong reference. This provides
  * the commonly desired guarantee that a value will always have at least the
  * same life-span as it's key. For this reason, care should be taken to ensure
@@ -87,11 +84,11 @@ import java.util.concurrent.locks.ReentrantLock;
  * preventing reclamation. If this is unavoidable, then it is recommended to use
  * the same reference type in use for the key. However, it should be noted that
  * non-strong values may disappear before their corresponding key.
- *
+ * <p/>
  * While this table does allow the use of both strong keys and values, it is
  * recommended to use {@link java.util.concurrent.ConcurrentHashMap} for such a
  * configuration, since it is optimized for that case.
- *
+ * <p/>
  * Just like {@link java.util.concurrent.ConcurrentHashMap}, this class obeys
  * the same functional specification as {@link java.util.Hashtable}, and
  * includes versions of methods corresponding to each method of
@@ -101,8 +98,8 @@ import java.util.concurrent.locks.ReentrantLock;
  * prevents all access. This class is fully interoperable with
  * <tt>Hashtable</tt> in programs that rely on its thread safety but not on
  * its synchronization details.
- *
- * <p>
+ * <p/>
+ * <p/>
  * Retrieval operations (including <tt>get</tt>) generally do not block, so
  * may overlap with update operations (including <tt>put</tt> and
  * <tt>remove</tt>). Retrievals reflect the results of the most recently
@@ -112,10 +109,10 @@ import java.util.concurrent.locks.ReentrantLock;
  * Similarly, Iterators and Enumerations return elements reflecting the state of
  * the hash table at some point at or since the creation of the
  * iterator/enumeration. They do <em>not</em> throw
- * {@link ConcurrentModificationException}. However, iterators are designed to
+ * {@link java.util.ConcurrentModificationException}. However, iterators are designed to
  * be used by only one thread at a time.
- *
- * <p>
+ * <p/>
+ * <p/>
  * The allowed concurrency among update operations is guided by the optional
  * <tt>concurrencyLevel</tt> constructor argument (default <tt>16</tt>),
  * which is used as a hint for internal sizing. The table is internally
@@ -131,16 +128,16 @@ import java.util.concurrent.locks.ReentrantLock;
  * any other kind of hash table is a relatively slow operation, so, when
  * possible, it is a good idea to provide estimates of expected table sizes in
  * constructors.
- *
- * <p>
+ * <p/>
+ * <p/>
  * This class and its views and iterators implement all of the <em>optional</em>
  * methods of the {@link Map} and {@link Iterator} interfaces.
- *
- * <p>
- * Like {@link Hashtable} but unlike {@link HashMap}, this class does
+ * <p/>
+ * <p/>
+ * Like {@link java.util.Hashtable} but unlike {@link java.util.HashMap}, this class does
  * <em>not</em> allow <tt>null</tt> to be used as a key or value.
- *
- * <p>
+ * <p/>
+ * <p/>
  * This class is a member of the <a href="{@docRoot}/../technotes/guides/collections/index.html">
  * Java Collections Framework</a>.
  *
@@ -397,7 +394,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	/**
 	 * ConcurrentReferenceHashMap list entry. Note that this is never exported
 	 * out as a user-visible Map.Entry.
-	 *
+	 * <p/>
 	 * Because the value field is volatile, not final, it is legal wrt
 	 * the Java Memory Model for an unsynchronized reader to see null
 	 * instead of initial value when read via a data race.  Although a
@@ -412,17 +409,19 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 		volatile Object valueRef;
 		final HashEntry<K, V> next;
 
-		HashEntry(K key, int hash, HashEntry<K, V> next, V value,
-				  ReferenceType keyType, ReferenceType valueType,
-				  ReferenceQueue<Object> refQueue) {
+		HashEntry(
+				K key, int hash, HashEntry<K, V> next, V value,
+				ReferenceType keyType, ReferenceType valueType,
+				ReferenceQueue<Object> refQueue) {
 			this.hash = hash;
 			this.next = next;
 			this.keyRef = newKeyReference( key, keyType, refQueue );
 			this.valueRef = newValueReference( value, valueType, refQueue );
 		}
 
-		final Object newKeyReference(K key, ReferenceType keyType,
-									 ReferenceQueue<Object> refQueue) {
+		final Object newKeyReference(
+				K key, ReferenceType keyType,
+				ReferenceQueue<Object> refQueue) {
 			if ( keyType == ReferenceType.WEAK ) {
 				return new WeakKeyReference<K>( key, hash, refQueue );
 			}
@@ -433,8 +432,9 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 			return key;
 		}
 
-		final Object newValueReference(V value, ReferenceType valueType,
-									   ReferenceQueue<Object> refQueue) {
+		final Object newValueReference(
+				V value, ReferenceType valueType,
+				ReferenceQueue<Object> refQueue) {
 			if ( valueType == ReferenceType.WEAK ) {
 				return new WeakValueReference<V>( value, keyRef, hash, refQueue );
 			}
@@ -570,7 +570,8 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 
 		final boolean identityComparisons;
 
-		Segment(int initialCapacity, float lf, ReferenceType keyType,
+		Segment(
+				int initialCapacity, float lf, ReferenceType keyType,
 				ReferenceType valueType, boolean identityComparisons) {
 			loadFactor = lf;
 			this.keyType = keyType;
@@ -925,7 +926,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	/**
 	 * Creates a new, empty map with the specified initial
 	 * capacity, reference types, load factor and concurrency level.
-	 *
+	 * <p/>
 	 * Behavioral changing options such as {@link Option#IDENTITY_COMPARISONS}
 	 * can also be specified.
 	 *
@@ -945,10 +946,11 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * negative or the load factor or concurrencyLevel are
 	 * nonpositive.
 	 */
-	public ConcurrentReferenceHashMap(int initialCapacity,
-									  float loadFactor, int concurrencyLevel,
-									  ReferenceType keyType, ReferenceType valueType,
-									  EnumSet<Option> options) {
+	public ConcurrentReferenceHashMap(
+			int initialCapacity,
+			float loadFactor, int concurrencyLevel,
+			ReferenceType keyType, ReferenceType valueType,
+			EnumSet<Option> options) {
 		if ( !( loadFactor > 0 ) || initialCapacity < 0 || concurrencyLevel <= 0 ) {
 			throw new IllegalArgumentException();
 		}
@@ -1007,8 +1009,9 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * negative or the load factor or concurrencyLevel are
 	 * nonpositive.
 	 */
-	public ConcurrentReferenceHashMap(int initialCapacity,
-									  float loadFactor, int concurrencyLevel) {
+	public ConcurrentReferenceHashMap(
+			int initialCapacity,
+			float loadFactor, int concurrencyLevel) {
 		this(
 				initialCapacity, loadFactor, concurrencyLevel,
 				DEFAULT_KEY_TYPE, DEFAULT_VALUE_TYPE, null
@@ -1047,8 +1050,9 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * @throws IllegalArgumentException if the initial capacity of
 	 * elements is negative.
 	 */
-	public ConcurrentReferenceHashMap(int initialCapacity,
-									  ReferenceType keyType, ReferenceType valueType) {
+	public ConcurrentReferenceHashMap(
+			int initialCapacity,
+			ReferenceType keyType, ReferenceType valueType) {
 		this(
 				initialCapacity, DEFAULT_LOAD_FACTOR, DEFAULT_CONCURRENCY_LEVEL,
 				keyType, valueType, null
@@ -1198,7 +1202,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	/**
 	 * Returns the value to which the specified key is mapped,
 	 * or {@code null} if this map contains no mapping for the key.
-	 *
+	 * <p/>
 	 * <p>More formally, if this map contains a mapping from a key
 	 * {@code k} to a value {@code v} such that {@code key.equals(k)},
 	 * then this method returns {@code v}; otherwise it returns
@@ -1221,8 +1225,8 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * @param key possible key
 	 *
 	 * @return <tt>true</tt> if and only if the specified object
-	 *         is a key in this table, as determined by the
-	 *         <tt>equals</tt> method; <tt>false</tt> otherwise.
+	 * is a key in this table, as determined by the
+	 * <tt>equals</tt> method; <tt>false</tt> otherwise.
 	 *
 	 * @throws NullPointerException if the specified key is null
 	 */
@@ -1244,7 +1248,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * @param value value whose presence in this map is to be tested
 	 *
 	 * @return <tt>true</tt> if this map maps one or more keys to the
-	 *         specified value
+	 * specified value
 	 */
 	@Override
 	public boolean containsValue(Object value) {
@@ -1314,9 +1318,9 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * @param value a value to search for
 	 *
 	 * @return <tt>true</tt> if and only if some key maps to the
-	 *         <tt>value</tt> argument in this table as
-	 *         determined by the <tt>equals</tt> method;
-	 *         <tt>false</tt> otherwise
+	 * <tt>value</tt> argument in this table as
+	 * determined by the <tt>equals</tt> method;
+	 * <tt>false</tt> otherwise
 	 *
 	 * @throws NullPointerException if the specified value is null
 	 */
@@ -1327,7 +1331,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	/**
 	 * Maps the specified key to the specified value in this table.
 	 * Neither the key nor the value can be null.
-	 *
+	 * <p/>
 	 * <p> The value can be retrieved by calling the <tt>get</tt> method
 	 * with a key that is equal to the original key.
 	 *
@@ -1335,7 +1339,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * @param value value to be associated with the specified key
 	 *
 	 * @return the previous value associated with <tt>key</tt>, or
-	 *         <tt>null</tt> if there was no mapping for <tt>key</tt>
+	 * <tt>null</tt> if there was no mapping for <tt>key</tt>
 	 *
 	 * @throws NullPointerException if the specified key or value is null
 	 */
@@ -1352,7 +1356,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * {@inheritDoc}
 	 *
 	 * @return the previous value associated with the specified key,
-	 *         or <tt>null</tt> if there was no mapping for the key
+	 * or <tt>null</tt> if there was no mapping for the key
 	 *
 	 * @throws NullPointerException if the specified key or value is null
 	 */
@@ -1386,7 +1390,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * @param key the key that needs to be removed
 	 *
 	 * @return the previous value associated with <tt>key</tt>, or
-	 *         <tt>null</tt> if there was no mapping for <tt>key</tt>
+	 * <tt>null</tt> if there was no mapping for <tt>key</tt>
 	 *
 	 * @throws NullPointerException if the specified key is null
 	 */
@@ -1431,7 +1435,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * {@inheritDoc}
 	 *
 	 * @return the previous value associated with the specified key,
-	 *         or <tt>null</tt> if there was no mapping for the key
+	 * or <tt>null</tt> if there was no mapping for the key
 	 *
 	 * @throws NullPointerException if the specified key or value is null
 	 */
@@ -1461,7 +1465,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * are some cases where this operation should be performed eagerly, such
 	 * as cleaning up old references to a ClassLoader in a multi-classloader
 	 * environment.
-	 *
+	 * <p/>
 	 * Note: this method will acquire locks, one at a time, across all segments
 	 * of this table, so if it is to be used, it should be used sparingly.
 	 */
@@ -1481,9 +1485,9 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
 	 * operations.  It does not support the <tt>add</tt> or
 	 * <tt>addAll</tt> operations.
-	 *
+	 * <p/>
 	 * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
-	 * that will never throw {@link ConcurrentModificationException},
+	 * that will never throw {@link java.util.ConcurrentModificationException},
 	 * and guarantees to traverse elements as they existed upon
 	 * construction of the iterator, and may (but is not guaranteed to)
 	 * reflect any modifications subsequent to construction.
@@ -1503,9 +1507,9 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
 	 * <tt>retainAll</tt>, and <tt>clear</tt> operations.  It does not
 	 * support the <tt>add</tt> or <tt>addAll</tt> operations.
-	 *
+	 * <p/>
 	 * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
-	 * that will never throw {@link ConcurrentModificationException},
+	 * that will never throw {@link java.util.ConcurrentModificationException},
 	 * and guarantees to traverse elements as they existed upon
 	 * construction of the iterator, and may (but is not guaranteed to)
 	 * reflect any modifications subsequent to construction.
@@ -1525,9 +1529,9 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 	 * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
 	 * operations.  It does not support the <tt>add</tt> or
 	 * <tt>addAll</tt> operations.
-	 *
+	 * <p/>
 	 * <p>The view's <tt>iterator</tt> is a "weakly consistent" iterator
-	 * that will never throw {@link ConcurrentModificationException},
+	 * that will never throw {@link java.util.ConcurrentModificationException},
 	 * and guarantees to traverse elements as they existed upon
 	 * construction of the iterator, and may (but is not guaranteed to)
 	 * reflect any modifications subsequent to construction.
@@ -1671,7 +1675,7 @@ public class ConcurrentReferenceHashMap<K, V> extends AbstractMap<K, V>
 		  * This class is needed for JDK5 compatibility.
 		  */
 	static class SimpleEntry<K, V> implements Entry<K, V>,
-			java.io.Serializable {
+											  java.io.Serializable {
 		private static final long serialVersionUID = -8499721149061103585L;
 
 		private final K key;
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java
index ee24b54412..8b3c978204 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/IdentityMap.java
@@ -169,7 +169,7 @@ public final class IdentityMap<K,V> implements Map<K,V> {
 	}
 
 	@Override
-    public String toString() {
+	public String toString() {
 		return map.toString();
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java
index cb3ed17598..23bb177450 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java
@@ -34,18 +34,17 @@ import org.hibernate.StaleStateException;
 import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
 import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle;
 import org.hibernate.exception.GenericJDBCException;
+import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 
-import org.jboss.logging.Logger;
-
 /**
  * Holds various often used {@link Expectation} definitions.
  *
  * @author Steve Ebersole
  */
 public class Expectations {
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( Expectations.class );
 
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, Expectations.class.getName());
 	private static SqlExceptionHelper sqlExceptionHelper = new SqlExceptionHelper();
 
 	public static final int USUAL_EXPECTED_COUNT = 1;
@@ -75,14 +74,14 @@ public class Expectations {
 		}
 
 		private void checkBatched(int rowCount, int batchPosition) {
-            if (rowCount == -2) {
-				LOG.debugf("Success of batch update unknown: %s", batchPosition);
+			if ( rowCount == -2 ) {
+				LOG.debugf( "Success of batch update unknown: %s", batchPosition );
 			}
-            else if (rowCount == -3) {
-				throw new BatchFailedException("Batch update failed: " + batchPosition);
+			else if ( rowCount == -3 ) {
+				throw new BatchFailedException( "Batch update failed: " + batchPosition );
 			}
 			else {
-                if (expectedRowCount > rowCount) {
+				if ( expectedRowCount > rowCount ) {
 					throw new StaleStateException(
 							"Batch update returned unexpected row count from update ["
 									+ batchPosition + "]; actual row count: " + rowCount
@@ -91,8 +90,8 @@ public class Expectations {
 				}
 				if ( expectedRowCount < rowCount ) {
 					String msg = "Batch update returned unexpected row count from update [" +
-					             batchPosition + "]; actual row count: " + rowCount +
-					             "; expected: " + expectedRowCount;
+							batchPosition + "]; actual row count: " + rowCount +
+							"; expected: " + expectedRowCount;
 					throw new BatchedTooManyRowsAffectedException( msg, expectedRowCount, rowCount, batchPosition );
 				}
 			}
@@ -125,38 +124,41 @@ public class Expectations {
 
 	public static class BasicParamExpectation extends BasicExpectation {
 		private final int parameterPosition;
+
 		protected BasicParamExpectation(int expectedRowCount, int parameterPosition) {
 			super( expectedRowCount );
 			this.parameterPosition = parameterPosition;
 		}
 
 		@Override
-        public int prepare(PreparedStatement statement) throws SQLException, HibernateException {
+		public int prepare(PreparedStatement statement) throws SQLException, HibernateException {
 			toCallableStatement( statement ).registerOutParameter( parameterPosition, Types.NUMERIC );
 			return 1;
 		}
 
 		@Override
-        public boolean canBeBatched() {
+		public boolean canBeBatched() {
 			return false;
 		}
 
 		@Override
-        protected int determineRowCount(int reportedRowCount, PreparedStatement statement) {
+		protected int determineRowCount(int reportedRowCount, PreparedStatement statement) {
 			try {
 				return toCallableStatement( statement ).getInt( parameterPosition );
 			}
-			catch( SQLException sqle ) {
+			catch (SQLException sqle) {
 				sqlExceptionHelper.logExceptions( sqle, "could not extract row counts from CallableStatement" );
 				throw new GenericJDBCException( "could not extract row counts from CallableStatement", sqle );
 			}
 		}
 
 		private CallableStatement toCallableStatement(PreparedStatement statement) {
-			if ( ! CallableStatement.class.isInstance( statement ) ) {
-				throw new HibernateException( "BasicParamExpectation operates exclusively on CallableStatements : " + statement.getClass() );
+			if ( !CallableStatement.class.isInstance( statement ) ) {
+				throw new HibernateException(
+						"BasicParamExpectation operates exclusively on CallableStatements : " + statement.getClass()
+				);
 			}
-			return ( CallableStatement ) statement;
+			return (CallableStatement) statement;
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java
index 2e768dbe20..df92dbe525 100644
--- a/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java
+++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java
@@ -20,14 +20,12 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.jdbc;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.hibernate.HibernateException;
-
 /**
  * Contract for performing a discrete piece of JDBC work.
  *
@@ -38,8 +36,9 @@ public interface Work {
 	 * Execute the discrete work encapsulated by this work instance using the supplied connection.
 	 *
 	 * @param connection The connection on which to perform the work.
+	 *
 	 * @throws SQLException Thrown during execution of the underlying JDBC interaction.
-	 * @throws HibernateException Generally indicates a wrapped SQLException.
+	 * @throws org.hibernate.HibernateException Generally indicates a wrapped SQLException.
 	 */
-	public void execute(Connection connection) throws SQLException;
+	void execute(Connection connection) throws SQLException;
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java b/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java
index 2502a3b33b..5c39197ba9 100644
--- a/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jmx/internal/JmxServiceImpl.java
@@ -34,6 +34,7 @@ import javax.management.ObjectName;
 import org.hibernate.HibernateException;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Environment;
+import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.jmx.spi.JmxService;
@@ -41,15 +42,13 @@ import org.hibernate.service.Service;
 import org.hibernate.service.spi.Manageable;
 import org.hibernate.service.spi.Stoppable;
 
-import org.jboss.logging.Logger;
-
 /**
  * Standard implementation of JMX services
  *
  * @author Steve Ebersole
  */
 public class JmxServiceImpl implements JmxService, Stoppable {
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, JmxServiceImpl.class.getName());
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( JmxServiceImpl.class );
 
 	public static final String OBJ_NAME_TEMPLATE = "%s:sessionFactory=%s,serviceRole=%s,serviceType=%s";
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java
index fa56e08fed..a42dde60c6 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java
@@ -49,7 +49,6 @@ import org.hibernate.type.AssociationType;
  * @author Gavin King
  */
 public abstract class AbstractEntityJoinWalker extends JoinWalker {
-
 	private final OuterJoinLoadable persister;
 	private final String alias;
 
@@ -139,7 +138,7 @@ public abstract class AbstractEntityJoinWalker extends JoinWalker {
 				.setOrderByClause( orderBy( associations, orderBy ) )
 				.setGroupByClause( groupBy );
 
-		if ( getFactory().getSettings().isCommentsEnabled() ) {
+		if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) {
 			select.setComment( getComment() );
 		}
 		sql = select.toStatementString();
@@ -185,7 +184,7 @@ public abstract class AbstractEntityJoinWalker extends JoinWalker {
 	public abstract String getComment();
 
 	@Override
-    protected boolean isDuplicateAssociation(final String foreignKeyTable, final String[] foreignKeyColumns) {
+	protected boolean isDuplicateAssociation(final String foreignKeyTable, final String[] foreignKeyColumns) {
 		//disable a join back to this same association
 		final boolean isSameJoin =
 				persister.getTableName().equals( foreignKeyTable ) &&
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/GeneratedCollectionAliases.java b/hibernate-core/src/main/java/org/hibernate/loader/GeneratedCollectionAliases.java
index 4e02985dd3..76de310e7e 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/GeneratedCollectionAliases.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/GeneratedCollectionAliases.java
@@ -23,6 +23,7 @@
  *
  */
 package org.hibernate.loader;
+
 import java.util.Collections;
 import java.util.Map;
 
@@ -31,7 +32,7 @@ import org.hibernate.persister.collection.CollectionPersister;
 
 /**
  * CollectionAliases which handles the logic of selecting user provided aliases (via return-property),
- * before using the default aliases. 
+ * before using the default aliases.
  *
  * @author Steve Ebersole
  * @author Max Rydahl Andersen
@@ -43,13 +44,13 @@ public class GeneratedCollectionAliases implements CollectionAliases {
 	private final String[] elementAliases;
 	private final String identifierAlias;
 	private Map userProvidedAliases;
-	
+
 	public GeneratedCollectionAliases(Map userProvidedAliases, CollectionPersister persister, String suffix) {
 		this.suffix = suffix;
 		this.userProvidedAliases = userProvidedAliases;
 
 		this.keyAliases = getUserProvidedAliases(
-				"key", 
+				"key",
 				persister.getKeyColumnAliases( suffix )
 		);
 
@@ -57,12 +58,12 @@ public class GeneratedCollectionAliases implements CollectionAliases {
 				"index",
 				persister.getIndexColumnAliases( suffix )
 		);
-		
+
 		this.elementAliases = getUserProvidedAliases(
 				"element",
 				persister.getElementColumnAliases( suffix )
 		);
-				
+
 		this.identifierAlias = getUserProvidedAlias(
 				"id",
 				persister.getIdentifierColumnAlias( suffix )
@@ -70,7 +71,7 @@ public class GeneratedCollectionAliases implements CollectionAliases {
 	}
 
 	public GeneratedCollectionAliases(CollectionPersister persister, String string) {
-		this( Collections.EMPTY_MAP, persister, string);
+		this( Collections.EMPTY_MAP, persister, string );
 	}
 
 	/**
@@ -120,37 +121,37 @@ public class GeneratedCollectionAliases implements CollectionAliases {
 	}
 
 	@Override
-    public String toString() {
+	public String toString() {
 		return super.toString() + " [suffix=" + suffix +
-		        ", suffixedKeyAliases=[" + join( keyAliases ) +
-		        "], suffixedIndexAliases=[" + join( indexAliases ) +
-		        "], suffixedElementAliases=[" + join( elementAliases ) +
-		        "], suffixedIdentifierAlias=[" + identifierAlias + "]]";
+				", suffixedKeyAliases=[" + join( keyAliases ) +
+				"], suffixedIndexAliases=[" + join( indexAliases ) +
+				"], suffixedElementAliases=[" + join( elementAliases ) +
+				"], suffixedIdentifierAlias=[" + identifierAlias + "]]";
 	}
 
 	private String join(String[] aliases) {
-		if ( aliases == null) {
+		if ( aliases == null ) {
 			return null;
 		}
 
 		return StringHelper.join( ", ", aliases );
 	}
-	
+
 	private String[] getUserProvidedAliases(String propertyPath, String[] defaultAliases) {
-		String[] result = (String[]) userProvidedAliases.get(propertyPath);
-		if (result==null) {
-			return defaultAliases;			
-		} 
+		String[] result = (String[]) userProvidedAliases.get( propertyPath );
+		if ( result == null ) {
+			return defaultAliases;
+		}
 		else {
 			return result;
 		}
 	}
 
 	private String getUserProvidedAlias(String propertyPath, String defaultAlias) {
-		String[] columns = (String[]) userProvidedAliases.get(propertyPath);
-		if (columns==null) {
+		String[] columns = (String[]) userProvidedAliases.get( propertyPath );
+		if ( columns == null ) {
 			return defaultAlias;
-		} 
+		}
 		else {
 			return columns[0];
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java
index 0330161811..710cfd861d 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java
@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.loader;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -61,12 +62,12 @@ import org.hibernate.type.Type;
 /**
  * Walks the metamodel, searching for joins, and collecting
  * together information needed by <tt>OuterJoinLoader</tt>.
- * 
- * @see OuterJoinLoader
+ *
  * @author Gavin King, Jon Lipsky
+ * @see OuterJoinLoader
  */
 public class JoinWalker {
-	
+
 	private final SessionFactoryImplementor factory;
 	protected final List associations = new ArrayList();
 	private final Set visitedAssociationKeys = new HashSet();
@@ -189,7 +190,7 @@ public class JoinWalker {
 	}
 
 	/**
-	 * Add on association (one-to-one, many-to-one, or a collection) to a list 
+	 * Add on association (one-to-one, many-to-one, or a collection) to a list
 	 * of associations to be fetched by outerjoin (if necessary)
 	 */
 	private void addAssociationToJoinTreeIfNecessary(
@@ -201,9 +202,9 @@ public class JoinWalker {
 			final JoinType joinType) throws MappingException {
 		if ( joinType != JoinType.NONE ) {
 			addAssociationToJoinTree(
-					type, 
-					aliasedLhsColumns, 
-					alias, 
+					type,
+					aliasedLhsColumns,
+					alias,
 					path,
 					currentDepth,
 					joinType
@@ -211,17 +212,17 @@ public class JoinWalker {
 		}
 	}
 
-	protected boolean hasRestriction(PropertyPath path)	{
+	protected boolean hasRestriction(PropertyPath path) {
 		return false;
 	}
 
-	protected String getWithClause(PropertyPath path)	{
+	protected String getWithClause(PropertyPath path) {
 		return "";
 	}
-	
+
 	/**
-	 * Add on association (one-to-one, many-to-one, or a collection) to a list 
-	 * of associations to be fetched by outerjoin 
+	 * Add on association (one-to-one, many-to-one, or a collection) to a list
+	 * of associations to be fetched by outerjoin
 	 */
 	private void addAssociationToJoinTree(
 			final AssociationType type,
@@ -243,12 +244,12 @@ public class JoinWalker {
 		// joins)
 		OuterJoinableAssociation assoc = new OuterJoinableAssociation(
 				path,
-				type, 
-				alias, 
-				aliasedLhsColumns, 
-				subalias, 
-				joinType, 
-				getWithClause(path),
+				type,
+				alias,
+				aliasedLhsColumns,
+				subalias,
+				joinType,
+				getWithClause( path ),
 				hasRestriction( path ),
 				getFactory(),
 				loadQueryInfluencers.getEnabledFilters()
@@ -259,22 +260,22 @@ public class JoinWalker {
 		int nextDepth = currentDepth + 1;
 //		path = "";
 		if ( !joinable.isCollection() ) {
-			if (joinable instanceof OuterJoinLoadable) {
+			if ( joinable instanceof OuterJoinLoadable ) {
 				walkEntityTree(
-					(OuterJoinLoadable) joinable, 
-					subalias,
-					path, 
-					nextDepth
+						(OuterJoinLoadable) joinable,
+						subalias,
+						path,
+						nextDepth
 				);
 			}
 		}
 		else {
-			if (joinable instanceof QueryableCollection) {
+			if ( joinable instanceof QueryableCollection ) {
 				walkCollectionTree(
-					(QueryableCollection) joinable, 
-					subalias, 
-					path, 
-					nextDepth
+						(QueryableCollection) joinable,
+						subalias,
+						path,
+						nextDepth
 				);
 			}
 		}
@@ -285,10 +286,11 @@ public class JoinWalker {
 	 * Walk the association tree for an entity, adding associations which should
 	 * be join fetched to the {@link #associations} inst var.  This form is the
 	 * entry point into the walking for a given entity, starting the recursive
-	 * calls into {@link #walkEntityTree(org.hibernate.persister.entity.OuterJoinLoadable, String, PropertyPath ,int)}.
+	 * calls into {@link #walkEntityTree(org.hibernate.persister.entity.OuterJoinLoadable, String, PropertyPath, int)}.
 	 *
 	 * @param persister The persister representing the entity to be walked.
 	 * @param alias The (root) alias to use for this entity/persister.
+	 *
 	 * @throws org.hibernate.MappingException ???
 	 */
 	protected final void walkEntityTree(
@@ -312,7 +314,7 @@ public class JoinWalker {
 			final QueryableCollection persister,
 			final String alias,
 			final PropertyPath path,
-			final int currentDepth)	throws MappingException {
+			final int currentDepth) throws MappingException {
 
 		if ( persister.isOneToMany() ) {
 			walkEntityTree(
@@ -320,7 +322,7 @@ public class JoinWalker {
 					alias,
 					path,
 					currentDepth
-				);
+			);
 		}
 		else {
 			Type type = persister.getElementType();
@@ -329,7 +331,7 @@ public class JoinWalker {
 				// decrement currentDepth here to allow join across the association table
 				// without exceeding MAX_FETCH_DEPTH (i.e. the "currentDepth - 1" bit)
 				AssociationType associationType = (AssociationType) type;
-				String[] aliasedLhsColumns = persister.getElementColumnNames(alias);
+				String[] aliasedLhsColumns = persister.getElementColumnNames( alias );
 				String[] lhsColumns = persister.getElementColumnNames();
 				// if the current depth is 0, the root thing being loaded is the
 				// many-to-many collection itself.  Here, it is alright to use
@@ -342,7 +344,7 @@ public class JoinWalker {
 						persister.getTableName(),
 						lhsColumns,
 						!useInnerJoin,
-						currentDepth - 1, 
+						currentDepth - 1,
 						null //operations which cascade as far as the collection also cascade to collection elements
 				);
 				addAssociationToJoinTreeIfNecessary(
@@ -352,7 +354,7 @@ public class JoinWalker {
 						path,
 						currentDepth - 1,
 						joinType
-					);
+				);
 			}
 			else if ( type.isComponentType() ) {
 				walkCompositeElementTree(
@@ -362,12 +364,12 @@ public class JoinWalker {
 						alias,
 						path,
 						currentDepth
-					);
+				);
 			}
 		}
 
 	}
-	
+
 	/**
 	 * Process a particular association owned by the entity
 	 *
@@ -381,6 +383,7 @@ public class JoinWalker {
 	 * @param nullable is the association nullable (which I think is supposed
 	 * to indicate inner/outer join semantics).
 	 * @param currentDepth The current join depth
+	 *
 	 * @throws org.hibernate.MappingException ???
 	 */
 	private void walkEntityAssociationTree(
@@ -397,9 +400,9 @@ public class JoinWalker {
 		String[] lhsColumns = JoinHelper.getLHSColumnNames(
 				associationType, propertyNumber, persister, getFactory()
 		);
-		String lhsTable = JoinHelper.getLHSTableName(associationType, propertyNumber, persister);
+		String lhsTable = JoinHelper.getLHSTableName( associationType, propertyNumber, persister );
 
-		PropertyPath subPath = path.append( persister.getSubclassPropertyName(propertyNumber) );
+		PropertyPath subPath = path.append( persister.getSubclassPropertyName( propertyNumber ) );
 		JoinType joinType = getJoinType(
 				persister,
 				subPath,
@@ -436,8 +439,10 @@ public class JoinWalker {
 	 * @param lhsColumns The owner join columns
 	 * @param nullable Is the association nullable.
 	 * @param currentDepth Current join depth
+	 *
 	 * @return type of join to use ({@link org.hibernate.sql.JoinType#INNER_JOIN},
 	 * {@link org.hibernate.sql.JoinType#LEFT_OUTER_JOIN}, or -1 to indicate no joining.
+	 *
 	 * @throws MappingException ??
 	 */
 	protected JoinType getJoinType(
@@ -475,8 +480,10 @@ public class JoinWalker {
 	 * @param nullable Is the association nullable.
 	 * @param currentDepth Current join depth
 	 * @param cascadeStyle The metadata-defined cascade style.
+	 *
 	 * @return type of join to use ({@link org.hibernate.sql.JoinType#INNER_JOIN},
 	 * {@link org.hibernate.sql.JoinType#LEFT_OUTER_JOIN}, or -1 to indicate no joining.
+	 *
 	 * @throws MappingException ??
 	 */
 	protected JoinType getJoinType(
@@ -488,10 +495,10 @@ public class JoinWalker {
 			boolean nullable,
 			int currentDepth,
 			CascadeStyle cascadeStyle) throws MappingException {
-		if  ( !isJoinedFetchEnabled( associationType, config, cascadeStyle ) ) {
+		if ( !isJoinedFetchEnabled( associationType, config, cascadeStyle ) ) {
 			return JoinType.NONE;
 		}
-		if ( isTooDeep(currentDepth) || ( associationType.isCollectionType() && isTooManyCollections() ) ) {
+		if ( isTooDeep( currentDepth ) || ( associationType.isCollectionType() && isTooManyCollections() ) ) {
 			return JoinType.NONE;
 		}
 		if ( isDuplicateAssociation( lhsTable, lhsColumns, associationType ) ) {
@@ -504,12 +511,13 @@ public class JoinWalker {
 	 * Walk the association tree for an entity, adding associations which should
 	 * be join fetched to the {@link #associations} inst var.  This form is the
 	 * entry point into the walking for a given entity, starting the recursive
-	 * calls into {@link #walkEntityTree(org.hibernate.persister.entity.OuterJoinLoadable, String, PropertyPath ,int)}.
+	 * calls into {@link #walkEntityTree(org.hibernate.persister.entity.OuterJoinLoadable, String, PropertyPath, int)}.
 	 *
 	 * @param persister The persister representing the entity to be walked.
 	 * @param alias The (root) alias to use for this entity/persister.
 	 * @param path The property path to the entity being walked
 	 * @param currentDepth The current join depth
+	 *
 	 * @throws org.hibernate.MappingException ???
 	 */
 	private void walkEntityTree(
@@ -519,26 +527,26 @@ public class JoinWalker {
 			final int currentDepth) throws MappingException {
 		int n = persister.countSubclassProperties();
 		for ( int i = 0; i < n; i++ ) {
-			Type type = persister.getSubclassPropertyType(i);
+			Type type = persister.getSubclassPropertyType( i );
 			if ( type.isAssociationType() ) {
 				walkEntityAssociationTree(
-					( AssociationType ) type,
-					persister,
-					i,
-					alias,
-					path,
-					persister.isSubclassPropertyNullable(i),
-					currentDepth
+						(AssociationType) type,
+						persister,
+						i,
+						alias,
+						path,
+						persister.isSubclassPropertyNullable( i ),
+						currentDepth
 				);
 			}
 			else if ( type.isComponentType() ) {
 				walkComponentTree(
-						( CompositeType ) type,
+						(CompositeType) type,
 						i,
 						0,
 						persister,
 						alias,
-						path.append( persister.getSubclassPropertyName(i) ),
+						path.append( persister.getSubclassPropertyName( i ) ),
 						currentDepth
 				);
 			}
@@ -576,7 +584,6 @@ public class JoinWalker {
 	/**
 	 * For a component, add to a list of associations to be fetched by outerjoin
 	 *
-	 *
 	 * @param componentType The component type to be walked.
 	 * @param propertyNumber The property number for the component property (relative to
 	 * persister).
@@ -585,6 +592,7 @@ public class JoinWalker {
 	 * @param alias The root alias
 	 * @param path The property access path
 	 * @param currentDepth The current join depth
+	 *
 	 * @throws org.hibernate.MappingException ???
 	 */
 	private void walkComponentTree(
@@ -601,12 +609,12 @@ public class JoinWalker {
 			if ( types[i].isAssociationType() ) {
 				AssociationType associationType = (AssociationType) types[i];
 				String[] aliasedLhsColumns = JoinHelper.getAliasedLHSColumnNames(
-					associationType, alias, propertyNumber, begin, persister, getFactory()
+						associationType, alias, propertyNumber, begin, persister, getFactory()
 				);
 				String[] lhsColumns = JoinHelper.getLHSColumnNames(
-					associationType, propertyNumber, begin, persister, getFactory()
+						associationType, propertyNumber, begin, persister, getFactory()
 				);
-				String lhsTable = JoinHelper.getLHSTableName(associationType, propertyNumber, persister);
+				String lhsTable = JoinHelper.getLHSTableName( associationType, propertyNumber, persister );
 
 				final PropertyPath subPath = path.append( propertyNames[i] );
 				final boolean[] propertyNullability = componentType.getPropertyNullability();
@@ -615,14 +623,14 @@ public class JoinWalker {
 						subPath,
 						propertyNumber,
 						associationType,
-						componentType.getFetchMode(i),
-						componentType.getCascadeStyle(i),
+						componentType.getFetchMode( i ),
+						componentType.getCascadeStyle( i ),
 						lhsTable,
 						lhsColumns,
-						propertyNullability==null || propertyNullability[i],
+						propertyNullability == null || propertyNullability[i],
 						currentDepth
 				);
-				addAssociationToJoinTreeIfNecessary(			
+				addAssociationToJoinTreeIfNecessary(
 						associationType,
 						aliasedLhsColumns,
 						alias,
@@ -635,7 +643,7 @@ public class JoinWalker {
 			else if ( types[i].isComponentType() ) {
 				final PropertyPath subPath = path.append( propertyNames[i] );
 				walkComponentTree(
-						( CompositeType ) types[i],
+						(CompositeType) types[i],
 						propertyNumber,
 						begin,
 						persister,
@@ -663,29 +671,29 @@ public class JoinWalker {
 		Type[] types = compositeType.getSubtypes();
 		String[] propertyNames = compositeType.getPropertyNames();
 		int begin = 0;
-		for ( int i=0; i <types.length; i++ ) {
+		for ( int i = 0; i < types.length; i++ ) {
 			int length = types[i].getColumnSpan( getFactory() );
-			String[] lhsColumns = ArrayHelper.slice(cols, begin, length);
+			String[] lhsColumns = ArrayHelper.slice( cols, begin, length );
 
 			if ( types[i].isAssociationType() ) {
 				AssociationType associationType = (AssociationType) types[i];
 
 				// simple, because we can't have a one-to-one or a collection 
 				// (or even a property-ref) in a composite-element:
-				String[] aliasedLhsColumns = StringHelper.qualify(alias, lhsColumns);
+				String[] aliasedLhsColumns = StringHelper.qualify( alias, lhsColumns );
 
 				final PropertyPath subPath = path.append( propertyNames[i] );
 				final boolean[] propertyNullability = compositeType.getPropertyNullability();
 				final JoinType joinType = getJoinType(
 						associationType,
-						compositeType.getFetchMode(i),
+						compositeType.getFetchMode( i ),
 						subPath,
 						persister.getTableName(),
 						lhsColumns,
-						propertyNullability==null || propertyNullability[i],
-						currentDepth, 
-						compositeType.getCascadeStyle(i)
-					);
+						propertyNullability == null || propertyNullability[i],
+						currentDepth,
+						compositeType.getCascadeStyle( i )
+				);
 				addAssociationToJoinTreeIfNecessary(
 						associationType,
 						aliasedLhsColumns,
@@ -693,7 +701,7 @@ public class JoinWalker {
 						subPath,
 						currentDepth,
 						joinType
-					);
+				);
 			}
 			else if ( types[i].isComponentType() ) {
 				final PropertyPath subPath = path.append( propertyNames[i] );
@@ -704,9 +712,9 @@ public class JoinWalker {
 						alias,
 						subPath,
 						currentDepth
-					);
+				);
 			}
-			begin+=length;
+			begin += length;
 		}
 
 	}
@@ -727,34 +735,34 @@ public class JoinWalker {
 	}
 
 	protected boolean isTooDeep(int currentDepth) {
-		Integer maxFetchDepth = getFactory().getSettings().getMaximumFetchDepth();
-		return maxFetchDepth!=null && currentDepth >= maxFetchDepth;
+		Integer maxFetchDepth = getFactory().getSessionFactoryOptions().getMaximumFetchDepth();
+		return maxFetchDepth != null && currentDepth >= maxFetchDepth;
 	}
-	
+
 	protected boolean isTooManyCollections() {
 		return false;
 	}
-	
+
 	/**
 	 * Does the mapping, and Hibernate default semantics, specify that
 	 * this association should be fetched by outer joining
 	 */
-	protected boolean isJoinedFetchEnabledInMapping(FetchMode config, AssociationType type) 
-	throws MappingException {
+	protected boolean isJoinedFetchEnabledInMapping(FetchMode config, AssociationType type)
+			throws MappingException {
 		if ( !type.isEntityType() && !type.isCollectionType() ) {
 			return false;
 		}
 		else {
-			if (config==FetchMode.JOIN) {
+			if ( config == FetchMode.JOIN ) {
 				return true;
 			}
-			if (config==FetchMode.SELECT) {
+			if ( config == FetchMode.SELECT ) {
 				return false;
 			}
 			if ( type.isEntityType() ) {
 				//TODO: look at the owning property and check that it 
 				//      isn't lazy (by instrumentation)
-				EntityType entityType =(EntityType) type;
+				EntityType entityType = (EntityType) type;
 				EntityPersister persister = getFactory().getEntityPersister( entityType.getAssociatedEntityName() );
 				return !persister.hasProxy();
 			}
@@ -765,38 +773,41 @@ public class JoinWalker {
 	}
 
 	/**
-	 * Override on subclasses to enable or suppress joining 
+	 * Override on subclasses to enable or suppress joining
 	 * of certain association types
 	 */
 	protected boolean isJoinedFetchEnabled(AssociationType type, FetchMode config, CascadeStyle cascadeStyle) {
-		return type.isEntityType() && isJoinedFetchEnabledInMapping(config, type) ;
+		return type.isEntityType() && isJoinedFetchEnabledInMapping( config, type );
 	}
-	
+
 	protected String generateTableAlias(final int n, final PropertyPath path, final Joinable joinable) {
 		return StringHelper.generateAlias( joinable.getName(), n );
 	}
 
 	protected String generateRootAlias(final String description) {
-		return StringHelper.generateAlias(description, 0);
+		return StringHelper.generateAlias( description, 0 );
 	}
 
 	/**
-	 * Used to detect circularities in the joined graph, note that 
+	 * Used to detect circularities in the joined graph, note that
 	 * this method is side-effecty
 	 */
 	protected boolean isDuplicateAssociation(final String foreignKeyTable, final String[] foreignKeyColumns) {
-		AssociationKey associationKey = new AssociationKey(foreignKeyColumns, foreignKeyTable);
+		AssociationKey associationKey = new AssociationKey( foreignKeyColumns, foreignKeyTable );
 		return !visitedAssociationKeys.add( associationKey );
 	}
-	
+
 	/**
-	 * Used to detect circularities in the joined graph, note that 
+	 * Used to detect circularities in the joined graph, note that
 	 * this method is side-effecty
 	 */
-	protected boolean isDuplicateAssociation(final String lhsTable, final String[] lhsColumnNames, final AssociationType type) {
+	protected boolean isDuplicateAssociation(
+			final String lhsTable,
+			final String[] lhsColumnNames,
+			final AssociationType type) {
 		final String foreignKeyTable;
 		final String[] foreignKeyColumns;
-		if ( type.getForeignKeyDirection()==ForeignKeyDirection.FROM_PARENT ) {
+		if ( type.getForeignKeyDirection() == ForeignKeyDirection.FROM_PARENT ) {
 			foreignKeyTable = lhsTable;
 			foreignKeyColumns = lhsColumnNames;
 		}
@@ -804,9 +815,9 @@ public class JoinWalker {
 			foreignKeyTable = type.getAssociatedJoinable( getFactory() ).getTableName();
 			foreignKeyColumns = JoinHelper.getRHSColumnNames( type, getFactory() );
 		}
-		return isDuplicateAssociation(foreignKeyTable, foreignKeyColumns);
+		return isDuplicateAssociation( foreignKeyTable, foreignKeyColumns );
 	}
-	
+
 	/**
 	 * Uniquely identifier a foreign key, so that we don't
 	 * join it more than once, and create circularities
@@ -814,21 +825,24 @@ public class JoinWalker {
 	private static final class AssociationKey {
 		private String[] columns;
 		private String table;
+
 		private AssociationKey(String[] columns, String table) {
 			this.columns = columns;
 			this.table = table;
 		}
+
 		@Override
-        public boolean equals(Object other) {
+		public boolean equals(Object other) {
 			AssociationKey that = (AssociationKey) other;
-			return that.table.equals(table) && Arrays.equals(columns, that.columns);
+			return that.table.equals( table ) && Arrays.equals( columns, that.columns );
 		}
+
 		@Override
-        public int hashCode() {
+		public int hashCode() {
 			return table.hashCode(); //TODO: inefficient
 		}
 	}
-	
+
 	/**
 	 * Should we join this association?
 	 */
@@ -843,17 +857,17 @@ public class JoinWalker {
 		if ( joinType == JoinType.NONE ) {
 			return false;
 		}
-		
+
 		if ( joinType == JoinType.INNER_JOIN ) {
 			return true;
 		}
 
 		Integer maxFetchDepth = getFactory().getSessionFactoryOptions().getMaximumFetchDepth();
-		final boolean tooDeep = maxFetchDepth!=null && depth >= maxFetchDepth;
-		
-		return !tooDeep && !isDuplicateAssociation(lhsTable, lhsColumnNames, type);
+		final boolean tooDeep = maxFetchDepth != null && depth >= maxFetchDepth;
+
+		return !tooDeep && !isDuplicateAssociation( lhsTable, lhsColumnNames, type );
 	}
-	
+
 	protected String orderBy(final List associations, final String orderBy) {
 		return mergeOrderings( orderBy( associations ), orderBy );
 	}
@@ -869,22 +883,22 @@ public class JoinWalker {
 			return ordering1 + ", " + ordering2;
 		}
 	}
-	
+
 	/**
 	 * Generate a sequence of <tt>LEFT OUTER JOIN</tt> clauses for the given associations.
 	 */
 	protected final JoinFragment mergeOuterJoins(List associations)
-	throws MappingException {
+			throws MappingException {
 		JoinFragment outerjoin = getDialect().createOuterJoinFragment();
 		Iterator iter = associations.iterator();
 		OuterJoinableAssociation last = null;
 		while ( iter.hasNext() ) {
 			final OuterJoinableAssociation oj = (OuterJoinableAssociation) iter.next();
 			if ( last != null && last.isManyToManyWith( oj ) ) {
-				oj.addManyToManyJoin( outerjoin, ( QueryableCollection ) last.getJoinable() );
+				oj.addManyToManyJoin( outerjoin, (QueryableCollection) last.getJoinable() );
 			}
 			else {
-				oj.addJoins(outerjoin);
+				oj.addJoins( outerjoin );
 			}
 			last = oj;
 		}
@@ -897,7 +911,7 @@ public class JoinWalker {
 	 * also instances of Loadable, or are one-to-many associations
 	 */
 	protected static int countEntityPersisters(List associations)
-	throws MappingException {
+			throws MappingException {
 		int result = 0;
 		for ( Object association : associations ) {
 			final OuterJoinableAssociation oj = (OuterJoinableAssociation) association;
@@ -907,14 +921,14 @@ public class JoinWalker {
 		}
 		return result;
 	}
-	
+
 	/**
 	 * Count the number of instances of Joinable which are actually
 	 * also instances of PersistentCollection which are being fetched
 	 * by outer join
 	 */
 	protected static int countCollectionPersisters(List associations)
-	throws MappingException {
+			throws MappingException {
 		int result = 0;
 		for ( Object association : associations ) {
 			final OuterJoinableAssociation oj = (OuterJoinableAssociation) association;
@@ -926,12 +940,12 @@ public class JoinWalker {
 		}
 		return result;
 	}
-	
+
 	/**
 	 * Get the order by string required for collection fetching
 	 */
 	protected static String orderBy(List associations)
-	throws MappingException {
+			throws MappingException {
 		StringBuilder buf = new StringBuilder();
 		Iterator iter = associations.iterator();
 		OuterJoinableAssociation last = null;
@@ -942,7 +956,7 @@ public class JoinWalker {
 					final QueryableCollection queryableCollection = (QueryableCollection) oj.getJoinable();
 					if ( queryableCollection.hasOrdering() ) {
 						final String orderByString = queryableCollection.getSQLOrderByString( oj.getRHSAlias() );
-						buf.append( orderByString ).append(", ");
+						buf.append( orderByString ).append( ", " );
 					}
 				}
 				else {
@@ -953,7 +967,7 @@ public class JoinWalker {
 						if ( queryableCollection.isManyToMany() && last.isManyToManyWith( oj ) ) {
 							if ( queryableCollection.hasManyToManyOrdering() ) {
 								final String orderByString = queryableCollection.getManyToManyOrderByString( oj.getRHSAlias() );
-								buf.append( orderByString ).append(", ");
+								buf.append( orderByString ).append( ", " );
 							}
 						}
 					}
@@ -961,8 +975,8 @@ public class JoinWalker {
 			}
 			last = oj;
 		}
-		if ( buf.length()>0 ) {
-			buf.setLength( buf.length()-2 );
+		if ( buf.length() > 0 ) {
+			buf.setLength( buf.length() - 2 );
 		}
 		return buf.toString();
 	}
@@ -971,35 +985,35 @@ public class JoinWalker {
 	 * Render the where condition for a (batch) load by identifier / collection key
 	 */
 	protected StringBuilder whereString(String alias, String[] columnNames, int batchSize) {
-		if ( columnNames.length==1 ) {
+		if ( columnNames.length == 1 ) {
 			// if not a composite key, use "foo in (?, ?, ?)" for batching
 			// if no batch, and not a composite key, use "foo = ?"
 			InFragment in = new InFragment().setColumn( alias, columnNames[0] );
-			for ( int i=0; i<batchSize; i++ ) {
-				in.addValue("?");
+			for ( int i = 0; i < batchSize; i++ ) {
+				in.addValue( "?" );
 			}
 			return new StringBuilder( in.toFragmentString() );
 		}
 		else {
 			//a composite key
 			ConditionFragment byId = new ConditionFragment()
-					.setTableAlias(alias)
+					.setTableAlias( alias )
 					.setCondition( columnNames, "?" );
-	
+
 			StringBuilder whereString = new StringBuilder();
-			if ( batchSize==1 ) {
+			if ( batchSize == 1 ) {
 				// if no batch, use "foo = ? and bar = ?"
 				whereString.append( byId.toFragmentString() );
 			}
 			else {
 				// if a composite key, use "( (foo = ? and bar = ?) or (foo = ? and bar = ?) )" for batching
-				whereString.append('('); //TODO: unnecessary for databases with ANSI-style joins
+				whereString.append( '(' ); //TODO: unnecessary for databases with ANSI-style joins
 				DisjunctionFragment df = new DisjunctionFragment();
-				for ( int i=0; i<batchSize; i++ ) {
-					df.addCondition(byId);
+				for ( int i = 0; i < batchSize; i++ ) {
+					df.addCondition( byId );
 				}
 				whereString.append( df.toFragmentString() );
-				whereString.append(')'); //TODO: unnecessary for databases with ANSI-style joins
+				whereString.append( ')' ); //TODO: unnecessary for databases with ANSI-style joins
 			}
 			return whereString;
 		}
@@ -1007,7 +1021,7 @@ public class JoinWalker {
 
 
 	protected void initPersisters(final List associations, final LockMode lockMode) throws MappingException {
-		initPersisters( associations, new LockOptions(lockMode));
+		initPersisters( associations, new LockOptions( lockMode ) );
 	}
 
 	protected interface AssociationInitCallback {
@@ -1018,6 +1032,7 @@ public class JoinWalker {
 
 		void associationProcessed(OuterJoinableAssociation oja, int position);
 	}
+
 	protected void initPersisters(final List associations, final LockOptions lockOptions) throws MappingException {
 		initPersisters( associations, lockOptions, AssociationInitCallback.NO_CALLBACK );
 	}
@@ -1026,11 +1041,11 @@ public class JoinWalker {
 			final List associations,
 			final LockOptions lockOptions,
 			final AssociationInitCallback callback) throws MappingException {
-		final int joins = countEntityPersisters(associations);
-		final int collections = countCollectionPersisters(associations);
+		final int joins = countEntityPersisters( associations );
+		final int collections = countCollectionPersisters( associations );
 
-		collectionOwners = collections==0 ? null : new int[collections];
-		collectionPersisters = collections==0 ? null : new CollectionPersister[collections];
+		collectionOwners = collections == 0 ? null : new int[collections];
+		collectionPersisters = collections == 0 ? null : new CollectionPersister[collections];
 		collectionSuffixes = BasicLoader.generateSuffixes( joins + 1, collections );
 
 		this.lockOptions = lockOptions;
@@ -1041,31 +1056,30 @@ public class JoinWalker {
 		ownerAssociationTypes = new EntityType[joins];
 		lockModeArray = ArrayHelper.fillArray( lockOptions.getLockMode(), joins );
 
-		int i=0;
-		int j=0;
-		Iterator iter = associations.iterator();
-		while ( iter.hasNext() ) {
-			final OuterJoinableAssociation oj = (OuterJoinableAssociation) iter.next();
+		int i = 0;
+		int j = 0;
+		for ( Object association : associations ) {
+			final OuterJoinableAssociation oj = (OuterJoinableAssociation) association;
 			if ( !oj.isCollection() ) {
-				
+
 				persisters[i] = (Loadable) oj.getJoinable();
 				aliases[i] = oj.getRHSAlias();
-				owners[i] = oj.getOwner(associations);
+				owners[i] = oj.getOwner( associations );
 				ownerAssociationTypes[i] = (EntityType) oj.getJoinableType();
 				callback.associationProcessed( oj, i );
 				i++;
-				
+
 			}
 			else {
-				
+
 				QueryableCollection collPersister = (QueryableCollection) oj.getJoinable();
-				if ( oj.getJoinType()==JoinType.LEFT_OUTER_JOIN && ! oj.hasRestriction() ) {
+				if ( oj.getJoinType() == JoinType.LEFT_OUTER_JOIN && !oj.hasRestriction() ) {
 					//it must be a collection fetch
 					collectionPersisters[j] = collPersister;
-					collectionOwners[j] = oj.getOwner(associations);
+					collectionOwners[j] = oj.getOwner( associations );
 					j++;
 				}
-	
+
 				if ( collPersister.isOneToMany() ) {
 					persisters[i] = (Loadable) collPersister.getElementPersister();
 					aliases[i] = oj.getRHSAlias();
@@ -1075,10 +1089,10 @@ public class JoinWalker {
 			}
 		}
 
-		if ( ArrayHelper.isAllNegative(owners) ) {
+		if ( ArrayHelper.isAllNegative( owners ) ) {
 			owners = null;
 		}
-		if ( collectionOwners!=null && ArrayHelper.isAllNegative(collectionOwners) ) {
+		if ( collectionOwners != null && ArrayHelper.isAllNegative( collectionOwners ) ) {
 			collectionOwners = null;
 		}
 	}
@@ -1088,41 +1102,41 @@ public class JoinWalker {
 	 */
 	protected final String selectString(List associations) throws MappingException {
 
-		if ( associations.size()==0 ) {
+		if ( associations.size() == 0 ) {
 			return "";
 		}
 		else {
 			StringBuilder buf = new StringBuilder( associations.size() * 100 );
-			int entityAliasCount=0;
-			int collectionAliasCount=0;
-			for ( int i=0; i<associations.size(); i++ ) {
-				OuterJoinableAssociation join = (OuterJoinableAssociation) associations.get(i);
-				OuterJoinableAssociation next = (i == associations.size() - 1)
-				        ? null
-				        : ( OuterJoinableAssociation ) associations.get( i + 1 );
+			int entityAliasCount = 0;
+			int collectionAliasCount = 0;
+			for ( int i = 0; i < associations.size(); i++ ) {
+				OuterJoinableAssociation join = (OuterJoinableAssociation) associations.get( i );
+				OuterJoinableAssociation next = ( i == associations.size() - 1 )
+						? null
+						: (OuterJoinableAssociation) associations.get( i + 1 );
 				final Joinable joinable = join.getJoinable();
 				final String entitySuffix = ( suffixes == null || entityAliasCount >= suffixes.length )
-				        ? null
-				        : suffixes[entityAliasCount];
+						? null
+						: suffixes[entityAliasCount];
 				final String collectionSuffix = ( collectionSuffixes == null || collectionAliasCount >= collectionSuffixes.length )
-				        ? null
-				        : collectionSuffixes[collectionAliasCount];
+						? null
+						: collectionSuffixes[collectionAliasCount];
 				final String selectFragment = joinable.selectFragment(
 						next == null ? null : next.getJoinable(),
 						next == null ? null : next.getRHSAlias(),
 						join.getRHSAlias(),
 						entitySuffix,
-				        collectionSuffix,
-						join.getJoinType()==JoinType.LEFT_OUTER_JOIN
+						collectionSuffix,
+						join.getJoinType() == JoinType.LEFT_OUTER_JOIN
 				);
-				if (selectFragment.trim().length() > 0) {
-					buf.append(", ").append(selectFragment);
+				if ( selectFragment.trim().length() > 0 ) {
+					buf.append( ", " ).append( selectFragment );
 				}
 				if ( joinable.consumesEntityAlias() ) {
 					entityAliasCount++;
 				}
 				if ( joinable.consumesCollectionAlias() &&
-						join.getJoinType()==JoinType.LEFT_OUTER_JOIN &&
+						join.getJoinType() == JoinType.LEFT_OUTER_JOIN &&
 						!join.hasRestriction() ) {
 					collectionAliasCount++;
 				}
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/Loader.java b/hibernate-core/src/main/java/org/hibernate/loader/Loader.java
index 2567cf6da3..8f306450f8 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/Loader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/Loader.java
@@ -34,7 +34,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -78,6 +77,7 @@ import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.spi.PostLoadEvent;
 import org.hibernate.event.spi.PreLoadEvent;
 import org.hibernate.hql.internal.HolderInstantiator;
+import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.FetchingScrollableResultsImpl;
 import org.hibernate.internal.ScrollableResultsImpl;
@@ -114,9 +114,9 @@ import org.jboss.logging.Logger;
  * @see org.hibernate.persister.entity.Loadable
  */
 public abstract class Loader {
-
-	protected static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, Loader.class.getName());
+	protected static final CoreMessageLogger LOG = CoreLogging.messageLogger( Loader.class );
 	protected static final boolean DEBUG_ENABLED = LOG.isDebugEnabled();
+
 	private final SessionFactoryImplementor factory;
 	private volatile ColumnNameCache columnNameCache;
 
@@ -124,7 +124,7 @@ public abstract class Loader {
 
 	public Loader(SessionFactoryImplementor factory) {
 		this.factory = factory;
-		this.referenceCachingEnabled = factory.getSettings().isDirectReferenceCacheEntriesEnabled();
+		this.referenceCachingEnabled = factory.getSessionFactoryOptions().isDirectReferenceCacheEntriesEnabled();
 	}
 
 	/**
@@ -257,7 +257,7 @@ public abstract class Loader {
 			sql = dialect.getQueryHintString( sql, parameters.getQueryHints() );
 		}
 		
-		return getFactory().getSettings().isCommentsEnabled()
+		return getFactory().getSessionFactoryOptions().isCommentsEnabled()
 				? prependComment( sql, parameters )
 				: sql;
 	}
@@ -305,12 +305,7 @@ public abstract class Loader {
 			return sql;
 		}
 		else {
-			return new StringBuilder( comment.length() + sql.length() + 5 )
-					.append( "/* " )
-					.append( comment )
-					.append( " */ " )
-					.append( sql )
-					.toString();
+			return "/* " + comment + " */ " + sql;
 		}
 	}
 
@@ -1085,14 +1080,14 @@ public abstract class Loader {
 
 		final CollectionPersister[] collectionPersisters = getCollectionPersisters();
 		if ( collectionPersisters != null ) {
-			for ( int i=0; i<collectionPersisters.length; i++ ) {
-				if ( collectionPersisters[i].isArray() ) {
+			for ( CollectionPersister collectionPersister : collectionPersisters ) {
+				if ( collectionPersister.isArray() ) {
 					//for arrays, we should end the collection load before resolving
 					//the entities, since the actual array instances are not instantiated
 					//during loading
 					//TODO: or we could do this polymorphically, and have two
 					//      different operations implemented differently for arrays
-					endCollectionLoad( resultSetId, session, collectionPersisters[i] );
+					endCollectionLoad( resultSetId, session, collectionPersister );
 				}
 			}
 		}
@@ -1366,19 +1361,19 @@ public abstract class Loader {
 			// that the collection is empty and has no rows in the result set
 			CollectionPersister[] collectionPersisters = getCollectionPersisters();
 			for ( CollectionPersister collectionPersister : collectionPersisters )
-				for ( int i = 0; i < keys.length; i++ ) {
+				for ( Serializable key : keys ) {
 					//handle empty collections
 					if ( debugEnabled ) {
 						LOG.debugf(
 								"Result set contains (possibly empty) collection: %s",
-								MessageHelper.collectionInfoString( collectionPersister, keys[i], getFactory() )
+								MessageHelper.collectionInfoString( collectionPersister, key, getFactory() )
 						);
 					}
 
 					session.getPersistenceContext()
 							.getLoadContexts()
 							.getCollectionLoadContext( (ResultSet) resultSetId )
-							.getLoadingCollection( collectionPersister, keys[i] );
+							.getLoadingCollection( collectionPersister, key );
 				}
 		}
 
@@ -1813,7 +1808,7 @@ public abstract class Loader {
 	}
 
 	private ScrollMode getScrollMode(boolean scroll, boolean hasFirstRow, boolean useLimitOffSet, QueryParameters queryParameters) {
-		final boolean canScroll = getFactory().getSettings().isScrollableResultSetsEnabled();
+		final boolean canScroll = getFactory().getSessionFactoryOptions().isScrollableResultSetsEnabled();
 		if ( canScroll ) {
 			if ( scroll ) {
 				return queryParameters.getScrollMode();
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java
index 9d295cbe25..c0689f0d1b 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java
@@ -20,9 +20,9 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.loader;
+
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.dialect.Dialect;
@@ -41,7 +41,6 @@ import org.hibernate.type.EntityType;
  * @author Gavin King
  */
 public abstract class OuterJoinLoader extends BasicLoader {
-
 	protected Loadable[] persisters;
 	protected CollectionPersister[] collectionPersisters;
 	protected int[] collectionOwners;
@@ -54,11 +53,11 @@ public abstract class OuterJoinLoader extends BasicLoader {
 	protected String[] suffixes;
 	protected String[] collectionSuffixes;
 
-    private LoadQueryInfluencers loadQueryInfluencers;
+	private LoadQueryInfluencers loadQueryInfluencers;
 
 	protected final Dialect getDialect() {
-    	return getFactory().getDialect();
-    }
+		return getFactory().getDialect();
+	}
 
 	public OuterJoinLoader(
 			SessionFactoryImplementor factory,
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinableAssociation.java b/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinableAssociation.java
index b7b2c95ed9..919e4cba5a 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinableAssociation.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinableAssociation.java
@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.loader;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -90,10 +91,10 @@ public final class OuterJoinableAssociation {
 		this.lhsColumns = lhsColumns;
 		this.rhsAlias = rhsAlias;
 		this.joinType = joinType;
-		this.joinable = joinableType.getAssociatedJoinable(factory);
-		this.rhsColumns = JoinHelper.getRHSColumnNames(joinableType, factory);
-		this.on = joinableType.getOnCondition(rhsAlias, factory, enabledFilters)
-			+ ( withClause == null || withClause.trim().length() == 0 ? "" : " and ( " + withClause + " )" );
+		this.joinable = joinableType.getAssociatedJoinable( factory );
+		this.rhsColumns = JoinHelper.getRHSColumnNames( joinableType, factory );
+		this.on = joinableType.getOnCondition( rhsAlias, factory, enabledFilters )
+				+ ( withClause == null || withClause.trim().length() == 0 ? "" : " and ( " + withClause + " )" );
 		this.hasRestriction = hasRestriction;
 		this.enabledFilters = enabledFilters; // needed later for many-to-many/filter application
 	}
@@ -119,7 +120,7 @@ public final class OuterJoinableAssociation {
 	}
 
 	private boolean isOneToOne() {
-		if ( joinableType.isEntityType() )  {
+		if ( joinableType.isEntityType() ) {
 			EntityType etype = (EntityType) joinableType;
 			return etype.isOneToOne() /*&& etype.isReferenceToPrimaryKey()*/;
 		}
@@ -127,11 +128,11 @@ public final class OuterJoinableAssociation {
 			return false;
 		}
 	}
-	
+
 	public AssociationType getJoinableType() {
 		return joinableType;
 	}
-	
+
 	public String getRHSUniqueKeyName() {
 		return joinableType.getRHSUniqueKeyPropertyName();
 	}
@@ -150,7 +151,7 @@ public final class OuterJoinableAssociation {
 
 	public int getOwner(final List associations) {
 		if ( isOneToOne() || isCollection() ) {
-			return getPosition(lhsAlias, associations);
+			return getPosition( lhsAlias, associations );
 		}
 		else {
 			return -1;
@@ -177,29 +178,29 @@ public final class OuterJoinableAssociation {
 
 	public void addJoins(JoinFragment outerjoin) throws MappingException {
 		outerjoin.addJoin(
-			joinable.getTableName(),
-			rhsAlias,
-			lhsColumns,
-			rhsColumns,
-			joinType,
-			on
+				joinable.getTableName(),
+				rhsAlias,
+				lhsColumns,
+				rhsColumns,
+				joinType,
+				on
 		);
 		outerjoin.addJoins(
-			joinable.fromJoinFragment(rhsAlias, false, true),
-			joinable.whereJoinFragment(rhsAlias, false, true)
+				joinable.fromJoinFragment( rhsAlias, false, true ),
+				joinable.whereJoinFragment( rhsAlias, false, true )
 		);
 	}
 
 	public void validateJoin(String path) throws MappingException {
-		if ( rhsColumns==null || lhsColumns==null
-				|| lhsColumns.length!=rhsColumns.length || lhsColumns.length==0 ) {
-			throw new MappingException("invalid join columns for association: " + path);
+		if ( rhsColumns == null || lhsColumns == null
+				|| lhsColumns.length != rhsColumns.length || lhsColumns.length == 0 ) {
+			throw new MappingException( "invalid join columns for association: " + path );
 		}
 	}
 
 	public boolean isManyToManyWith(OuterJoinableAssociation other) {
 		if ( joinable.isCollection() ) {
-			QueryableCollection persister = ( QueryableCollection ) joinable;
+			QueryableCollection persister = (QueryableCollection) joinable;
 			if ( persister.isManyToMany() ) {
 				return persister.getElementType() == other.getJoinableType();
 			}
@@ -212,19 +213,19 @@ public final class OuterJoinableAssociation {
 		String condition = "".equals( manyToManyFilter )
 				? on
 				: "".equals( on )
-						? manyToManyFilter
-						: on + " and " + manyToManyFilter;
+				? manyToManyFilter
+				: on + " and " + manyToManyFilter;
 		outerjoin.addJoin(
-		        joinable.getTableName(),
-		        rhsAlias,
-		        lhsColumns,
-		        rhsColumns,
-		        joinType,
-		        condition
+				joinable.getTableName(),
+				rhsAlias,
+				lhsColumns,
+				rhsColumns,
+				joinType,
+				condition
 		);
 		outerjoin.addJoins(
-			joinable.fromJoinFragment(rhsAlias, false, true),
-			joinable.whereJoinFragment(rhsAlias, false, true)
+				joinable.fromJoinFragment( rhsAlias, false, true ),
+				joinable.whereJoinFragment( rhsAlias, false, true )
 		);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyJoinWalker.java
index 89203000a5..10676ec667 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyJoinWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyJoinWalker.java
@@ -20,7 +20,6 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.loader.collection;
 
@@ -43,23 +42,22 @@ import org.hibernate.sql.Select;
 /**
  * Walker for one-to-many associations
  *
- * @see OneToManyLoader
  * @author Gavin King
+ * @see OneToManyLoader
  */
 public class OneToManyJoinWalker extends CollectionJoinWalker {
 
 	private final QueryableCollection oneToManyPersister;
 
 	@Override
-    protected boolean isDuplicateAssociation(
-		final String foreignKeyTable,
-		final String[] foreignKeyColumns
-	) {
+	protected boolean isDuplicateAssociation(
+			final String foreignKeyTable,
+			final String[] foreignKeyColumns) {
 		//disable a join back to this same association
-		final boolean isSameJoin = oneToManyPersister.getTableName().equals(foreignKeyTable) &&
-			Arrays.equals( foreignKeyColumns, oneToManyPersister.getKeyColumnNames() );
+		final boolean isSameJoin = oneToManyPersister.getTableName().equals( foreignKeyTable ) &&
+				Arrays.equals( foreignKeyColumns, oneToManyPersister.getKeyColumnNames() );
 		return isSameJoin ||
-			super.isDuplicateAssociation(foreignKeyTable, foreignKeyColumns);
+				super.isDuplicateAssociation( foreignKeyTable, foreignKeyColumns );
 	}
 
 	public OneToManyJoinWalker(
@@ -75,21 +73,27 @@ public class OneToManyJoinWalker extends CollectionJoinWalker {
 		final OuterJoinLoadable elementPersister = (OuterJoinLoadable) oneToManyPersister.getElementPersister();
 		final String alias = generateRootAlias( oneToManyPersister.getRole() );
 
-		walkEntityTree(elementPersister, alias);
+		walkEntityTree( elementPersister, alias );
 
 		List allAssociations = new ArrayList();
-		allAssociations.addAll(associations);
-		allAssociations.add( OuterJoinableAssociation.createRoot( oneToManyPersister.getCollectionType(), alias, getFactory() ) );
-		initPersisters(allAssociations, LockMode.NONE);
-		initStatementString(elementPersister, alias, batchSize, subquery);
+		allAssociations.addAll( associations );
+		allAssociations.add(
+				OuterJoinableAssociation.createRoot(
+						oneToManyPersister.getCollectionType(),
+						alias,
+						getFactory()
+				)
+		);
+		initPersisters( allAssociations, LockMode.NONE );
+		initStatementString( elementPersister, alias, batchSize, subquery );
 	}
 
 	private void initStatementString(
-		final OuterJoinLoadable elementPersister,
-		final String alias,
-		final int batchSize,
-		final String subquery)
-	throws MappingException {
+			final OuterJoinLoadable elementPersister,
+			final String alias,
+			final int batchSize,
+			final String subquery)
+			throws MappingException {
 
 		final int joins = countEntityPersisters( associations );
 		suffixes = BasicLoader.generateSuffixes( joins + 1 );
@@ -102,30 +106,37 @@ public class OneToManyJoinWalker extends CollectionJoinWalker {
 				oneToManyPersister.getKeyColumnNames(),
 				subquery,
 				batchSize
-			);
+		);
 		String filter = oneToManyPersister.filterFragment( alias, getLoadQueryInfluencers().getEnabledFilters() );
 		whereString.insert( 0, StringHelper.moveAndToBeginning( filter ) );
 
-		JoinFragment ojf = mergeOuterJoins(associations);
+		JoinFragment ojf = mergeOuterJoins( associations );
 		Select select = new Select( getDialect() )
-			.setSelectClause(
-				oneToManyPersister.selectFragment(null, null, alias, suffixes[joins], collectionSuffixes[0], true) +
-				selectString(associations)
-			)
-			.setFromClause(
-				elementPersister.fromTableFragment(alias) +
-				elementPersister.fromJoinFragment(alias, true, true)
-			)
-			.setWhereClause( whereString.toString() )
-			.setOuterJoins(
-				ojf.toFromFragmentString(),
-				ojf.toWhereFragmentString() +
-				elementPersister.whereJoinFragment(alias, true, true)
-			);
+				.setSelectClause(
+						oneToManyPersister.selectFragment(
+								null,
+								null,
+								alias,
+								suffixes[joins],
+								collectionSuffixes[0],
+								true
+						) +
+								selectString( associations )
+				)
+				.setFromClause(
+						elementPersister.fromTableFragment( alias ) +
+								elementPersister.fromJoinFragment( alias, true, true )
+				)
+				.setWhereClause( whereString.toString() )
+				.setOuterJoins(
+						ojf.toFromFragmentString(),
+						ojf.toWhereFragmentString() +
+								elementPersister.whereJoinFragment( alias, true, true )
+				);
 
-		select.setOrderByClause( orderBy( associations, oneToManyPersister.getSQLOrderByString(alias) ) );
+		select.setOrderByClause( orderBy( associations, oneToManyPersister.getSQLOrderByString( alias ) ) );
 
-		if ( getFactory().getSettings().isCommentsEnabled() ) {
+		if ( getFactory().getSessionFactoryOptions().isCommentsEnabled() ) {
 			select.setComment( "load one-to-many " + oneToManyPersister.getRole() );
 		}
 
@@ -133,7 +144,7 @@ public class OneToManyJoinWalker extends CollectionJoinWalker {
 	}
 
 	@Override
-    public String toString() {
+	public String toString() {
 		return getClass().getName() + '(' + oneToManyPersister.getRole() + ')';
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaInfoProvider.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaInfoProvider.java
index 3590e849d9..15aa252ff7 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaInfoProvider.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaInfoProvider.java
@@ -20,7 +20,6 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.loader.criteria;
 
@@ -34,8 +33,11 @@ import org.hibernate.type.Type;
  */
 
 interface CriteriaInfoProvider {
-    String getName();
-    Serializable[] getSpaces();
-    PropertyMapping getPropertyMapping();
-    Type getType(String relativePath);
+	String getName();
+
+	Serializable[] getSpaces();
+
+	PropertyMapping getPropertyMapping();
+
+	Type getType(String relativePath);
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java
index 871cd3e122..30f0a17730 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java
@@ -23,6 +23,7 @@
  *
  */
 package org.hibernate.loader.criteria;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -50,8 +51,8 @@ import org.hibernate.type.Type;
 /**
  * A <tt>JoinWalker</tt> for <tt>Criteria</tt> queries.
  *
- * @see CriteriaLoader
  * @author Gavin King
+ * @see CriteriaLoader
  */
 public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 
@@ -83,10 +84,10 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 	}
 
 	public CriteriaJoinWalker(
-			final OuterJoinLoadable persister, 
+			final OuterJoinLoadable persister,
 			final CriteriaQueryTranslator translator,
-			final SessionFactoryImplementor factory, 
-			final CriteriaImpl criteria, 
+			final SessionFactoryImplementor factory,
+			final CriteriaImpl criteria,
 			final String rootEntityName,
 			final LoadQueryInfluencers loadQueryInfluencers) {
 		this( persister, translator, factory, criteria, rootEntityName, loadQueryInfluencers, null );
@@ -106,17 +107,17 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 
 		querySpaces = translator.getQuerySpaces();
 
-		if ( translator.hasProjection() ) {			
+		if ( translator.hasProjection() ) {
 			initProjection(
-					translator.getSelect(), 
-					translator.getWhereCondition(), 
+					translator.getSelect(),
+					translator.getWhereCondition(),
 					translator.getOrderBy(),
 					translator.getGroupBy(),
-					LockOptions.NONE  
-				);
+					LockOptions.NONE
+			);
 			resultTypes = translator.getProjectedTypes();
 			userAliases = translator.getProjectedAliases();
-			includeInResultRow = new boolean[ resultTypes.length ];
+			includeInResultRow = new boolean[resultTypes.length];
 			Arrays.fill( includeInResultRow, true );
 		}
 		else {
@@ -130,6 +131,7 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 			includeInResultRow = ArrayHelper.toBooleanArray( includeInResultRowList );
 		}
 	}
+
 	@Override
 	protected JoinType getJoinType(
 			OuterJoinLoadable persister,
@@ -158,7 +160,7 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 							if ( isDuplicateAssociation( lhsTable, lhsColumns, associationType ) ) {
 								resolvedJoinType = JoinType.NONE;
 							}
-							else if ( isTooDeep(currentDepth) || ( associationType.isCollectionType() && isTooManyCollections() ) ) {
+							else if ( isTooDeep( currentDepth ) || ( associationType.isCollectionType() && isTooManyCollections() ) ) {
 								resolvedJoinType = JoinType.NONE;
 							}
 							else {
@@ -196,7 +198,11 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 				}
 				else {
 					if ( fetchMode == FetchMode.JOIN ) {
-						isDuplicateAssociation( lhsTable, lhsColumns, associationType ); //deliberately ignore return value!
+						isDuplicateAssociation(
+								lhsTable,
+								lhsColumns,
+								associationType
+						); //deliberately ignore return value!
 						resolvedJoinType = getJoinType( nullable, currentDepth );
 					}
 					else {
@@ -207,6 +213,7 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 		}
 		return resolvedJoinType;
 	}
+
 	@Override
 	protected JoinType getJoinType(
 			AssociationType associationType,
@@ -232,7 +239,7 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 	}
 
 	private static boolean isDefaultFetchMode(FetchMode fetchMode) {
-		return fetchMode==null || fetchMode==FetchMode.DEFAULT;
+		return fetchMode == null || fetchMode == FetchMode.DEFAULT;
 	}
 
 	/**
@@ -242,8 +249,12 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 	@Override
 	protected String getWhereFragment() throws MappingException {
 		return super.getWhereFragment() +
-			( (Queryable) getPersister() ).filterFragment( getAlias(), getLoadQueryInfluencers().getEnabledFilters() );
+				( (Queryable) getPersister() ).filterFragment(
+						getAlias(),
+						getLoadQueryInfluencers().getEnabledFilters()
+				);
 	}
+
 	@Override
 	protected String generateTableAlias(int n, PropertyPath path, Joinable joinable) {
 		// TODO: deal with side-effects (changes to includeInResultRowList, userAliasList, resultTypeList)!!!
@@ -259,22 +270,22 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 
 		if ( !checkForSqlAlias && joinable.isCollection() ) {
 			// is it a collection-of-other (component or value) ?
-			CollectionPersister collectionPersister = (CollectionPersister)joinable;
+			CollectionPersister collectionPersister = (CollectionPersister) joinable;
 			Type elementType = collectionPersister.getElementType();
 			if ( elementType.isComponentType() || !elementType.isEntityType() ) {
 				checkForSqlAlias = true;
- 			}
+			}
 		}
 
 		String sqlAlias = null;
 
 		if ( checkForSqlAlias ) {
 			final Criteria subcriteria = translator.getCriteria( path.getFullPath() );
-			sqlAlias = subcriteria==null ? null : translator.getSQLAlias(subcriteria);
-			
-			if (joinable.consumesEntityAlias() && ! translator.hasProjection()) {
+			sqlAlias = subcriteria == null ? null : translator.getSQLAlias( subcriteria );
+
+			if ( joinable.consumesEntityAlias() && !translator.hasProjection() ) {
 				includeInResultRowList.add( subcriteria != null && subcriteria.getAlias() != null );
-				if (sqlAlias!=null) {
+				if ( sqlAlias != null ) {
 					if ( subcriteria.getAlias() != null ) {
 						userAliasList.add( subcriteria.getAlias() );
 						resultTypeList.add( translator.getResultType( subcriteria ) );
@@ -283,12 +294,13 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 			}
 		}
 
-		if (sqlAlias == null) {
+		if ( sqlAlias == null ) {
 			sqlAlias = super.generateTableAlias( n + translator.getSQLAliasCount(), path, joinable );
 		}
 
 		return sqlAlias;
 	}
+
 	@Override
 	protected String generateRootAlias(String tableName) {
 		return CriteriaQueryTranslator.ROOT_SQL_ALIAS;
@@ -297,16 +309,19 @@ public class CriteriaJoinWalker extends AbstractEntityJoinWalker {
 	public Set getQuerySpaces() {
 		return querySpaces;
 	}
+
 	@Override
 	public String getComment() {
 		return "criteria query";
 	}
+
 	@Override
 	protected String getWithClause(PropertyPath path) {
 		return translator.getWithClause( path.getFullPath() );
 	}
+
 	@Override
-	protected boolean hasRestriction(PropertyPath path)	{
+	protected boolean hasRestriction(PropertyPath path) {
 		return translator.hasRestriction( path.getFullPath() );
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java
index 01f3235bf6..b65d249f66 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java
+++ b/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;
@@ -78,33 +79,33 @@ public class CriteriaLoader extends OuterJoinLoader {
 	private final int resultRowLength;
 
 	public CriteriaLoader(
-			final OuterJoinLoadable persister, 
-			final SessionFactoryImplementor factory, 
-			final CriteriaImpl criteria, 
+			final OuterJoinLoadable persister,
+			final SessionFactoryImplementor factory,
+			final CriteriaImpl criteria,
 			final String rootEntityName,
 			final LoadQueryInfluencers loadQueryInfluencers) throws HibernateException {
 		super( factory, loadQueryInfluencers );
 
 		translator = new CriteriaQueryTranslator(
-				factory, 
-				criteria, 
-				rootEntityName, 
+				factory,
+				criteria,
+				rootEntityName,
 				CriteriaQueryTranslator.ROOT_SQL_ALIAS
-			);
+		);
 
 		querySpaces = translator.getQuerySpaces();
-		
-		CriteriaJoinWalker walker = new CriteriaJoinWalker(
-				persister, 
-				translator,
-				factory, 
-				criteria, 
-				rootEntityName, 
-				loadQueryInfluencers
-			);
 
-		initFromWalker(walker);
-		
+		CriteriaJoinWalker walker = new CriteriaJoinWalker(
+				persister,
+				translator,
+				factory,
+				criteria,
+				rootEntityName,
+				loadQueryInfluencers
+		);
+
+		initFromWalker( walker );
+
 		userAliases = walker.getUserAliases();
 		resultTypes = walker.getResultTypes();
 		includeInResultRow = walker.includeInResultRow();
@@ -113,43 +114,53 @@ public class CriteriaLoader extends OuterJoinLoader {
 		postInstantiate();
 
 	}
-	
-	public ScrollableResults scroll(SessionImplementor session, ScrollMode scrollMode) 
-	throws HibernateException {
+
+	public ScrollableResults scroll(SessionImplementor session, ScrollMode scrollMode)
+			throws HibernateException {
 		QueryParameters qp = translator.getQueryParameters();
-		qp.setScrollMode(scrollMode);
-		return scroll(qp, resultTypes, null, session);
+		qp.setScrollMode( scrollMode );
+		return scroll( qp, resultTypes, null, session );
 	}
 
-	public List list(SessionImplementor session) 
-	throws HibernateException {
+	public List list(SessionImplementor session)
+			throws HibernateException {
 		return list( session, translator.getQueryParameters(), querySpaces, resultTypes );
 
 	}
+
 	@Override
 	protected String[] getResultRowAliases() {
 		return userAliases;
 	}
+
 	@Override
 	protected ResultTransformer resolveResultTransformer(ResultTransformer resultTransformer) {
 		return translator.getRootCriteria().getResultTransformer();
 	}
+
 	@Override
 	protected boolean areResultSetRowsTransformedImmediately() {
 		return true;
 	}
+
 	@Override
 	protected boolean[] includeInResultRow() {
 		return includeInResultRow;
 	}
+
 	@Override
-	protected Object getResultColumnOrRow(Object[] row, ResultTransformer transformer, ResultSet rs, SessionImplementor session)
-	throws SQLException, HibernateException {
+	protected Object getResultColumnOrRow(
+			Object[] row,
+			ResultTransformer transformer,
+			ResultSet rs,
+			SessionImplementor session)
+			throws SQLException, HibernateException {
 		return resolveResultTransformer( transformer ).transformTuple(
-				getResultRow( row, rs, session),
+				getResultRow( row, rs, session ),
 				getResultRowAliases()
 		);
 	}
+
 	@Override
 	protected Object[] getResultRow(Object[] row, ResultSet rs, SessionImplementor session)
 			throws SQLException, HibernateException {
@@ -158,14 +169,14 @@ public class CriteriaLoader extends OuterJoinLoader {
 			Type[] types = translator.getProjectedTypes();
 			result = new Object[types.length];
 			String[] columnAliases = translator.getProjectedColumnAliases();
-			for ( int i=0, pos=0; i<result.length; i++ ) {
+			for ( int i = 0, pos = 0; i < result.length; i++ ) {
 				int numColumns = types[i].getColumnSpan( session.getFactory() );
 				if ( numColumns > 1 ) {
-			    	String[] typeColumnAliases = ArrayHelper.slice( columnAliases, pos, numColumns );
-					result[i] = types[i].nullSafeGet(rs, typeColumnAliases, session, null);
+					String[] typeColumnAliases = ArrayHelper.slice( columnAliases, pos, numColumns );
+					result[i] = types[i].nullSafeGet( rs, typeColumnAliases, session, null );
 				}
 				else {
-					result[i] = types[i].nullSafeGet(rs, columnAliases[pos], session, null);
+					result[i] = types[i].nullSafeGet( rs, columnAliases[pos], session, null );
 				}
 				pos += numColumns;
 			}
@@ -181,7 +192,7 @@ public class CriteriaLoader extends OuterJoinLoader {
 			return row;
 		}
 		else {
-			Object[] result = new Object[ resultRowLength ];
+			Object[] result = new Object[resultRowLength];
 			int j = 0;
 			for ( int i = 0; i < row.length; i++ ) {
 				if ( includeInResultRow[i] ) {
@@ -205,16 +216,16 @@ public class CriteriaLoader extends OuterJoinLoader {
 		final LockOptions lockOptions = parameters.getLockOptions();
 
 		if ( lockOptions == null ||
-				(lockOptions.getLockMode() == LockMode.NONE && (lockOptions.getAliasLockCount() == 0
-						|| (lockOptions.getAliasLockCount() == 1 && lockOptions
-						.getAliasSpecificLockMode( "this_" ) == LockMode.NONE)
-				)) ) {
+				( lockOptions.getLockMode() == LockMode.NONE && ( lockOptions.getAliasLockCount() == 0
+						|| ( lockOptions.getAliasLockCount() == 1 && lockOptions
+						.getAliasSpecificLockMode( "this_" ) == LockMode.NONE )
+				) ) ) {
 			return sql;
 		}
 
 		if ( dialect.useFollowOnLocking() ) {
-            final LockMode lockMode = determineFollowOnLockMode( lockOptions );
-            if( lockMode != LockMode.UPGRADE_SKIPLOCKED ) {
+			final LockMode lockMode = determineFollowOnLockMode( lockOptions );
+			if ( lockMode != LockMode.UPGRADE_SKIPLOCKED ) {
 				// Dialect prefers to perform locking in a separate step
 				LOG.usingFollowOnLocking();
 
@@ -224,27 +235,27 @@ public class CriteriaLoader extends OuterJoinLoader {
 
 				afterLoadActions.add(
 						new AfterLoadAction() {
-								@Override
-								public void afterLoad(SessionImplementor session, Object entity, Loadable persister) {
-									( (Session) session ).buildLockRequest( lockOptionsToUse )
+							@Override
+							public void afterLoad(SessionImplementor session, Object entity, Loadable persister) {
+								( (Session) session ).buildLockRequest( lockOptionsToUse )
 										.lock( persister.getEntityName(), entity );
-								}
-				        }
+							}
+						}
 				);
 				parameters.setLockOptions( new LockOptions() );
 				return sql;
 			}
 		}
-		final LockOptions locks = new LockOptions(lockOptions.getLockMode());
-		locks.setScope( lockOptions.getScope());
-		locks.setTimeOut( lockOptions.getTimeOut());
+		final LockOptions locks = new LockOptions( lockOptions.getLockMode() );
+		locks.setScope( lockOptions.getScope() );
+		locks.setTimeOut( lockOptions.getTimeOut() );
 
 		final Map keyColumnNames = dialect.forUpdateOfColumns() ? new HashMap() : null;
 		final String[] drivingSqlAliases = getAliases();
 		for ( int i = 0; i < drivingSqlAliases.length; i++ ) {
 			final LockMode lockMode = lockOptions.getAliasSpecificLockMode( drivingSqlAliases[i] );
 			if ( lockMode != null ) {
-				final Lockable drivingPersister = ( Lockable ) getEntityPersisters()[i];
+				final Lockable drivingPersister = (Lockable) getEntityPersisters()[i];
 				final String rootSqlAlias = drivingPersister.getRootTableAlias( drivingSqlAliases[i] );
 				locks.setAliasSpecificLockMode( rootSqlAlias, lockMode );
 				if ( keyColumnNames != null ) {
@@ -267,6 +278,7 @@ public class CriteriaLoader extends OuterJoinLoader {
 
 		return lockModeToUse;
 	}
+
 	@Override
 	protected LockMode[] getLockModes(LockOptions lockOptions) {
 		final String[] entityAliases = getAliases();
@@ -275,23 +287,26 @@ public class CriteriaLoader extends OuterJoinLoader {
 		}
 		final int size = entityAliases.length;
 		LockMode[] lockModesArray = new LockMode[size];
-		for ( int i=0; i<size; i++ ) {
+		for ( int i = 0; i < size; i++ ) {
 			LockMode lockMode = lockOptions.getAliasSpecificLockMode( entityAliases[i] );
-			lockModesArray[i] = lockMode==null ? lockOptions.getLockMode() : lockMode;
+			lockModesArray[i] = lockMode == null ? lockOptions.getLockMode() : lockMode;
 		}
 		return lockModesArray;
 	}
+
 	@Override
 	protected boolean isSubselectLoadingEnabled() {
 		return hasSubselectLoadableCollections();
 	}
+
 	@Override
 	protected List getResultList(List results, ResultTransformer resultTransformer) {
 		return resolveResultTransformer( resultTransformer ).transformList( results );
 	}
+
 	@Override
-	protected String getQueryIdentifier() { 
-		return "[CRITERIA] " + getSQLString(); 
+	protected String getQueryIdentifier() {
+		return "[CRITERIA] " + getSQLString();
 	}
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java
index 0e1f6a0610..75bfa18a71 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java
@@ -81,37 +81,38 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 	private final Map<Criteria, String> criteriaSQLAliasMap = new HashMap<Criteria, String>();
 	private final Map<String, Criteria> aliasCriteriaMap = new HashMap<String, Criteria>();
 	private final Map<String, Criteria> associationPathCriteriaMap = new LinkedHashMap<String, Criteria>();
-	private final Map<String, JoinType> associationPathJoinTypesMap = new LinkedHashMap<String,JoinType>();
+	private final Map<String, JoinType> associationPathJoinTypesMap = new LinkedHashMap<String, JoinType>();
 	private final Map<String, Criterion> withClauseMap = new HashMap<String, Criterion>();
-	
+
 	private final SessionFactoryImplementor sessionFactory;
 	private final SessionFactoryHelper helper;
 
 	public CriteriaQueryTranslator(
 			final SessionFactoryImplementor factory,
-	        final CriteriaImpl criteria,
-	        final String rootEntityName,
-	        final String rootSQLAlias,
-	        CriteriaQuery outerQuery) throws HibernateException {
+			final CriteriaImpl criteria,
+			final String rootEntityName,
+			final String rootSQLAlias,
+			CriteriaQuery outerQuery) throws HibernateException {
 		this( factory, criteria, rootEntityName, rootSQLAlias );
 		outerQueryTranslator = outerQuery;
 	}
 
 	public CriteriaQueryTranslator(
 			final SessionFactoryImplementor factory,
-	        final CriteriaImpl criteria,
-	        final String rootEntityName,
-	        final String rootSQLAlias) throws HibernateException {
+			final CriteriaImpl criteria,
+			final String rootEntityName,
+			final String rootSQLAlias) throws HibernateException {
 		this.rootCriteria = criteria;
 		this.rootEntityName = rootEntityName;
 		this.sessionFactory = factory;
 		this.rootSQLAlias = rootSQLAlias;
-		this.helper = new SessionFactoryHelper(factory);
+		this.helper = new SessionFactoryHelper( factory );
 		createAliasCriteriaMap();
 		createAssociationPathCriteriaMap();
 		createCriteriaEntityNameMap();
 		createCriteriaSQLAliasMap();
 	}
+
 	@Override
 	public String generateSQLAlias() {
 		int aliasCount = 0;
@@ -212,7 +213,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 		}
 		else {
 			// otherwise, recurse
-			return getWholeAssociationPath( ( CriteriaImpl.Subcriteria ) parent ) + '.' + path;
+			return getWholeAssociationPath( (CriteriaImpl.Subcriteria) parent ) + '.' + path;
 		}
 	}
 
@@ -221,7 +222,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 		final CriteriaInfoProvider rootProvider = new EntityCriteriaInfoProvider(
 				(Queryable) sessionFactory.getEntityPersister( rootEntityName )
 		);
-		criteriaInfoMap.put( rootCriteria, rootProvider);
+		criteriaInfoMap.put( rootCriteria, rootProvider );
 		nameCriteriaInfoMap.put( rootProvider.getName(), rootProvider );
 
 		for ( final String key : associationPathCriteriaMap.keySet() ) {
@@ -246,11 +247,11 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 			if ( type.isAssociationType() ) {
 				// CollectionTypes are always also AssociationTypes - but there's not always an associated entity...
 				final AssociationType atype = (AssociationType) type;
-				final CollectionType ctype = type.isCollectionType() ? (CollectionType)type : null;
-				final Type elementType = (ctype != null) ? ctype.getElementType( sessionFactory ) : null;
+				final CollectionType ctype = type.isCollectionType() ? (CollectionType) type : null;
+				final Type elementType = ( ctype != null ) ? ctype.getElementType( sessionFactory ) : null;
 				// is the association a collection of components or value-types? (i.e a colloction of valued types?)
-				if ( ctype != null  && elementType.isComponentType() ) {
-					provider = new ComponentCollectionCriteriaInfoProvider( helper.getCollectionPersister(ctype.getRole()) );
+				if ( ctype != null && elementType.isComponentType() ) {
+					provider = new ComponentCollectionCriteriaInfoProvider( helper.getCollectionPersister( ctype.getRole() ) );
 				}
 				else if ( ctype != null && !elementType.isEntityType() ) {
 					provider = new ScalarCollectionCriteriaInfoProvider( helper, ctype.getRole() );
@@ -260,11 +261,11 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 							(Queryable) sessionFactory.getEntityPersister( atype.getAssociatedEntityName( sessionFactory ) )
 					);
 				}
-				
+
 				componentPath = "";
 			}
 			else if ( type.isComponentType() ) {
-				if (!tokens.hasMoreTokens()) {
+				if ( !tokens.hasMoreTokens() ) {
 					throw new QueryException(
 							"Criteria objects cannot be created directly on components.  Create a criteria on " +
 									"owning entity and use a dotted property to access component property: " + path
@@ -278,7 +279,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 				throw new QueryException( "not an association: " + componentPath );
 			}
 		}
-		
+
 		return provider;
 	}
 
@@ -288,7 +289,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 
 	private void createCriteriaSQLAliasMap() {
 		int i = 0;
-		for(final Criteria crit : criteriaInfoMap.keySet()){
+		for ( final Criteria crit : criteriaInfoMap.keySet() ) {
 			final CriteriaInfoProvider value = criteriaInfoMap.get( crit );
 			String alias = crit.getAlias();
 			if ( alias == null ) {
@@ -354,17 +355,17 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 		final Type[] typeArray = ArrayHelper.toTypeArray( types );
 		return new QueryParameters(
 				typeArray,
-		        valueArray,
-		        lockOptions,
-		        selection,
-		        rootCriteria.isReadOnlyInitialized(),
-		        ( rootCriteria.isReadOnlyInitialized() && rootCriteria.isReadOnly() ),
-		        rootCriteria.getCacheable(),
-		        rootCriteria.getCacheRegion(),
-		        rootCriteria.getComment(),
-		        rootCriteria.getQueryHints(),
-		        rootCriteria.isLookupByNaturalKey(),
-		        rootCriteria.getResultTransformer()
+				valueArray,
+				lockOptions,
+				selection,
+				rootCriteria.isReadOnlyInitialized(),
+				( rootCriteria.isReadOnlyInitialized() && rootCriteria.isReadOnly() ),
+				rootCriteria.getCacheable(),
+				rootCriteria.getCacheRegion(),
+				rootCriteria.getComment(),
+				rootCriteria.getQueryHints(),
+				rootCriteria.isLookupByNaturalKey(),
+				rootCriteria.getResultTransformer()
 		);
 	}
 
@@ -385,8 +386,8 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 	public String getSelect() {
 		return rootCriteria.getProjection().toSqlString(
 				rootCriteria.getProjectionCriteria(),
-		        0,
-		        this
+				0,
+				this
 		);
 	}
 
@@ -401,7 +402,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 
 	public String[] getProjectedColumnAliases() {
 		return rootCriteria.getProjection() instanceof EnhancedProjection ?
-				( ( EnhancedProjection ) rootCriteria.getProjection() ).getColumnAliases( 0, rootCriteria, this ) :
+				( (EnhancedProjection) rootCriteria.getProjection() ).getColumnAliases( 0, rootCriteria, this ) :
 				rootCriteria.getProjection().getColumnAliases( 0 );
 	}
 
@@ -435,19 +436,23 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 		}
 		return orderBy.toString();
 	}
+
 	@Override
 	public SessionFactoryImplementor getFactory() {
 		return sessionFactory;
 	}
+
 	@Override
 	public String getSQLAlias(Criteria criteria) {
 		return criteriaSQLAliasMap.get( criteria );
 	}
+
 	@Override
 	public String getEntityName(Criteria criteria) {
 		final CriteriaInfoProvider infoProvider = criteriaInfoMap.get( criteria );
 		return infoProvider != null ? infoProvider.getName() : null;
 	}
+
 	@Override
 	public String getColumn(Criteria criteria, String propertyName) {
 		String[] cols = getColumns( propertyName, criteria );
@@ -464,14 +469,14 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 	@Override
 	public String[] getColumnsUsingProjection(
 			Criteria subcriteria,
-	        String propertyName) throws HibernateException {
+			String propertyName) throws HibernateException {
 
 		//first look for a reference to a projection alias
 		final Projection projection = rootCriteria.getProjection();
 		String[] projectionColumns = null;
 		if ( projection != null ) {
 			projectionColumns = ( projection instanceof EnhancedProjection ?
-					( ( EnhancedProjection ) projection ).getColumnAliases( propertyName, 0, rootCriteria, this ) :
+					( (EnhancedProjection) projection ).getColumnAliases( propertyName, 0, rootCriteria, this ) :
 					projection.getColumnAliases( propertyName, 0 )
 			);
 		}
@@ -481,7 +486,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 			try {
 				return getColumns( propertyName, subcriteria );
 			}
-			catch ( HibernateException he ) {
+			catch (HibernateException he) {
 				//not found in inner query , try the outer query
 				if ( outerQueryTranslator != null ) {
 					return outerQueryTranslator.getColumnsUsingProjection( subcriteria, propertyName );
@@ -496,29 +501,33 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 			return projectionColumns;
 		}
 	}
+
 	@Override
 	public String[] getIdentifierColumns(Criteria criteria) {
 		String[] idcols =
-				( ( Loadable ) getPropertyMapping( getEntityName( criteria ) ) ).getIdentifierColumnNames();
+				( (Loadable) getPropertyMapping( getEntityName( criteria ) ) ).getIdentifierColumnNames();
 		return StringHelper.qualify( getSQLAlias( criteria ), idcols );
 	}
+
 	@Override
 	public Type getIdentifierType(Criteria criteria) {
-		return ( ( Loadable ) getPropertyMapping( getEntityName( criteria ) ) ).getIdentifierType();
+		return ( (Loadable) getPropertyMapping( getEntityName( criteria ) ) ).getIdentifierType();
 	}
+
 	@Override
 	public TypedValue getTypedIdentifierValue(Criteria criteria, Object value) {
-		final Loadable loadable = ( Loadable ) getPropertyMapping( getEntityName( criteria ) );
+		final Loadable loadable = (Loadable) getPropertyMapping( getEntityName( criteria ) );
 		return new TypedValue( loadable.getIdentifierType(), value );
 	}
+
 	@Override
 	public String[] getColumns(
 			String propertyName,
-	        Criteria subcriteria) throws HibernateException {
+			Criteria subcriteria) throws HibernateException {
 		return getPropertyMapping( getEntityName( subcriteria, propertyName ) )
 				.toColumns(
 						getSQLAlias( subcriteria, propertyName ),
-				        getPropertyName( propertyName )
+						getPropertyName( propertyName )
 				);
 	}
 
@@ -528,12 +537,12 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 	 * Projection aliases are ignored.
 	 */
 	@Override
-	public String[] findColumns(String propertyName, Criteria subcriteria )
-	throws HibernateException {
+	public String[] findColumns(String propertyName, Criteria subcriteria)
+			throws HibernateException {
 		try {
 			return getColumns( propertyName, subcriteria );
 		}
-		catch ( HibernateException he ) {
+		catch (HibernateException he) {
 			//not found in inner query, try the outer query
 			if ( outerQueryTranslator != null ) {
 				return outerQueryTranslator.findColumns( propertyName, subcriteria );
@@ -543,6 +552,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 			}
 		}
 	}
+
 	@Override
 	public Type getTypeUsingProjection(Criteria subcriteria, String propertyName)
 			throws HibernateException {
@@ -550,8 +560,8 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 		//first look for a reference to a projection alias
 		final Projection projection = rootCriteria.getProjection();
 		Type[] projectionTypes = projection == null ?
-		                         null :
-		                         projection.getTypes( propertyName, subcriteria, this );
+				null :
+				projection.getTypes( propertyName, subcriteria, this );
 
 		if ( projectionTypes == null ) {
 			try {
@@ -559,7 +569,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 				//look for a property
 				return getType( subcriteria, propertyName );
 			}
-			catch ( HibernateException he ) {
+			catch (HibernateException he) {
 				//not found in inner query , try the outer query
 				if ( outerQueryTranslator != null ) {
 					return outerQueryTranslator.getType( subcriteria, propertyName );
@@ -577,6 +587,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 			return projectionTypes[0];
 		}
 	}
+
 	@Override
 	public Type getType(Criteria subcriteria, String propertyName)
 			throws HibernateException {
@@ -603,7 +614,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 					// remove the single quotes
 					stringValue = stringValue.substring( 1, stringValue.length() - 1 );
 				}
-				
+
 				// Convert the string value into the proper type.
 				if ( type instanceof StringRepresentableType ) {
 					final StringRepresentableType nullableType = (StringRepresentableType) type;
@@ -639,6 +650,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 		}
 		return getEntityName( subcriteria );
 	}
+
 	@Override
 	public String getSQLAlias(Criteria criteria, String propertyName) {
 		if ( propertyName.indexOf( '.' ) > 0 ) {
@@ -650,6 +662,7 @@ public class CriteriaQueryTranslator implements CriteriaQuery {
 		}
 		return getSQLAlias( criteria );
 	}
+
 	@Override
 	public String getPropertyName(String propertyName) {
 		if ( propertyName.indexOf( '.' ) > 0 ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java
index 21cfeab08f..01b2b1aa41 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java
@@ -20,9 +20,9 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.loader.custom;
+
 import org.hibernate.LockMode;
 import org.hibernate.loader.CollectionAliases;
 import org.hibernate.loader.EntityAliases;
@@ -41,7 +41,7 @@ public class CollectionFetchReturn extends FetchReturn {
 			NonScalarReturn owner,
 			String ownerProperty,
 			CollectionAliases collectionAliases,
-	        EntityAliases elementEntityAliases,
+			EntityAliases elementEntityAliases,
 			LockMode lockMode) {
 		super( owner, ownerProperty, alias, lockMode );
 		this.collectionAliases = collectionAliases;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionReturn.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionReturn.java
index ce7b61da38..eb8799b6d5 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionReturn.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionReturn.java
@@ -20,9 +20,9 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
-package org.hibernate.loader.custom;
+package org.hibernate.loader.custom;
+
 import org.hibernate.LockMode;
 import org.hibernate.loader.CollectionAliases;
 import org.hibernate.loader.EntityAliases;
@@ -46,7 +46,7 @@ public class CollectionReturn extends NonScalarReturn {
 			String ownerEntityName,
 			String ownerProperty,
 			CollectionAliases collectionAliases,
-	        EntityAliases elementEntityAliases,
+			EntityAliases elementEntityAliases,
 			LockMode lockMode) {
 		super( alias, lockMode );
 		this.ownerEntityName = ownerEntityName;
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java
index 046bbd2fe7..0ee42b0b68 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java
@@ -20,7 +20,6 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.loader.custom;
 
@@ -35,7 +34,6 @@ import org.hibernate.persister.collection.SQLLoadableCollection;
  * Aliases can still be overwritten via <return-property>
  *
  * @author Max Rydahl Andersen
- *
  */
 public class ColumnCollectionAliases implements CollectionAliases {
 	private final String[] keyAliases;
@@ -51,20 +49,22 @@ public class ColumnCollectionAliases implements CollectionAliases {
 		this.keyAliases = getUserProvidedAliases(
 				"key",
 				persister.getKeyColumnNames()
-			);
+		);
 
 		this.indexAliases = getUserProvidedAliases(
 				"index",
 				persister.getIndexColumnNames()
-				);
+		);
 
-		this.elementAliases = getUserProvidedAliases( "element",
+		this.elementAliases = getUserProvidedAliases(
+				"element",
 				persister.getElementColumnNames()
-				);
+		);
 
-		this.identifierAlias = getUserProvidedAlias( "id",
+		this.identifierAlias = getUserProvidedAlias(
+				"id",
 				persister.getIdentifierColumnName()
-				);
+		);
 
 	}
 
@@ -116,22 +116,24 @@ public class ColumnCollectionAliases implements CollectionAliases {
 	}
 
 	@Override
-    public String toString() {
+	public String toString() {
 		return super.toString() + " [ suffixedKeyAliases=[" + join( keyAliases ) +
-		        "], suffixedIndexAliases=[" + join( indexAliases ) +
-		        "], suffixedElementAliases=[" + join( elementAliases ) +
-		        "], suffixedIdentifierAlias=[" + identifierAlias + "]]";
+				"], suffixedIndexAliases=[" + join( indexAliases ) +
+				"], suffixedElementAliases=[" + join( elementAliases ) +
+				"], suffixedIdentifierAlias=[" + identifierAlias + "]]";
 	}
 
 	private String join(String[] aliases) {
-		if ( aliases == null) return null;
+		if ( aliases == null ) {
+			return null;
+		}
 
 		return StringHelper.join( ", ", aliases );
 	}
 
 	private String[] getUserProvidedAliases(String propertyPath, String[] defaultAliases) {
-		String[] result = (String[]) userProvidedAliases.get(propertyPath);
-		if (result==null) {
+		String[] result = (String[]) userProvidedAliases.get( propertyPath );
+		if ( result == null ) {
 			return defaultAliases;
 		}
 		else {
@@ -140,8 +142,8 @@ public class ColumnCollectionAliases implements CollectionAliases {
 	}
 
 	private String getUserProvidedAlias(String propertyPath, String defaultAlias) {
-		String[] columns = (String[]) userProvidedAliases.get(propertyPath);
-		if (columns==null) {
+		String[] columns = (String[]) userProvidedAliases.get( propertyPath );
+		if ( columns == null ) {
 			return defaultAlias;
 		}
 		else {
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
index 8e85de6033..36e362d7af 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java
@@ -87,7 +87,7 @@ public class CustomLoader extends Loader {
 
 	private boolean[] includeInResultRow;
 
-//	private final String[] sqlAliases;
+	//	private final String[] sqlAliases;
 //	private final String[] sqlAliasSuffixes;
 	private final ResultRowProcessor rowProcessor;
 
@@ -161,7 +161,7 @@ public class CustomLoader extends Loader {
 				RootReturn rootRtn = (RootReturn) rtn;
 				Queryable persister = (Queryable) factory.getEntityPersister( rootRtn.getEntityName() );
 				entityPersisters.add( persister );
-				lockModes.add( (rootRtn.getLockMode()) );
+				lockModes.add( ( rootRtn.getLockMode() ) );
 				resultColumnProcessors.add( new NonScalarResultColumnProcessor( returnableCounter++ ) );
 				nonScalarReturnList.add( rtn );
 				entityOwners.add( -1 );
@@ -186,7 +186,7 @@ public class CustomLoader extends Loader {
 				// determine if the collection elements are entities...
 				Type elementType = persister.getElementType();
 				if ( elementType.isEntityType() ) {
-					Queryable elementPersister = (Queryable) ((EntityType) elementType).getAssociatedJoinable( factory );
+					Queryable elementPersister = (Queryable) ( (EntityType) elementType ).getAssociatedJoinable( factory );
 					entityPersisters.add( elementPersister );
 					entityOwners.add( -1 );
 					entityAliases.add( collRtn.getElementEntityAliases() );
@@ -227,7 +227,7 @@ public class CustomLoader extends Loader {
 				// determine if the collection elements are entities...
 				Type elementType = persister.getElementType();
 				if ( elementType.isEntityType() ) {
-					Queryable elementPersister = (Queryable) ((EntityType) elementType).getAssociatedJoinable( factory );
+					Queryable elementPersister = (Queryable) ( (EntityType) elementType ).getAssociatedJoinable( factory );
 					entityPersisters.add( elementPersister );
 					entityOwners.add( ownerIndex );
 					entityAliases.add( fetchRtn.getElementEntityAliases() );
@@ -240,27 +240,27 @@ public class CustomLoader extends Loader {
 			}
 		}
 
-		this.entityPersisters = new Queryable[ entityPersisters.size() ];
+		this.entityPersisters = new Queryable[entityPersisters.size()];
 		for ( int i = 0; i < entityPersisters.size(); i++ ) {
 			this.entityPersisters[i] = entityPersisters.get( i );
 		}
 		this.entiytOwners = ArrayHelper.toIntArray( entityOwners );
-		this.entityAliases = new EntityAliases[ entityAliases.size() ];
+		this.entityAliases = new EntityAliases[entityAliases.size()];
 		for ( int i = 0; i < entityAliases.size(); i++ ) {
 			this.entityAliases[i] = entityAliases.get( i );
 		}
 
-		this.collectionPersisters = new QueryableCollection[ collectionPersisters.size() ];
+		this.collectionPersisters = new QueryableCollection[collectionPersisters.size()];
 		for ( int i = 0; i < collectionPersisters.size(); i++ ) {
 			this.collectionPersisters[i] = collectionPersisters.get( i );
 		}
 		this.collectionOwners = ArrayHelper.toIntArray( collectionOwners );
-		this.collectionAliases = new CollectionAliases[ collectionAliases.size() ];
+		this.collectionAliases = new CollectionAliases[collectionAliases.size()];
 		for ( int i = 0; i < collectionAliases.size(); i++ ) {
 			this.collectionAliases[i] = collectionAliases.get( i );
 		}
 
-		this.lockModes = new LockMode[ lockModes.size() ];
+		this.lockModes = new LockMode[lockModes.size()];
 		for ( int i = 0; i < lockModes.size(); i++ ) {
 			this.lockModes[i] = lockModes.get( i );
 		}
@@ -270,7 +270,7 @@ public class CustomLoader extends Loader {
 
 		this.rowProcessor = new ResultRowProcessor(
 				hasScalars,
-				resultColumnProcessors.toArray( new ResultColumnProcessor[ resultColumnProcessors.size() ] )
+				resultColumnProcessors.toArray( new ResultColumnProcessor[resultColumnProcessors.size()] )
 		);
 
 		this.includeInResultRow = ArrayHelper.toBooleanArray( includeInResultRowList );
@@ -279,26 +279,26 @@ public class CustomLoader extends Loader {
 	private Queryable determineAppropriateOwnerPersister(NonScalarReturn ownerDescriptor) {
 		String entityName = null;
 		if ( ownerDescriptor instanceof RootReturn ) {
-			entityName = ( ( RootReturn ) ownerDescriptor ).getEntityName();
+			entityName = ( (RootReturn) ownerDescriptor ).getEntityName();
 		}
 		else if ( ownerDescriptor instanceof CollectionReturn ) {
-			CollectionReturn collRtn = ( CollectionReturn ) ownerDescriptor;
+			CollectionReturn collRtn = (CollectionReturn) ownerDescriptor;
 			String role = collRtn.getOwnerEntityName() + "." + collRtn.getOwnerProperty();
 			CollectionPersister persister = getFactory().getCollectionPersister( role );
-			EntityType ownerType = ( EntityType ) persister.getElementType();
+			EntityType ownerType = (EntityType) persister.getElementType();
 			entityName = ownerType.getAssociatedEntityName( getFactory() );
 		}
 		else if ( ownerDescriptor instanceof FetchReturn ) {
-			FetchReturn fetchRtn = ( FetchReturn ) ownerDescriptor;
+			FetchReturn fetchRtn = (FetchReturn) ownerDescriptor;
 			Queryable persister = determineAppropriateOwnerPersister( fetchRtn.getOwner() );
 			Type ownerType = persister.getPropertyType( fetchRtn.getOwnerProperty() );
 			if ( ownerType.isEntityType() ) {
-				entityName = ( ( EntityType ) ownerType ).getAssociatedEntityName( getFactory() );
+				entityName = ( (EntityType) ownerType ).getAssociatedEntityName( getFactory() );
 			}
 			else if ( ownerType.isCollectionType() ) {
-				Type ownerCollectionElementType = ( ( CollectionType ) ownerType ).getElementType( getFactory() );
+				Type ownerCollectionElementType = ( (CollectionType) ownerType ).getElementType( getFactory() );
 				if ( ownerCollectionElementType.isEntityType() ) {
-					entityName = ( ( EntityType ) ownerCollectionElementType ).getAssociatedEntityName( getFactory() );
+					entityName = ( (EntityType) ownerCollectionElementType ).getAssociatedEntityName( getFactory() );
 				}
 			}
 		}
@@ -307,16 +307,16 @@ public class CustomLoader extends Loader {
 			throw new HibernateException( "Could not determine fetch owner : " + ownerDescriptor );
 		}
 
-		return ( Queryable ) getFactory().getEntityPersister( entityName );
+		return (Queryable) getFactory().getEntityPersister( entityName );
 	}
 
 	@Override
-    protected String getQueryIdentifier() {
+	protected String getQueryIdentifier() {
 		return sql;
 	}
 
 	@Override
-    public String getSQLString() {
+	public String getSQLString() {
 		return sql;
 	}
 
@@ -325,27 +325,27 @@ public class CustomLoader extends Loader {
 	}
 
 	@Override
-    protected LockMode[] getLockModes(LockOptions lockOptions) {
+	protected LockMode[] getLockModes(LockOptions lockOptions) {
 		return lockModes;
 	}
 
 	@Override
-    protected Loadable[] getEntityPersisters() {
+	protected Loadable[] getEntityPersisters() {
 		return entityPersisters;
 	}
 
 	@Override
-    protected CollectionPersister[] getCollectionPersisters() {
+	protected CollectionPersister[] getCollectionPersisters() {
 		return collectionPersisters;
 	}
 
 	@Override
-    protected int[] getCollectionOwners() {
+	protected int[] getCollectionOwners() {
 		return collectionOwners;
 	}
 
 	@Override
-    protected int[] getOwners() {
+	protected int[] getOwners() {
 		return entiytOwners;
 	}
 
@@ -371,9 +371,13 @@ public class CustomLoader extends Loader {
 		afterLoadActions.add(
 				new AfterLoadAction() {
 					private final LockOptions originalLockOptions = lockOptions.makeCopy();
+
 					@Override
 					public void afterLoad(SessionImplementor session, Object entity, Loadable persister) {
-						( (Session) session ).buildLockRequest( originalLockOptions ).lock( persister.getEntityName(), entity );
+						( (Session) session ).buildLockRequest( originalLockOptions ).lock(
+								persister.getEntityName(),
+								entity
+						);
 					}
 				}
 		);
@@ -392,48 +396,50 @@ public class CustomLoader extends Loader {
 		);
 	}
 
-	static private HolderInstantiator getHolderInstantiator(ResultTransformer resultTransformer, String[] queryReturnAliases) {
+	static private HolderInstantiator getHolderInstantiator(
+			ResultTransformer resultTransformer,
+			String[] queryReturnAliases) {
 		if ( resultTransformer == null ) {
 			return HolderInstantiator.NOOP_INSTANTIATOR;
 		}
 		else {
-			return new HolderInstantiator(resultTransformer, queryReturnAliases);
+			return new HolderInstantiator( resultTransformer, queryReturnAliases );
 		}
 	}
 
 	@Override
-    protected String[] getResultRowAliases() {
+	protected String[] getResultRowAliases() {
 		return transformerAliases;
 	}
 
 	@Override
-    protected ResultTransformer resolveResultTransformer(ResultTransformer resultTransformer) {
+	protected ResultTransformer resolveResultTransformer(ResultTransformer resultTransformer) {
 		return HolderInstantiator.resolveResultTransformer( null, resultTransformer );
 	}
 
 	@Override
-    protected boolean[] includeInResultRow() {
+	protected boolean[] includeInResultRow() {
 		return includeInResultRow;
 	}
 
 	@Override
-    protected Object getResultColumnOrRow(
+	protected Object getResultColumnOrRow(
 			Object[] row,
-	        ResultTransformer transformer,
-	        ResultSet rs,
-	        SessionImplementor session) throws SQLException, HibernateException {
+			ResultTransformer transformer,
+			ResultSet rs,
+			SessionImplementor session) throws SQLException, HibernateException {
 		return rowProcessor.buildResultRow( row, rs, transformer != null, session );
 	}
 
 	@Override
-    protected Object[] getResultRow(Object[] row, ResultSet rs, SessionImplementor session)
+	protected Object[] getResultRow(Object[] row, ResultSet rs, SessionImplementor session)
 			throws SQLException, HibernateException {
 		return rowProcessor.buildResultRow( row, rs, session );
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
-    protected List getResultList(List results, ResultTransformer resultTransformer) throws QueryException {
+	protected List getResultList(List results, ResultTransformer resultTransformer) throws QueryException {
 		// meant to handle dynamic instantiation queries...(Copy from QueryLoader)
 		HolderInstantiator holderInstantiator = HolderInstantiator.getHolderInstantiator(
 				null,
@@ -442,12 +448,12 @@ public class CustomLoader extends Loader {
 		);
 		if ( holderInstantiator.isRequired() ) {
 			for ( int i = 0; i < results.size(); i++ ) {
-				Object[] row = ( Object[] ) results.get( i );
-				Object result = holderInstantiator.instantiate(row);
+				Object[] row = (Object[]) results.get( i );
+				Object result = holderInstantiator.instantiate( row );
 				results.set( i, result );
 			}
 
-			return resultTransformer.transformList(results);
+			return resultTransformer.transformList( results );
 		}
 		else {
 			return results;
@@ -459,17 +465,17 @@ public class CustomLoader extends Loader {
 	}
 
 	@Override
-    protected EntityAliases[] getEntityAliases() {
+	protected EntityAliases[] getEntityAliases() {
 		return entityAliases;
 	}
 
 	@Override
-    protected CollectionAliases[] getCollectionAliases() {
+	protected CollectionAliases[] getCollectionAliases() {
 		return collectionAliases;
 	}
 
 	@Override
-    public int[] getNamedParameterLocs(String name) throws QueryException {
+	public int[] getNamedParameterLocs(String name) throws QueryException {
 		Object loc = namedParameterBindPoints.get( name );
 		if ( loc == null ) {
 			throw new QueryException(
@@ -478,16 +484,16 @@ public class CustomLoader extends Loader {
 			);
 		}
 		if ( loc instanceof Integer ) {
-			return new int[] { (Integer) loc };
+			return new int[] {(Integer) loc};
 		}
 		else {
-			return ArrayHelper.toIntArray( ( List ) loc );
+			return ArrayHelper.toIntArray( (List) loc );
 		}
 	}
 
 
 	@Override
-    protected void autoDiscoverTypes(ResultSet rs) {
+	protected void autoDiscoverTypes(ResultSet rs) {
 		try {
 			JdbcResultMetadata metadata = new JdbcResultMetadata( getFactory(), rs );
 			rowProcessor.prepareForAutoDiscovery( metadata );
@@ -503,7 +509,7 @@ public class CustomLoader extends Loader {
 			resultTypes = ArrayHelper.toTypeArray( types );
 			transformerAliases = ArrayHelper.toStringArray( aliases );
 		}
-		catch ( SQLException e ) {
+		catch (SQLException e) {
 			throw new HibernateException( "Exception while trying to autodiscover types.", e );
 		}
 	}
@@ -531,17 +537,17 @@ public class CustomLoader extends Loader {
 	@SuppressWarnings("UnusedParameters")
 	protected void validateAlias(String alias) {
 	}
-	
+
 	/**
 	 * {@link #resultTypes} can be overridden by {@link #autoDiscoverTypes(ResultSet)},
 	 * *after* {@link #list(SessionImplementor, QueryParameters)} has already been called.  It's a bit of a
 	 * chicken-and-the-egg issue since {@link #autoDiscoverTypes(ResultSet)} needs the {@link ResultSet}.
-	 * 
+	 * <p/>
 	 * As a hacky workaround, override
 	 * {@link #putResultInQueryCache(SessionImplementor, QueryParameters, Type[], QueryCache, QueryKey, List)} here
 	 * and provide the {@link #resultTypes}.
-	 * 
-	 * @see HHH-3051
+	 *
+	 * see HHH-3051
 	 */
 	@Override
 	protected void putResultInQueryCache(
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java
index 68fdd77821..4180cb4795 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java
@@ -20,9 +20,9 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.loader.custom.sql;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -53,7 +53,7 @@ public class SQLQueryParser {
 	private final Map namedParameters = new HashMap();
 	private long aliasesFound;
 
-	static interface ParserContext {
+	interface ParserContext {
 		boolean isEntityAlias(String aliasName);
 		SQLLoadable getEntityPersisterByAlias(String alias);
 		String getEntitySuffixByAlias(String alias);
@@ -233,9 +233,7 @@ public class SQLQueryParser {
 		
 		}
 	}
-	private String resolveProperties(
-			String aliasName,
-	        String propertyName) {
+	private String resolveProperties(String aliasName, String propertyName) {
 		Map fieldResults = context.getPropertyResultsMapByAlias( aliasName );
 		SQLLoadable persister = context.getEntityPersisterByAlias( aliasName );
 		String suffix = context.getEntitySuffixByAlias( aliasName );
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java
index 0ac300d058..0bd312a096 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java
@@ -80,7 +80,7 @@ import org.hibernate.type.Type;
  * @author Steve Ebersole
  */
 public class SQLQueryReturnProcessor {
-    private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SQLQueryReturnProcessor.class );
+	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SQLQueryReturnProcessor.class );
 
 	private static final NativeSQLQueryReturn[] NO_RETURNS = new NativeSQLQueryReturn[0];
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java
index ebd1fca214..548b3311dd 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java
@@ -38,9 +38,9 @@ import org.hibernate.persister.entity.OuterJoinLoadable;
 import org.hibernate.transform.ResultTransformer;
 import org.hibernate.type.Type;
 
-public abstract class AbstractEntityLoader extends OuterJoinLoader
+public abstract class AbstractEntityLoader
+		extends OuterJoinLoader
 		implements UniqueEntityLoader {
-
 	protected final OuterJoinLoadable persister;
 	protected final Type uniqueKeyType;
 	protected final String entityName;
@@ -109,13 +109,16 @@ public abstract class AbstractEntityLoader extends OuterJoinLoader
 	}
 
 	@Override
-    protected Object getResultColumnOrRow(Object[] row, ResultTransformer transformer, ResultSet rs, SessionImplementor session)
-	throws SQLException, HibernateException {
+	protected Object getResultColumnOrRow(
+			Object[] row,
+			ResultTransformer transformer,
+			ResultSet rs,
+			SessionImplementor session) throws SQLException, HibernateException {
 		return row[row.length-1];
 	}
 
 	@Override
-    protected boolean isSingleRowLoader() {
+	protected boolean isSingleRowLoader() {
 		return true;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityJoinWalker.java
index bd3d5f7abc..5e435c14f7 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityJoinWalker.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityJoinWalker.java
@@ -20,9 +20,9 @@
  * Free Software Foundation, Inc.
  * 51 Franklin Street, Fifth Floor
  * Boston, MA  02110-1301  USA
- *
  */
 package org.hibernate.loader.entity;
+
 import java.util.Collections;
 
 import org.hibernate.FetchMode;
@@ -37,34 +37,37 @@ import org.hibernate.persister.entity.OuterJoinLoadable;
 import org.hibernate.type.AssociationType;
 
 public class CascadeEntityJoinWalker extends AbstractEntityJoinWalker {
-	
+
 	private final CascadingAction cascadeAction;
 
-	public CascadeEntityJoinWalker(OuterJoinLoadable persister, CascadingAction action, SessionFactoryImplementor factory)
-	throws MappingException {
+	public CascadeEntityJoinWalker(
+			OuterJoinLoadable persister,
+			CascadingAction action,
+			SessionFactoryImplementor factory)
+			throws MappingException {
 		super( persister, factory, LoadQueryInfluencers.NONE );
 		this.cascadeAction = action;
 		StringBuilder whereCondition = whereString( getAlias(), persister.getIdentifierColumnNames(), 1 )
 				//include the discriminator and class-level where, but not filters
 				.append( persister.filterFragment( getAlias(), Collections.EMPTY_MAP ) );
-	
+
 		initAll( whereCondition.toString(), "", LockOptions.READ );
 	}
 
 	@Override
-    protected boolean isJoinedFetchEnabled(AssociationType type, FetchMode config, CascadeStyle cascadeStyle) {
+	protected boolean isJoinedFetchEnabled(AssociationType type, FetchMode config, CascadeStyle cascadeStyle) {
 		return ( type.isEntityType() || type.isCollectionType() ) &&
-				( cascadeStyle==null || cascadeStyle.doCascade(cascadeAction) );
+				( cascadeStyle == null || cascadeStyle.doCascade( cascadeAction ) );
 	}
 
 	@Override
-    protected boolean isTooManyCollections() {
-		return countCollectionPersisters(associations)>0;
+	protected boolean isTooManyCollections() {
+		return countCollectionPersisters( associations ) > 0;
 	}
 
 	@Override
-    public String getComment() {
+	public String getComment() {
 		return "load " + getPersister().getEntityName();
 	}
-	
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java
index ea2dc1439d..0e9e08be0d 100755
--- a/hibernate-core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java
@@ -46,13 +46,14 @@ import org.hibernate.type.Type;
 import org.jboss.logging.Logger;
 
 /**
- *
- *
  * @author Gavin King
  */
 public class CollectionElementLoader extends OuterJoinLoader {
 
-	private static final CoreMessageLogger LOG = Logger.getMessageLogger( CoreMessageLogger.class, CollectionElementLoader.class.getName() );
+	private static final CoreMessageLogger LOG = Logger.getMessageLogger(
+			CoreMessageLogger.class,
+			CollectionElementLoader.class.getName()
+	);
 
 	private final OuterJoinLoadable persister;
 	private final Type keyType;
@@ -71,16 +72,16 @@ public class CollectionElementLoader extends OuterJoinLoader {
 		this.entityName = persister.getEntityName();
 
 		JoinWalker walker = new EntityJoinWalker(
-				persister, 
+				persister,
 				ArrayHelper.join(
 						collectionPersister.getKeyColumnNames(),
-						collectionPersister.toColumns("index")
+						collectionPersister.toColumns( "index" )
 				),
-				1, 
-				LockMode.NONE, 
-				factory, 
+				1,
+				LockMode.NONE,
+				factory,
 				loadQueryInfluencers
-			);
+		);
 		initFromWalker( walker );
 
 		postInstantiate();
@@ -92,7 +93,7 @@ public class CollectionElementLoader extends OuterJoinLoader {
 	}
 
 	public Object loadElement(SessionImplementor session, Object key, Object index)
-	throws HibernateException {
+			throws HibernateException {
 
 		List list = loadEntity(
 				session,
@@ -101,36 +102,36 @@ public class CollectionElementLoader extends OuterJoinLoader {
 				keyType,
 				indexType,
 				persister
-			);
+		);
 
-		if ( list.size()==1 ) {
-			return list.get(0);
+		if ( list.size() == 1 ) {
+			return list.get( 0 );
 		}
-		else if ( list.size()==0 ) {
+		else if ( list.size() == 0 ) {
 			return null;
 		}
 		else {
-			if ( getCollectionOwners()!=null ) {
-				return list.get(0);
+			if ( getCollectionOwners() != null ) {
+				return list.get( 0 );
 			}
 			else {
-				throw new HibernateException("More than one row was found");
+				throw new HibernateException( "More than one row was found" );
 			}
 		}
 
 	}
 
 	@Override
-    protected Object getResultColumnOrRow(
-		Object[] row,
-		ResultTransformer transformer,
-		ResultSet rs, SessionImplementor session)
-	throws SQLException, HibernateException {
-		return row[row.length-1];
+	protected Object getResultColumnOrRow(
+			Object[] row,
+			ResultTransformer transformer,
+			ResultSet rs, SessionImplementor session)
+			throws SQLException, HibernateException {
+		return row[row.length - 1];
 	}
 
 	@Override
-    protected boolean isSingleRowLoader() {
+	protected boolean isSingleRowLoader() {
 		return true;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityLoader.java
index 5aa490f944..3ddf573bb5 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityLoader.java
@@ -162,12 +162,12 @@ public class EntityLoader extends AbstractEntityLoader {
 	}
 
 	@Override
-    protected boolean isSingleRowLoader() {
+	protected boolean isSingleRowLoader() {
 		return !batchLoader;
 	}
 
 	@Override
-    public int[][] getCompositeKeyManyToOneTargetIndices() {
+	public int[][] getCompositeKeyManyToOneTargetIndices() {
 		return compositeKeyManyToOneTargetIndices;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java
index cd553624a9..ec0271dc89 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java
@@ -89,7 +89,7 @@ public class QueryLoader extends BasicLoader {
 	//private Type[] sqlResultTypes;
 	private Type[] queryReturnTypes;
 
-	private final Map<String, String> sqlAliasByEntityAlias = new HashMap<String, String>(8);
+	private final Map<String, String> sqlAliasByEntityAlias = new HashMap<String, String>( 8 );
 
 	private EntityType[] ownerAssociationTypes;
 	private int[] owners;
@@ -115,8 +115,8 @@ public class QueryLoader extends BasicLoader {
 	 */
 	public QueryLoader(
 			final QueryTranslatorImpl queryTranslator,
-	        final SessionFactoryImplementor factory,
-	        final SelectClause selectClause) {
+			final SessionFactoryImplementor factory,
+			final SelectClause selectClause) {
 		super( factory );
 		this.queryTranslator = queryTranslator;
 		initialize( selectClause );
@@ -136,13 +136,13 @@ public class QueryLoader extends BasicLoader {
 		queryReturnAliases = selectClause.getQueryReturnAliases();
 
 		List collectionFromElements = selectClause.getCollectionFromElements();
-		if ( collectionFromElements != null && collectionFromElements.size()!=0 ) {
+		if ( collectionFromElements != null && collectionFromElements.size() != 0 ) {
 			int length = collectionFromElements.size();
 			collectionPersisters = new QueryableCollection[length];
 			collectionOwners = new int[length];
 			collectionSuffixes = new String[length];
-			for ( int i=0; i<length; i++ ) {
-				FromElement collectionFromElement = (FromElement) collectionFromElements.get(i);
+			for ( int i = 0; i < length; i++ ) {
+				FromElement collectionFromElement = (FromElement) collectionFromElements.get( i );
 				collectionPersisters[i] = collectionFromElement.getQueryableCollection();
 				collectionOwners[i] = fromElementList.indexOf( collectionFromElement.getOrigin() );
 //				collectionSuffixes[i] = collectionFromElement.getColumnAliasSuffix();
@@ -162,8 +162,8 @@ public class QueryLoader extends BasicLoader {
 		ownerAssociationTypes = new EntityType[size];
 
 		for ( int i = 0; i < size; i++ ) {
-			final FromElement element = ( FromElement ) fromElementList.get( i );
-			entityPersisters[i] = ( Queryable ) element.getEntityPersister();
+			final FromElement element = (FromElement) fromElementList.get( i );
+			entityPersisters[i] = (Queryable) element.getEntityPersister();
 
 			if ( entityPersisters[i] == null ) {
 				throw new IllegalStateException( "No entity persister for " + element.toString() );
@@ -187,7 +187,7 @@ public class QueryLoader extends BasicLoader {
 					// This is now handled earlier in this method.
 				}
 				else if ( element.getDataType().isEntityType() ) {
-					EntityType entityType = ( EntityType ) element.getDataType();
+					EntityType entityType = (EntityType) element.getDataType();
 					if ( entityType.isOneToOne() ) {
 						owners[i] = fromElementList.indexOf( element.getOrigin() );
 					}
@@ -210,14 +210,17 @@ public class QueryLoader extends BasicLoader {
 	public final void validateScrollability() throws HibernateException {
 		queryTranslator.validateScrollability();
 	}
+
 	@Override
 	protected boolean needsFetchingScroll() {
 		return queryTranslator.containsCollectionFetches();
 	}
+
 	@Override
 	public Loadable[] getEntityPersisters() {
 		return entityPersisters;
 	}
+
 	@Override
 	public String[] getAliases() {
 		return sqlAliases;
@@ -226,14 +229,17 @@ public class QueryLoader extends BasicLoader {
 	public String[] getSqlAliasSuffixes() {
 		return sqlAliasSuffixes;
 	}
+
 	@Override
 	public String[] getSuffixes() {
 		return getSqlAliasSuffixes();
 	}
+
 	@Override
 	public String[] getCollectionSuffixes() {
 		return collectionSuffixes;
 	}
+
 	@Override
 	protected String getQueryIdentifier() {
 		return queryTranslator.getQueryIdentifier();
@@ -255,10 +261,12 @@ public class QueryLoader extends BasicLoader {
 	protected CollectionPersister[] getCollectionPersisters() {
 		return collectionPersisters;
 	}
+
 	@Override
 	protected int[] getCollectionOwners() {
 		return collectionOwners;
 	}
+
 	@Override
 	protected boolean[] getEntityEagerPropertyFetches() {
 		return entityEagerPropertyFetches;
@@ -272,6 +280,7 @@ public class QueryLoader extends BasicLoader {
 	protected int[] getOwners() {
 		return owners;
 	}
+
 	@Override
 	protected EntityType[] getOwnerAssociationTypes() {
 		return ownerAssociationTypes;
@@ -327,7 +336,7 @@ public class QueryLoader extends BasicLoader {
 		final LockOptions lockOptions = parameters.getLockOptions();
 
 		if ( lockOptions == null ||
-			( lockOptions.getLockMode() == LockMode.NONE && lockOptions.getAliasLockCount() == 0 ) ) {
+				( lockOptions.getLockMode() == LockMode.NONE && lockOptions.getAliasLockCount() == 0 ) ) {
 			return sql;
 		}
 
@@ -346,13 +355,15 @@ public class QueryLoader extends BasicLoader {
 		// we need both the set of locks and the columns to reference in locks
 		// as the ultimate output of this section...
 		final LockOptions locks = new LockOptions( lockOptions.getLockMode() );
-		final Map<String, String[]> keyColumnNames = dialect.forUpdateOfColumns() ? new HashMap<String, String[]>() : null;
+		final Map<String, String[]> keyColumnNames = dialect.forUpdateOfColumns() ?
+				new HashMap<String, String[]>() :
+				null;
 
 		locks.setScope( lockOptions.getScope() );
 		locks.setTimeOut( lockOptions.getTimeOut() );
 
 		for ( Map.Entry<String, String> entry : sqlAliasByEntityAlias.entrySet() ) {
-			final String userAlias =  entry.getKey();
+			final String userAlias = entry.getKey();
 			final String drivingSqlAlias = entry.getValue();
 			if ( drivingSqlAlias == null ) {
 				throw new IllegalArgumentException( "could not locate alias to apply lock mode : " + userAlias );
@@ -380,6 +391,7 @@ public class QueryLoader extends BasicLoader {
 		// apply the collected locks and columns
 		return dialect.applyLocksToSql( sql, locks, keyColumnNames );
 	}
+
 	@Override
 	protected void applyPostLoadLocks(Object[] row, LockMode[] lockModesArray, SessionImplementor session) {
 		// todo : scalars???
@@ -396,18 +408,21 @@ public class QueryLoader extends BasicLoader {
 //			}
 //		}
 	}
+
 	@Override
 	protected boolean upgradeLocks() {
 		return true;
 	}
 
 	private boolean hasSelectNew() {
-		return aggregatedSelectExpression != null &&  aggregatedSelectExpression.getResultTransformer() != null;
+		return aggregatedSelectExpression != null && aggregatedSelectExpression.getResultTransformer() != null;
 	}
+
 	@Override
 	protected String[] getResultRowAliases() {
 		return queryReturnAliases;
 	}
+
 	@Override
 	protected ResultTransformer resolveResultTransformer(ResultTransformer resultTransformer) {
 		final ResultTransformer implicitResultTransformer = aggregatedSelectExpression == null
@@ -415,23 +430,29 @@ public class QueryLoader extends BasicLoader {
 				: aggregatedSelectExpression.getResultTransformer();
 		return HolderInstantiator.resolveResultTransformer( implicitResultTransformer, resultTransformer );
 	}
+
 	@Override
 	protected boolean[] includeInResultRow() {
 		boolean[] includeInResultTuple = includeInSelect;
 		if ( hasScalars ) {
-			includeInResultTuple = new boolean[ queryReturnTypes.length ];
+			includeInResultTuple = new boolean[queryReturnTypes.length];
 			Arrays.fill( includeInResultTuple, true );
 		}
 		return includeInResultTuple;
 	}
+
 	@Override
-	protected Object getResultColumnOrRow(Object[] row, ResultTransformer transformer, ResultSet rs, SessionImplementor session)
+	protected Object getResultColumnOrRow(
+			Object[] row,
+			ResultTransformer transformer,
+			ResultSet rs,
+			SessionImplementor session)
 			throws SQLException, HibernateException {
 
 		Object[] resultRow = getResultRow( row, rs, session );
-		boolean hasTransform = hasSelectNew() || transformer!=null;
-		return ( ! hasTransform && resultRow.length == 1 ?
-				resultRow[ 0 ] :
+		boolean hasTransform = hasSelectNew() || transformer != null;
+		return ( !hasTransform && resultRow.length == 1 ?
+				resultRow[0] :
 				resultRow
 		);
 	}
@@ -461,13 +482,13 @@ public class QueryLoader extends BasicLoader {
 		HolderInstantiator holderInstantiator = buildHolderInstantiator( resultTransformer );
 		if ( holderInstantiator.isRequired() ) {
 			for ( int i = 0; i < results.size(); i++ ) {
-				Object[] row = ( Object[] ) results.get( i );
-				Object result = holderInstantiator.instantiate(row);
+				Object[] row = (Object[]) results.get( i );
+				Object result = holderInstantiator.instantiate( row );
 				results.set( i, result );
 			}
 
 			if ( !hasSelectNew() && resultTransformer != null ) {
-				return resultTransformer.transformList(results);
+				return resultTransformer.transformList( results );
 			}
 			else {
 				return results;
@@ -515,19 +536,24 @@ public class QueryLoader extends BasicLoader {
 
 		try {
 			if ( queryParameters.isCallable() ) {
-				throw new QueryException("iterate() not supported for callable statements");
+				throw new QueryException( "iterate() not supported for callable statements" );
 			}
-			final SqlStatementWrapper wrapper = executeQueryStatement( queryParameters, false, Collections.<AfterLoadAction>emptyList(), session );
+			final SqlStatementWrapper wrapper = executeQueryStatement(
+					queryParameters,
+					false,
+					Collections.<AfterLoadAction>emptyList(),
+					session
+			);
 			final ResultSet rs = wrapper.getResultSet();
 			final PreparedStatement st = (PreparedStatement) wrapper.getStatement();
 			final Iterator result = new IteratorImpl(
 					rs,
-			        st,
-			        session,
-			        queryParameters.isReadOnly( session ),
-			        queryReturnTypes,
-			        queryTranslator.getColumnNames(),
-			        buildHolderInstantiator( queryParameters.getResultTransformer() )
+					st,
+					session,
+					queryParameters.isReadOnly( session ),
+					queryReturnTypes,
+					queryTranslator.getColumnNames(),
+					buildHolderInstantiator( queryParameters.getResultTransformer() )
 			);
 
 			if ( stats ) {
@@ -544,21 +570,21 @@ public class QueryLoader extends BasicLoader {
 			return result;
 
 		}
-		catch ( SQLException sqle ) {
+		catch (SQLException sqle) {
 			throw getFactory().getSQLExceptionHelper().convert(
-			        sqle,
-			        "could not execute query using iterate",
-			        getSQLString()
-				);
+					sqle,
+					"could not execute query using iterate",
+					getSQLString()
+			);
 		}
 
 	}
 
 	public ScrollableResults scroll(
 			final QueryParameters queryParameters,
-	        final SessionImplementor session) throws HibernateException {
+			final SessionImplementor session) throws HibernateException {
 		checkQuery( queryParameters );
-		return scroll( 
+		return scroll(
 				queryParameters,
 				queryReturnTypes,
 				buildHolderInstantiator( queryParameters.getResultTransformer() ),
@@ -601,7 +627,9 @@ public class QueryLoader extends BasicLoader {
 	 * @param queryParameters The encapsulation of the parameter values to be bound.
 	 * @param startIndex The position from which to start binding parameter values.
 	 * @param session The originating session.
+	 *
 	 * @return The number of JDBC bind positions actually bound during this method execution.
+	 *
 	 * @throws SQLException Indicates problems performing the binding.
 	 */
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/AbstractEntityGraphVisitationStrategy.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/AbstractEntityGraphVisitationStrategy.java
index ae99610819..034901bdcc 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/AbstractEntityGraphVisitationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/AbstractEntityGraphVisitationStrategy.java
@@ -29,7 +29,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.persistence.AttributeNode;
 import javax.persistence.Subgraph;
 import javax.persistence.metamodel.Attribute;
@@ -45,17 +44,15 @@ import org.hibernate.graph.spi.AttributeNodeImplementor;
 import org.hibernate.graph.spi.GraphNodeImplementor;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.loader.plan.spi.EntityReturn;
-import org.hibernate.loader.plan.spi.FetchSource;
 import org.hibernate.loader.plan.spi.LoadPlan;
 import org.hibernate.loader.plan.spi.Return;
-import org.hibernate.persister.entity.Joinable;
 import org.hibernate.persister.walking.spi.AssociationAttributeDefinition;
-import org.hibernate.persister.walking.spi.AssociationKey;
 import org.hibernate.persister.walking.spi.AttributeDefinition;
 import org.hibernate.persister.walking.spi.CollectionElementDefinition;
 import org.hibernate.persister.walking.spi.CollectionIndexDefinition;
 import org.hibernate.persister.walking.spi.EntityDefinition;
 import org.hibernate.persister.walking.spi.WalkingException;
+
 import org.jboss.logging.Logger;
 
 /**
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/FetchStyleLoadPlanBuildingAssociationVisitationStrategy.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/FetchStyleLoadPlanBuildingAssociationVisitationStrategy.java
index f93f8a6467..07a374d4cb 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/FetchStyleLoadPlanBuildingAssociationVisitationStrategy.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/FetchStyleLoadPlanBuildingAssociationVisitationStrategy.java
@@ -31,7 +31,6 @@ import org.hibernate.engine.FetchTiming;
 import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.CoreLogging;
-import org.hibernate.loader.plan.build.spi.LoadPlanBuildingAssociationVisitationStrategy;
 import org.hibernate.loader.plan.spi.CollectionReturn;
 import org.hibernate.loader.plan.spi.EntityReturn;
 import org.hibernate.loader.plan.spi.LoadPlan;
@@ -41,7 +40,7 @@ import org.hibernate.persister.walking.spi.AssociationAttributeDefinition;
 import org.jboss.logging.Logger;
 
 /**
- * {@link LoadPlanBuildingAssociationVisitationStrategy} implementation used for building LoadPlans based on metamodel-defined fetching.  Built
+ * LoadPlanBuildingAssociationVisitationStrategy implementation used for building LoadPlans based on metamodel-defined fetching.  Built
  * LoadPlans contain a single root return object, either an {@link EntityReturn} or a {@link CollectionReturn}.
  *
  * @author Steve Ebersole
@@ -129,7 +128,7 @@ public class FetchStyleLoadPlanBuildingAssociationVisitationStrategy
 			return new FetchStrategy( fetchStrategy.getTiming(), FetchStyle.SELECT );
 		}
 
-		final Integer maxFetchDepth = sessionFactory().getSettings().getMaximumFetchDepth();
+		final Integer maxFetchDepth = sessionFactory().getSessionFactoryOptions().getMaximumFetchDepth();
 		if ( maxFetchDepth != null && currentDepth() > maxFetchDepth ) {
 			return new FetchStrategy( fetchStrategy.getTiming(), FetchStyle.SELECT );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/LoadPlanImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/LoadPlanImpl.java
index 7b36b72a01..726c466aaa 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/LoadPlanImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/LoadPlanImpl.java
@@ -26,22 +26,16 @@ package org.hibernate.loader.plan.build.internal;
 import java.util.Collections;
 import java.util.List;
 
-import org.hibernate.internal.CoreLogging;
 import org.hibernate.loader.plan.spi.CollectionReturn;
 import org.hibernate.loader.plan.spi.EntityReturn;
 import org.hibernate.loader.plan.spi.LoadPlan;
-import org.hibernate.loader.plan.spi.QuerySpace;
 import org.hibernate.loader.plan.spi.QuerySpaces;
 import org.hibernate.loader.plan.spi.Return;
 
-import org.jboss.logging.Logger;
-
 /**
  * @author Steve Ebersole
  */
 public class LoadPlanImpl implements LoadPlan {
-	private static final Logger log = CoreLogging.logger( LoadPlanImpl.class );
-
 	private final List<? extends Return> returns;
 	private final QuerySpaces querySpaces;
 	private final Disposition disposition;
@@ -62,7 +56,7 @@ public class LoadPlanImpl implements LoadPlan {
 	 * Creates a {@link Disposition#ENTITY_LOADER} LoadPlan.
 	 *
 	 * @param rootReturn The EntityReturn representation of the entity being loaded.
-	 * @param querySpaces The QuerySpaces containing all the {@link QuerySpace} references
+	 * @param querySpaces The QuerySpaces containing all the query space references
 	 *                    required for <code>rootReturn</code> and joined entity, collection,
 	 *                    and composite references.
 	 */
@@ -74,7 +68,7 @@ public class LoadPlanImpl implements LoadPlan {
 	 * Creates a {@link Disposition#COLLECTION_INITIALIZER} LoadPlan.
 	 *
 	 * @param rootReturn The CollectionReturn representation of the collection being initialized.
-	 * @param querySpaces The QuerySpaces containing all the {@link QuerySpace} references
+	 * @param querySpaces The QuerySpaces containing all the query space references
 	 *                    required for <code>rootReturn</code> and joined entity, collection,
 	 *                    and composite references.
 	 */
@@ -86,7 +80,7 @@ public class LoadPlanImpl implements LoadPlan {
 	 * Creates a {@link Disposition#MIXED} LoadPlan.
 	 *
 	 * @param returns The mixed Return references
-	 * @param querySpaces The QuerySpaces containing all the {@link QuerySpace} references
+	 * @param querySpaces The QuerySpaces containing all the query space references
 	 *                    required for <code>rootReturn</code> and joined entity, collection,
 	 *                    and composite references.
 	 * @param areLazyAttributesForceFetched Should lazy attributes (bytecode enhanced laziness) be fetched also?  This
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/spaces/QuerySpaceHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/spaces/QuerySpaceHelper.java
index 2df29ae426..502953a08f 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/spaces/QuerySpaceHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/spaces/QuerySpaceHelper.java
@@ -121,19 +121,19 @@ public class QuerySpaceHelper {
 			String querySpaceUid,
 			boolean shouldIncludeJoin) {
 		final boolean required = lhsQuerySpace.canJoinsBeRequired() && !attributeDefinition.isNullable();
- 		return makeCompositeQuerySpace(
-				 lhsQuerySpace,
-				 new CompositePropertyMapping(
-						 (CompositeType) attributeDefinition.getType(),
-						 lhsQuerySpace.getPropertyMapping(),
-						 attributeDefinition.getName()
-				 ),
-				 attributeDefinition.getName(),
-				 (CompositeType) attributeDefinition.getType(),
-				 querySpaceUid,
-				 required,
-				 shouldIncludeJoin
-		 );
+		return makeCompositeQuerySpace(
+				lhsQuerySpace,
+				new CompositePropertyMapping(
+						(CompositeType) attributeDefinition.getType(),
+						lhsQuerySpace.getPropertyMapping(),
+						attributeDefinition.getName()
+				),
+				attributeDefinition.getName(),
+				(CompositeType) attributeDefinition.getType(),
+				querySpaceUid,
+				required,
+				shouldIncludeJoin
+		);
 	}
 
 	public ExpandingCompositeQuerySpace makeCompositeQuerySpace(
@@ -172,7 +172,8 @@ public class QuerySpaceHelper {
 			FetchStrategy fetchStrategy) {
 
 		final CollectionType fetchedType = (CollectionType) attributeDefinition.getType();
-		final CollectionPersister fetchedPersister = attributeDefinition.toCollectionDefinition().getCollectionPersister();
+		final CollectionPersister fetchedPersister = attributeDefinition.toCollectionDefinition()
+				.getCollectionPersister();
 
 		if ( fetchedPersister == null ) {
 			throw new WalkingException(
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/spaces/QuerySpacesImpl.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/spaces/QuerySpacesImpl.java
index e4a1c36a64..5a2ec0df8e 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/spaces/QuerySpacesImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/internal/spaces/QuerySpacesImpl.java
@@ -38,7 +38,6 @@ import org.hibernate.loader.plan.spi.QuerySpace;
 import org.hibernate.loader.plan.spi.QuerySpaceUidNotRegisteredException;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.entity.JoinedSubclassEntityPersister;
 
 import org.jboss.logging.Logger;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/spi/ExpandingCollectionQuerySpace.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/spi/ExpandingCollectionQuerySpace.java
index 3baccd5cef..63f2231a55 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/spi/ExpandingCollectionQuerySpace.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/spi/ExpandingCollectionQuerySpace.java
@@ -25,7 +25,6 @@ package org.hibernate.loader.plan.build.spi;
 
 import org.hibernate.loader.plan.spi.CollectionQuerySpace;
 import org.hibernate.loader.plan.spi.Join;
-import org.hibernate.loader.plan.spi.JoinDefinedByMetadata;
 import org.hibernate.persister.collection.CollectionPropertyNames;
 
 /**
@@ -40,15 +39,16 @@ public interface ExpandingCollectionQuerySpace extends CollectionQuerySpace, Exp
 
 	/**
 	 * Adds a join with another query space for either a collection element or index. If {@code join}
-	 * is an instance of {@link JoinDefinedByMetadata}, then the only valid values returned by
-	 * {@link JoinDefinedByMetadata#getJoinedPropertyName} are {@link CollectionPropertyNames#COLLECTION_ELEMENTS}
-	 * and {@link CollectionPropertyNames#COLLECTION_INDICES}, for the collection element or index, respectively.
+	 * is an instance of {@link org.hibernate.loader.plan.spi.JoinDefinedByMetadata}, then the only valid
+	 * values returned by {@link org.hibernate.loader.plan.spi.JoinDefinedByMetadata#getJoinedPropertyName}
+	 * are {@link CollectionPropertyNames#COLLECTION_ELEMENTS} and {@link CollectionPropertyNames#COLLECTION_INDICES},
+	 * for the collection element or index, respectively.
 	 *
 	 * @param join The element or index join to add.
 	 *
-	 * @throws java.lang.IllegalArgumentException if {@code join} is an instance of {@link JoinDefinedByMetadata}
-	 * and {@code join.getJoinedPropertyName() is neither {@link CollectionPropertyNames#COLLECTION_ELEMENTS}
-	 * nor {@link CollectionPropertyNames#COLLECTION_INDICES}}.
+	 * @throws java.lang.IllegalArgumentException if {@code join} is an instance of
+	 * {@link org.hibernate.loader.plan.spi.JoinDefinedByMetadata} and {@code join.getJoinedPropertyName()
+	 * is neither {@link CollectionPropertyNames#COLLECTION_ELEMENTS} nor {@link CollectionPropertyNames#COLLECTION_INDICES}}.
 	 * @throws java.lang.IllegalStateException if there is already an existing join with the same joined property name.
 	 */
 	public void addJoin(Join join);
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/spi/ExpandingQuerySpaces.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/spi/ExpandingQuerySpaces.java
index 85509a5ce3..138181b84b 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/plan/build/spi/ExpandingQuerySpaces.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/build/spi/ExpandingQuerySpaces.java
@@ -25,14 +25,12 @@ package org.hibernate.loader.plan.build.spi;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.loader.plan.build.internal.spaces.CompositePropertyMapping;
-import org.hibernate.loader.plan.spi.Join;
-import org.hibernate.loader.plan.spi.QuerySpace;
 import org.hibernate.loader.plan.spi.QuerySpaces;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 
 /**
- * Models a collection of {@link QuerySpace} references and
+ * Models a collection of {@link org.hibernate.loader.plan.spi.QuerySpace} references and
  * exposes the ability to create an {@link ExpandingQuerySpace} for "returns" and fetches;
  * used when building a load plan.
  *
@@ -44,11 +42,11 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 * Generate a unique ID to be used when creating an {@link ExpandingQuerySpace}.
 	 * <p/>
 	 * Using this method to generate a unique ID ensures that this object
-	 * does not contain a {@link QuerySpace} with the returned unique ID.
+	 * does not contain a {@link org.hibernate.loader.plan.spi.QuerySpace} with the returned unique ID.
 	 *
 	 * @return The unique ID.
 	 */
-	public String generateImplicitUid();
+	String generateImplicitUid();
 
 	/**
 	 * Create an {@link ExpandingEntityQuerySpace} for an entity "return" with the
@@ -56,7 +54,7 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 *
 	 * The unique ID should be generated using {@link #generateImplicitUid()},
 	 *
-	 * A unique suffix may be added to the unique ID for an existing {@link QuerySpace}.
+	 * A unique suffix may be added to the unique ID for an existing {@link org.hibernate.loader.plan.spi.QuerySpace}.
 	 * In this case, it is the caller's responsibility to ensure uniqueness.
 	 *
 	 * @param uid The unique ID for the root entity query space.
@@ -67,7 +65,7 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 *
 	 * @see org.hibernate.loader.plan.spi.EntityReturn
 	 */
-	public ExpandingEntityQuerySpace makeRootEntityQuerySpace(
+	ExpandingEntityQuerySpace makeRootEntityQuerySpace(
 			String uid,
 			EntityPersister entityPersister);
 
@@ -77,7 +75,7 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 *
 	 * The unique ID should be generated using {@link #generateImplicitUid()},
 	 *
-	 * A unique suffix may be added to the unique ID for an existing {@link QuerySpace}.
+	 * A unique suffix may be added to the unique ID for an existing {@link org.hibernate.loader.plan.spi.QuerySpace}.
 	 * In this case, it is the caller's responsibility to ensure uniqueness.
 	 *
 	 * @param uid The unique ID for the entity query space.
@@ -89,9 +87,9 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 * @throws IllegalStateException if there is already a query space with the
 	 *         specified unique ID.
 	 *
-	 * @see Join
+	 * @see org.hibernate.loader.plan.spi.Join
 	 */
-	public ExpandingEntityQuerySpace makeEntityQuerySpace(
+	ExpandingEntityQuerySpace makeEntityQuerySpace(
 			String uid,
 			EntityPersister entityPersister,
 			boolean canJoinsBeRequired);
@@ -102,7 +100,7 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 *
 	 * The unique ID should be generated using {@link #generateImplicitUid()},
 	 *
-	 * A unique suffix may be added to the unique ID for an existing {@link QuerySpace}.
+	 * A unique suffix may be added to the unique ID for an existing {@link org.hibernate.loader.plan.spi.QuerySpace}.
 	 * In this case, it is the caller's responsibility to ensure uniqueness.
 	 *
 	 * @param uid The unique ID for the root collection query space.
@@ -113,7 +111,7 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 *
 	 * @see org.hibernate.loader.plan.spi.CollectionReturn
 	 */
-	public ExpandingCollectionQuerySpace makeRootCollectionQuerySpace(
+	ExpandingCollectionQuerySpace makeRootCollectionQuerySpace(
 			String uid,
 			CollectionPersister collectionPersister);
 
@@ -123,7 +121,7 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 *
 	 * The unique ID should be generated using {@link #generateImplicitUid()},
 	 *
-	 * A unique suffix may be added to the unique ID for an existing {@link QuerySpace}.
+	 * A unique suffix may be added to the unique ID for an existing {@link org.hibernate.loader.plan.spi.QuerySpace}.
 	 * In this case, it is the caller's responsibility to ensure uniqueness.
 	 *
 	 * @param uid The unique ID for the collection query space.
@@ -135,9 +133,9 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 * @throws IllegalStateException if there is already a query space with the
 	 *         specified unique ID.
 	 *
-	 * @see Join
+	 * @see org.hibernate.loader.plan.spi.Join
 	 */
-	public ExpandingCollectionQuerySpace makeCollectionQuerySpace(
+	ExpandingCollectionQuerySpace makeCollectionQuerySpace(
 			String uid,
 			CollectionPersister collectionPersister,
 			boolean canJoinsBeRequired);
@@ -148,7 +146,7 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 *
 	 * The unique ID should be generated using {@link #generateImplicitUid()},
 	 *
-	 * A unique suffix may be added to the unique ID for an existing {@link QuerySpace}.
+	 * A unique suffix may be added to the unique ID for an existing {@link org.hibernate.loader.plan.spi.QuerySpace}.
 	 * In this case, it is the caller's responsibility to ensure uniqueness.
 	 *
 	 * @param uid The unique ID for the composite query space.
@@ -160,9 +158,9 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 * @throws IllegalStateException if there is already a query space with the
 	 *         specified unique ID.
 	 *
-	 * @see Join
+	 * @see org.hibernate.loader.plan.spi.Join
 	 */
-	public ExpandingCompositeQuerySpace makeCompositeQuerySpace(
+	ExpandingCompositeQuerySpace makeCompositeQuerySpace(
 			String uid,
 			CompositePropertyMapping compositePropertyMapping,
 			boolean canJoinsBeRequired);
@@ -172,5 +170,5 @@ public interface ExpandingQuerySpaces extends QuerySpaces {
 	 *
 	 * @return The session factory.
 	 */
-	public SessionFactoryImplementor getSessionFactory();
+	SessionFactoryImplementor getSessionFactory();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/AbstractLoadQueryDetails.java b/hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/AbstractLoadQueryDetails.java
index 0346771ce0..9e4b6f6e0a 100644
--- a/hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/AbstractLoadQueryDetails.java
+++ b/hibernate-core/src/main/java/org/hibernate/loader/plan/exec/internal/AbstractLoadQueryDetails.java
@@ -28,9 +28,6 @@ import java.util.List;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.loader.plan.build.spi.LoadPlanTreePrinter;
-import org.hibernate.loader.plan.exec.internal.AliasResolutionContextImpl;
-import org.hibernate.loader.plan.exec.internal.FetchStats;
-import org.hibernate.loader.plan.exec.internal.LoadQueryJoinAndFetchProcessor;
 import org.hibernate.loader.plan.exec.process.internal.ResultSetProcessorImpl;
 import org.hibernate.loader.plan.exec.process.spi.CollectionReferenceInitializer;
 import org.hibernate.loader.plan.exec.process.spi.EntityReferenceInitializer;
@@ -63,14 +60,9 @@ public abstract class AbstractLoadQueryDetails implements LoadQueryDetails {
 
 	/**
 	 * @param rootReturn The root return reference we are processing
-	 * @param select The SelectStatementBuilder
-	 * @param helper The Join/Fetch helper
 	 * @param factory The SessionFactory
 	 * @param buildingParameters The query building context
-	 * @param rootAlias The table alias to use
-	 * @param rootLoadable The persister
-	 * @param readerCollector Collector for EntityReferenceInitializer and CollectionReferenceInitializer references
-	*/
+	 */
 	protected AbstractLoadQueryDetails(
 			LoadPlan loadPlan,
 			AliasResolutionContextImpl aliasResolutionContext,
@@ -278,15 +270,18 @@ public abstract class AbstractLoadQueryDetails implements LoadQueryDetails {
 			entityReferenceInitializers.add( entityReferenceInitializer );
 		}
 
+		@Override
 		public final List<EntityReferenceInitializer> getEntityReferenceInitializers() {
 			return entityReferenceInitializers;
 		}
 
+		@Override
 		public List<CollectionReferenceInitializer> getArrayReferenceInitializers() {
 			return arrayReferenceInitializers;
 
 		}
 
+		@Override
 		public List<CollectionReferenceInitializer> getNonArrayCollectionReferenceInitializers() {
 			return collectionReferenceInitializers;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java b/hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java
index 321ca7eda8..576a9951e0 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/connections/ThreadLocalCurrentSessionTest.java
@@ -31,7 +31,6 @@ import org.hibernate.cfg.Environment;
 import org.hibernate.context.internal.ThreadLocalSessionContext;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.engine.transaction.spi.LocalStatus;
 import org.hibernate.resource.transaction.spi.TransactionStatus;
 
 import org.hibernate.testing.RequiresDialect;
diff --git a/shared/config/checkstyle/checkstyle-eventual.xml b/shared/config/checkstyle/checkstyle-eventual.xml
deleted file mode 100644
index 6ad31b79c5..0000000000
--- a/shared/config/checkstyle/checkstyle-eventual.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Hibernate, Relational Persistence for Idiomatic Java
-  ~
-  ~ Copyright (c) 2013, Red Hat Inc. or third-party contributors as
-  ~ indicated by the @author tags or express copyright attribution
-  ~ statements applied by the authors.  All third-party contributions are
-  ~ distributed under license by Red Hat Inc.
-  ~
-  ~ This copyrighted material is made available to anyone wishing to use, modify,
-  ~ copy, or redistribute it subject to the terms and conditions of the GNU
-  ~ Lesser General Public License, as published by the Free Software Foundation.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-  ~ for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public License
-  ~ along with this distribution; if not, write to:
-  ~ Free Software Foundation, Inc.
-  ~ 51 Franklin Street, Fifth Floor
-  ~ Boston, MA  02110-1301  USA
-  -->
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-<module name="Checker">
-
-    <module name="TreeWalker">
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            General regex checks as part of the TreeWalker
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-<!--
-        <module name="Regexp">
-            <property name="format"
-                      value="\A(/\*\n \* Hibernate, Relational Persistence for Idiomatic Java\n \*\n \* Copyright \(c\) \d{4}(-\d{4})?, Red Hat(,)? Inc. (and/or its affiliates )?or third-party contributors as\n \* indicated by the @author tags or express copyright attribution\n \* statements applied by the authors. All third-party contributions are\n \* distributed under license by Red Hat(,)? Inc.\n \*\n \* This copyrighted material is made available to anyone wishing to use, modify,\n \* copy, or redistribute it subject to the terms and conditions of the GNU\n \* Lesser General Public License, as published by the Free Software Foundation.\n \*\n \* This program is distributed in the hope that it will be useful,\n \* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\n \* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License\n \* for more details.\n \*\n \* You should have received a copy of the GNU Lesser General Public License\n \* along with this distribution; if not, write to:\n \* Free Software Foundation, Inc.\n \* 51 Franklin Street, Fifth Floor\n \* Boston, MA 02110-1301 USA\n \*/)|(/\* ?\n \* Hibernate, Relational Persistence for Idiomatic Java\n \* ?\n \* JBoss, Home of Professional Open Source\n \* Copyright \d{4} Red Hat Inc. and/or its affiliates and other contributors\n \* as indicated by the @authors tag. All rights reserved.\n \* See the copyright.txt in the distribution for a\n \* full listing of individual contributors.\n \*\n \* This copyrighted material is made available to anyone wishing to use,\n \* modify, copy, or redistribute it subject to the terms and conditions\n \* of the GNU Lesser General Public License, v. 2.1.\n \* This program is distributed in the hope that it will be useful, but WITHOUT A\n \* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A\n \* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.\n \* You should have received a copy of the GNU Lesser General Public License,\n \* v.2.1 along with this distribution; if not, write to the Free Software\n \* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n \* MA 02110-1301, USA.\n \*/)|(/\*\n \* Hibernate, Relational Persistence for Idiomatic Java\n \*\n \* JBoss, Home of Professional Open Source\n \* Copyright \d{4}(-\d{4})? Red Hat Inc. and/or its affiliates and other contributors\n \* as indicated by the @authors tag. All rights reserved.\n \* See the copyright.txt in the distribution for a\n \* full listing of individual contributors.\n \*\n \* This copyrighted material is made available to anyone wishing to use,\n \* modify, copy, or redistribute it subject to the terms and conditions\n \* of the GNU Lesser General Public License, v. 2.1.\n \* This program is distributed in the hope that it will be useful, but WITHOUT A\n \* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A\n \* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.\n \* You should have received a copy of the GNU Lesser General Public License,\n \* v.2.1 along with this distribution; if not, write to the Free Software\n \* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n \* MA 02110-1301, USA.\n \*/)|(/\* ?\n \* JBoss, Home of Professional Open Source\n \* Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors\n \* as indicated by the @authors tag. All rights reserved.\n \* See the copyright.txt in the distribution for a\n \* full listing of individual contributors.\n \*\n \* This copyrighted material is made available to anyone wishing to use,\n \* modify, copy, or redistribute it subject to the terms and conditions\n \* of the GNU Lesser General Public License, v. 2.1.\n \* This program is distributed in the hope that it will be useful, but WITHOUT A\n \* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A\n \* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.\n \* You should have received a copy of the GNU Lesser General Public License,\n \* v.2.1 along with this distribution; if not, write to the Free Software\n \* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n \* MA 02110-1301, USA.\n \*/)" />
-            <property name="message" value="Correct header not found" />
-        </module>
--->
-        <module name="RegexpSinglelineJava">
-            <property name="ignoreComments" value="true" />
-            <property name="format" value="^\t* +\t*\S" />
-            <property name="message" value="Line has leading space characters; indentation should be performed with tabs only." />
-        </module>
-
-<!--
-    For now this is disabled to minimize false conflicts with metamodel branch.
-
-        <module name="RegexpSinglelineJava">
-            <property name="ignoreComments" value="true" />
-            <property name="format" value="\s+$" />
-            <property name="message" value="White spaces at the end of line" />
-        </module>
--->
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Annotation checks
-
-            See http://checkstyle.sourceforge.net/config_annotation.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="MissingDeprecated" />
-        <module name="MissingOverride" />
-        <module name="PackageAnnotation" />
-
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Block checks
-
-            See http://checkstyle.sourceforge.net/config_blocks.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="AvoidNestedBlocks">
-            <property name="allowInSwitchCase" value="true" />
-            <property name="severity" value="warning" />
-        </module>
-        <module name="NeedBraces" />
-        <module name="LeftCurly">
-            <property name="option" value="eol" />
-        </module>
-        <module name="RightCurly">
-            <property name="option" value="alone" />
-        </module>
-
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Design checks
-
-            See http://checkstyle.sourceforge.net/config_design.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="HideUtilityClassConstructor" />
-        <module name="MutableException" />
-
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Coding checks
-
-            See http://checkstyle.sourceforge.net/config_coding.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="EmptyStatement" />
-        <module name="EqualsHashCode" />
-        <module name="FinalLocalVariable" />
-        <module name="MissingSwitchDefault" />
-        <module name="ModifiedControlVariable" />
-        <module name="SimplifyBooleanExpression" />
-        <module name="SimplifyBooleanReturn" />
-        <module name="StringLiteralEquality" />
-        <module name="NoFinalizer" />
-        <module name="ExplicitInitialization" />
-        <module name="MissingSwitchDefault" />
-        <module name="DefaultComesLast" />
-        <module name="FallThrough" />
-        <module name="OneStatementPerLine" />
-
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Import checks
-
-            See http://checkstyle.sourceforge.net/config_imports.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="AvoidStarImport" />
-        <module name="RedundantImport" />
-        <module name="UnusedImports" />
-
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Javadoc checks
-
-            See http://checkstyle.sourceforge.net/config_javadoc.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="JavadocType">
-            <property name="scope" value="public"/>
-            <property name="allowUnknownTags" value="true" />
-            <property name="allowMissingParamTags" value="true" />
-        </module>
-        <module name="JavadocMethod">
-            <property name="scope" value="public" />
-            <property name="allowUndeclaredRTE" value="true" />
-            <property name="allowMissingPropertyJavadoc" value="true" />
-        </module>
-        <module name="JavadocVariable">
-            <property name="scope" value="public" />
-        </module>
-        <module name="JavadocStyle">
-            <property name="scope" value="public" />
-            <property name="checkEmptyJavadoc" value="true" />
-            <property name="checkFirstSentence" value="false" />
-        </module>
-
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Misc checks
-
-            See http://checkstyle.sourceforge.net/config_misc.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="UpperEll" />
-        <module name="ArrayTypeStyle" />
-        <module name="TrailingComment">
-            <property name="severity" value="warning" />
-        </module>
-
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Modifier checks
-
-            See http://checkstyle.sourceforge.net/config_modifier.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="ModifierOrder"/>
-
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Naming checks
-
-            See http://checkstyle.sourceforge.net/config_naming.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="AbstractClassName">
-            <!-- we are just using this to make sure that classes matching the pattern (Abstract*) have the abstract modifier -->
-            <property name="format" value="^Abstract.*$" />
-            <property name="ignoreName" value="true" />
-        </module>
-        <module name="ClassTypeParameterName" />
-        <module name="ConstantName">
-            <property name="format" value="^[A-Z](_?[A-Z0-9]+)*$|log" />
-        </module>
-        <module name="LocalFinalVariableName" >
-            <property name="severity" value="warning" />
-        </module>
-        <module name="LocalVariableName" />
-        <module name="MemberName" />
-        <!--
-        The org.hibernate.engine.spi.ManagedEntity method names (prefixed with '&&_') muck with this
-        <module name="MethodName" />
-        -->
-        <module name="MethodTypeParameterName" />
-        <module name="PackageName" />
-        <module name="ParameterName" />
-        <module name="StaticVariableName" />
-        <module name="TypeName" />
-
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Whitespace checks
-
-            See http://checkstyle.sourceforge.net/config_whitespace.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="MethodParamPad" />
-        <module name="TypecastParenPad" />
-        <module name="ParenPad">
-            <property name="tokens" value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL" />
-            <property name="option" value="space" />
-        </module>
-
-    </module>
-
-
-    <!--
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        Javadoc checks
-
-        See http://checkstyle.sourceforge.net/config_javadoc.html
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    -->
-    <module name="JavadocPackage">
-        <property name="allowLegacy" value="true" />
-    </module>
-
-
-    <!--
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        Misc checks
-
-        See http://checkstyle.sourceforge.net/config_misc.html
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    -->
-    <module name="NewlineAtEndOfFile" />
-
-</module>
diff --git a/shared/config/checkstyle/checkstyle.xml b/shared/config/checkstyle/checkstyle.xml
index dd6ee0527b..8b54c8e592 100644
--- a/shared/config/checkstyle/checkstyle.xml
+++ b/shared/config/checkstyle/checkstyle.xml
@@ -25,6 +25,14 @@
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 <module name="Checker">
 
+    <module name="FileContentsHolder"/>
+
+    <module name="SuppressionCommentFilter">
+        <property name="offCommentFormat" value="CHECKSTYLE:START_ALLOW_FINALIZER"/>
+        <property name="onCommentFormat" value="CHECKSTYLE:END_ALLOW_FINALIZER"/>
+        <property name="checkFormat" value="NoFinalizer"/>
+    </module>
+
     <!-- See http://checkstyle.sourceforge.net/checks.html for details of the various checks -->
 
     <module name="TreeWalker">
diff --git a/shared/config/checkstyle/todo-checks.xml b/shared/config/checkstyle/todo-checks.xml
deleted file mode 100644
index 9ba45b4189..0000000000
--- a/shared/config/checkstyle/todo-checks.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module name="Checker">
-    <!--
-        Used to collect "todo" comments into a single location
-    -->
-    <module name="TreeWalker">
-        <module name="TodoComment">
-            <property name="format" value="[Tt][Oo][Dd][Oo]"/>
-            <property name="severity" value="info" />
-        </module>
-    </module>
-</module>
\ No newline at end of file