HHH-8741 - More checkstyle cleanups

hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java

@@ -32,21 +32,21 @@ import javax.sql.DataSource;
 
 import com.mchange.v2.c3p0.DataSources;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.HibernateException;
-import org.hibernate.cfg.Environment;
-import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
-import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.service.UnknownUnwrapTypeException;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
+import org.hibernate.cfg.Environment;
+import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.internal.util.config.ConfigurationHelper;
+import org.hibernate.service.UnknownUnwrapTypeException;
 import org.hibernate.service.spi.Configurable;
 import org.hibernate.service.spi.ServiceRegistryAwareService;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.service.spi.Stoppable;
 
+import org.jboss.logging.Logger;
+
 /**
  * A connection provider that uses a C3P0 connection pool. Hibernate will use this by
  * default if the <tt>hibernate.c3p0.*</tt> properties are set.

hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java

@@ -25,13 +25,13 @@ package org.hibernate.c3p0.internal;
 
 import java.sql.SQLException;
 
+import org.hibernate.internal.CoreMessageLogger;
+
 import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageLogger;
 
-import org.hibernate.internal.CoreMessageLogger;
-
 import static org.jboss.logging.Logger.Level.INFO;
 import static org.jboss.logging.Logger.Level.WARN;
 

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java

@@ -28,11 +28,12 @@ import java.util.Set;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
+import org.hibernate.c3p0.internal.C3P0ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.spi.JdbcServices;
+
 import org.junit.Test;
 
-import org.hibernate.c3p0.internal.C3P0ConnectionProvider;
-import org.hibernate.engine.jdbc.spi.JdbcServices;
-import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
 import static org.junit.Assert.assertEquals;

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java

@@ -23,11 +23,13 @@
  */
 package org.hibernate.test.c3p0;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.validator.constraints.NotBlank;
 
-import javax.persistence.*;
-
 /**
  * A testing entity for cases where the entity definition itself is irrelevant (testing JDBC connection semantics, etc).
  *

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java

@@ -23,13 +23,16 @@
  */
 package org.hibernate.test.c3p0;
 
+import java.util.List;
+
 import org.hibernate.Criteria;
 import org.hibernate.Session;
+
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.*;
-
-import java.util.List;
 
 /**
  * Tests that when using cached prepared statement with batching enabled doesn't bleed over into new transactions. 

hibernate-core/src/main/java/org/hibernate/AssertionFailure.java

@@ -23,10 +23,10 @@
  */
 package org.hibernate;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * Indicates failure of an assertion: a possible bug in Hibernate.
  *

hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java

@@ -23,10 +23,10 @@
  */
 package org.hibernate;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * Indicates an attempt to access not-yet-fetched data outside of a session context.
  *

hibernate-core/src/main/java/org/hibernate/MultiTenancyStrategy.java

@@ -25,11 +25,11 @@ package org.hibernate;
 
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.cfg.Environment;
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * Describes the methods for multi-tenancy understood by Hibernate.
  *

hibernate-core/src/main/java/org/hibernate/SessionFactory.java

@@ -27,7 +27,6 @@ import java.io.Serializable;
 import java.sql.Connection;
 import java.util.Map;
 import java.util.Set;
-
 import javax.naming.Referenceable;
 
 import org.hibernate.boot.registry.StandardServiceRegistry;

hibernate-core/src/main/java/org/hibernate/Version.java

@@ -23,10 +23,10 @@
  */
 package org.hibernate;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * Information about the Hibernate version.
  *

hibernate-core/src/main/java/org/hibernate/action/internal/UnresolvedEntityInsertActions.java

@@ -33,8 +33,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.PropertyValueException;
 import org.hibernate.TransientPropertyValueException;
 import org.hibernate.engine.internal.NonNullableTransientDependencies;
@@ -45,6 +43,8 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.collections.IdentitySet;
 import org.hibernate.pretty.MessageHelper;
 
+import org.jboss.logging.Logger;
+
 /**
  * Tracks unresolved entity insert actions.
  *

hibernate-core/src/main/java/org/hibernate/annotations/ColumnDefault.java

@@ -24,7 +24,6 @@
 package org.hibernate.annotations;
 
 import java.lang.annotation.Retention;
-
 import java.lang.annotation.Target;
 
 import static java.lang.annotation.ElementType.FIELD;

hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java

@@ -23,9 +23,9 @@
  */
 package org.hibernate.annotations;
 
+import java.lang.annotation.Retention;
 import javax.persistence.Column;
 import javax.persistence.FetchType;
-import java.lang.annotation.Retention;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

hibernate-core/src/main/java/org/hibernate/annotations/SqlFragmentAlias.java

@@ -23,13 +23,13 @@
  */
 package org.hibernate.annotations;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
 /**
  * Describe aliases for filters.
  *

hibernate-core/src/main/java/org/hibernate/boot/registry/internal/BootstrapServiceRegistryImpl.java

@@ -25,8 +25,6 @@ package org.hibernate.boot.registry.internal;
 
 import java.util.LinkedHashSet;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
 import org.hibernate.boot.registry.classloading.internal.ClassLoaderServiceImpl;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
@@ -44,6 +42,8 @@ import org.hibernate.service.spi.ServiceInitiator;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 import org.hibernate.service.spi.Stoppable;
 
+import org.jboss.logging.Logger;
+
 /**
  * {@link ServiceRegistry} implementation containing specialized "bootstrap" services, specifically:<ul>
  *     <li>{@link ClassLoaderService}</li>

hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java

@@ -96,6 +96,7 @@ import org.hibernate.engine.transaction.spi.TransactionFactory;
 import org.hibernate.hql.spi.MultiTableBulkIdStrategy;
 import org.hibernate.hql.spi.PersistentTableBulkIdStrategy;
 import org.hibernate.hql.spi.TemporaryTableBulkIdStrategy;
+
 import org.jboss.logging.Logger;
 
 /**

hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorImpl.java

@@ -27,13 +27,13 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.boot.registry.selector.spi.StrategySelectionException;
 import org.hibernate.boot.registry.selector.spi.StrategySelector;
 
+import org.jboss.logging.Logger;
+
 /**
  * Standard implementation of the StrategySelector contract.
  *

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/Enhancer.java

@@ -23,12 +23,6 @@
  */
 package org.hibernate.bytecode.enhance.spi;
 
-import javax.persistence.ElementCollection;
-import javax.persistence.Embedded;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.Transient;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -36,6 +30,12 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.IdentityHashMap;
 import java.util.List;
+import javax.persistence.ElementCollection;
+import javax.persistence.Embedded;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.Transient;
 
 import javassist.CannotCompileException;
 import javassist.ClassPool;

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

@@ -26,8 +26,6 @@ package org.hibernate.bytecode.internal.javassist;
 import java.lang.reflect.Modifier;
 import java.util.Set;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.bytecode.buildtime.spi.ClassFilter;
 import org.hibernate.bytecode.buildtime.spi.FieldFilter;
 import org.hibernate.bytecode.instrumentation.internal.javassist.JavassistHelper;
@@ -42,6 +40,8 @@ import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.StringHelper;
 
+import org.jboss.logging.Logger;
+
 /**
  * Bytecode provider implementation for Javassist.
  *

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

@@ -33,13 +33,14 @@ import java.security.ProtectionDomain;
 import javassist.ClassClassPath;
 import javassist.ClassPool;
 import javassist.bytecode.ClassFile;
-import org.jboss.logging.Logger;
 
 import org.hibernate.HibernateException;
 import org.hibernate.bytecode.buildtime.spi.ClassFilter;
 import org.hibernate.bytecode.spi.AbstractClassTransformerImpl;
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * Enhance the classes allowing them to implements InterceptFieldEnabled
  * This interface is then used by Hibernate for some optimizations.

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

@@ -26,8 +26,6 @@ package org.hibernate.cache.internal;
 import java.io.Serializable;
 import java.util.Set;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.cache.spi.CacheKey;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -46,6 +44,8 @@ import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.service.spi.SessionFactoryServiceRegistry;
 
+import org.jboss.logging.Logger;
+
 /**
  * Allows the collection cache to be automatically evicted if an element is inserted/removed/updated *without* properly
  * managing both sides of the association (ie, the ManyToOne collection is changed w/o properly managing the OneToMany).

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

@@ -34,6 +34,7 @@ import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
+
 import org.jboss.logging.Logger;
 
 /**

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

@@ -30,8 +30,6 @@ import java.util.Properties;
 import java.util.Set;
 import javax.persistence.EntityNotFoundException;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.HibernateException;
 import org.hibernate.UnresolvableObjectException;
 import org.hibernate.cache.CacheException;
@@ -45,6 +43,8 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.type.Type;
 import org.hibernate.type.TypeHelper;
 
+import org.jboss.logging.Logger;
+
 /**
  * The standard implementation of the Hibernate QueryCache interface.  This
  * implementation is very good at recognizing stale query results and

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

@@ -27,14 +27,14 @@ import java.io.Serializable;
 import java.util.Properties;
 import java.util.Set;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.cache.CacheException;
 import org.hibernate.cfg.Settings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * Tracks the timestamps of the most recent updates to particular tables. It is
  * important that the cache timeout of the underlying cache implementation be set

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

@@ -23,6 +23,8 @@
  */
 package org.hibernate.cfg;
 
+import java.util.HashMap;
+import java.util.Map;
 import javax.persistence.AssociationOverride;
 import javax.persistence.AssociationOverrides;
 import javax.persistence.AttributeOverride;
@@ -33,10 +35,6 @@ import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.MappedSuperclass;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.logging.Logger;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
@@ -47,6 +45,8 @@ import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.type.PrimitiveWrapperHelper;
 
+import org.jboss.logging.Logger;
+
 /**
  * No idea.
  *

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

@@ -35,7 +35,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-
 import javax.persistence.Basic;
 import javax.persistence.Cacheable;
 import javax.persistence.CollectionTable;
@@ -135,7 +134,6 @@ import org.hibernate.annotations.Tuplizers;
 import org.hibernate.annotations.TypeDef;
 import org.hibernate.annotations.TypeDefs;
 import org.hibernate.annotations.Where;
-import org.hibernate.annotations.common.reflection.ClassLoaderDelegate;
 import org.hibernate.annotations.common.reflection.ClassLoadingException;
 import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.annotations.common.reflection.XAnnotatedElement;
@@ -178,6 +176,7 @@ import org.hibernate.mapping.SingleTableSubclass;
 import org.hibernate.mapping.Subclass;
 import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.UnionSubclass;
+
 import org.jboss.logging.Logger;
 
 /**

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

@@ -28,12 +28,12 @@ import java.io.InputStream;
 import java.net.URL;
 import java.util.Properties;
 
-import org.dom4j.Document;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
 import org.hibernate.MappingException;
 
+import org.dom4j.Document;
+
 /**
  * Similar to the {@link Configuration} object but handles EJB3 and Hibernate
  * specific annotations as a metadata facility.

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

@@ -23,16 +23,16 @@
  */
 package org.hibernate.cfg;
 
-import javax.persistence.AttributeConverter;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
-
+import javax.persistence.AttributeConverter;
-import org.jboss.logging.Logger;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 
+import org.jboss.logging.Logger;
+
 /**
  * @author Steve Ebersole
  */

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

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -33,8 +34,6 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
@@ -67,6 +66,8 @@ import org.hibernate.mapping.Table;
 import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.Value;
 
+import org.jboss.logging.Logger;
+
 /**
  * @author Emmanuel Bernard
  */

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

@@ -23,11 +23,11 @@
  */
 package org.hibernate.cfg;
 
+import java.util.HashMap;
+import java.util.Map;
 import javax.persistence.Convert;
 import javax.persistence.Converts;
 import javax.persistence.JoinTable;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.hibernate.annotations.common.AssertionFailure;
 import org.hibernate.annotations.common.reflection.XClass;

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

@@ -23,6 +23,8 @@
  */
 package org.hibernate.cfg;
 
+import java.util.HashMap;
+import java.util.Map;
 import javax.persistence.Convert;
 import javax.persistence.Converts;
 import javax.persistence.Enumerated;
@@ -34,9 +36,6 @@ import javax.persistence.MapKeyTemporal;
 import javax.persistence.OneToMany;
 import javax.persistence.Temporal;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.CollectionType;
 import org.hibernate.annotations.ManyToAny;

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

@@ -22,12 +22,11 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg;
+
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.MappingException;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.mapping.Collection;
@@ -36,6 +35,8 @@ import org.hibernate.mapping.OneToMany;
 import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.Value;
 
+import org.jboss.logging.Logger;
+
 /**
  * Collection second pass
  *

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

@@ -22,6 +22,10 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import javax.persistence.Column;
 import javax.persistence.Convert;
 import javax.persistence.Converts;
@@ -30,10 +34,6 @@ import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.hibernate.AnnotationException;
 import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.annotations.common.reflection.XProperty;

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

@@ -51,17 +51,12 @@ import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
-
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.MapsId;
 
-import org.dom4j.Attribute;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.Element;
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.DuplicateMappingException;
@@ -157,7 +152,13 @@ import org.hibernate.type.Type;
 import org.hibernate.type.TypeResolver;
 import org.hibernate.usertype.CompositeUserType;
 import org.hibernate.usertype.UserType;
+
 import org.jboss.logging.Logger;
+
+import org.dom4j.Attribute;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 

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

@@ -22,12 +22,11 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg;
+
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
@@ -38,6 +37,8 @@ import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.SimpleValue;
 
+import org.jboss.logging.Logger;
+
 /**
  * @author Emmanuel Bernard
  */

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

@@ -25,13 +25,14 @@ package org.hibernate.cfg;
 
 import java.io.InputStream;
 
-import org.jboss.logging.Logger;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.xml.DTDEntityResolver;
 
+import org.jboss.logging.Logger;
+
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+
 /**
  * Resolve JPA xsd files locally
  * Hibernate OGM uses this class, consider this some kind of exposed service at the SPI level

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

@@ -25,8 +25,6 @@ package org.hibernate.cfg;
 
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.ColumnDefault;
@@ -43,6 +41,8 @@ import org.hibernate.mapping.Join;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
 
+import org.jboss.logging.Logger;
+
 /**
  * Wrap state of an EJB3 @Column annotation
  * and build the Hibernate column mapping element

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

@@ -38,6 +38,7 @@ import org.hibernate.bytecode.spi.BytecodeProvider;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ConfigHelper;
 import org.hibernate.internal.util.config.ConfigurationHelper;
+
 import org.jboss.logging.Logger;
 
 

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

@@ -30,10 +30,6 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import org.dom4j.Attribute;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.jboss.logging.Logger;
 import org.hibernate.CacheMode;
 import org.hibernate.EntityMode;
 import org.hibernate.FetchMode;
@@ -97,13 +93,17 @@ import org.hibernate.mapping.UniqueKey;
 import org.hibernate.mapping.Value;
 import org.hibernate.tuple.GeneratedValueGeneration;
 import org.hibernate.tuple.GenerationTiming;
-import org.hibernate.tuple.ValueGeneration;
-import org.hibernate.tuple.ValueGenerator;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.DiscriminatorType;
 import org.hibernate.type.ForeignKeyDirection;
 import org.hibernate.type.Type;
 
+import org.jboss.logging.Logger;
+
+import org.dom4j.Attribute;
+import org.dom4j.Document;
+import org.dom4j.Element;
+
 /**
  * Walks an XML mapping document and produces the Hibernate configuration-time metamodel (the
  * classes in the <tt>mapping</tt> package)

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

@@ -22,16 +22,11 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg;
-import java.util.ArrayList;
+
-import java.util.List;
 import java.util.Map;
-import java.util.StringTokenizer;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.MappingException;
-import org.hibernate.internal.util.StringHelper;
-import org.hibernate.internal.util.collections.ArrayHelper;
-import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Table;
 

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

@@ -23,7 +23,6 @@
  */
 package org.hibernate.cfg;
 
-import javax.persistence.AttributeConverter;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;

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

@@ -27,10 +27,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.dom4j.Attribute;
-import org.dom4j.Element;
-import org.jboss.logging.Logger;
-
 import org.hibernate.CacheMode;
 import org.hibernate.FlushMode;
 import org.hibernate.MappingException;
@@ -40,6 +36,11 @@ import org.hibernate.engine.spi.NamedSQLQueryDefinitionBuilder;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.StringHelper;
 
+import org.jboss.logging.Logger;
+
+import org.dom4j.Attribute;
+import org.dom4j.Element;
+
 /**
  * @author Emmanuel Bernard
  */

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

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg;
+
 import java.util.Iterator;
 import java.util.Map;
 
@@ -39,7 +40,6 @@ import org.hibernate.mapping.ManyToOne;
 import org.hibernate.mapping.OneToOne;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
-import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.type.ForeignKeyDirection;
 

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

@@ -38,8 +38,6 @@ import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Transient;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.AnnotationException;
 import org.hibernate.MappingException;
 import org.hibernate.annotations.ManyToAny;
@@ -50,6 +48,8 @@ import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.StringHelper;
 
+import org.jboss.logging.Logger;
+
 /**
  * A helper class to keep the {@code XProperty}s of a class ordered by access type.
  *

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

@@ -22,7 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg;
-import javax.persistence.AttributeConverter;
+
 import javax.persistence.Column;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;

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

@@ -32,8 +32,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.dom4j.Element;
-
 import org.hibernate.LockMode;
 import org.hibernate.MappingException;
 import org.hibernate.engine.ResultSetMappingDefinition;
@@ -50,6 +48,8 @@ import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.Value;
 import org.hibernate.type.Type;
 
+import org.dom4j.Element;
+
 /**
  * @author Emmanuel Bernard
  */

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

@@ -22,13 +22,14 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg;
-import java.util.Map;
 
-import org.dom4j.Element;
+import java.util.Map;
 
 import org.hibernate.MappingException;
 import org.hibernate.engine.ResultSetMappingDefinition;
 
+import org.dom4j.Element;
+
 /**
  * @author Emmanuel Bernard
  */

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

@@ -27,22 +27,24 @@ import java.io.Serializable;
 import java.util.Map;
 import java.util.Properties;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.EntityMode;
 import org.hibernate.HibernateException;
 import org.hibernate.MultiTenancyStrategy;
 import org.hibernate.NullPrecedence;
 import org.hibernate.SessionEventListener;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.selector.spi.StrategySelector;
 import org.hibernate.cache.internal.NoCachingRegionFactory;
 import org.hibernate.cache.internal.RegionFactoryInitiator;
 import org.hibernate.cache.internal.StandardQueryCacheFactory;
 import org.hibernate.cache.spi.QueryCacheFactory;
 import org.hibernate.cache.spi.RegionFactory;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
 import org.hibernate.engine.jdbc.spi.ExtractedDatabaseMetaData;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
 import org.hibernate.engine.transaction.spi.TransactionFactory;
 import org.hibernate.hql.spi.MultiTableBulkIdStrategy;
 import org.hibernate.hql.spi.PersistentTableBulkIdStrategy;
@@ -53,12 +55,10 @@ import org.hibernate.internal.util.StringHelper;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.loader.BatchFetchStyle;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
-import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
-import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
 import org.hibernate.tuple.entity.EntityTuplizerFactory;
 
+import org.jboss.logging.Logger;
+
 /**
  * Reads configuration properties and builds a {@link Settings} instance.
  *

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

@@ -23,15 +23,11 @@
  */
 package org.hibernate.cfg.annotations;
 
-import static org.hibernate.cfg.BinderHelper.toAliasEntityMap;
-import static org.hibernate.cfg.BinderHelper.toAliasTableMap;
-
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
-
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
 import javax.persistence.ElementCollection;
@@ -115,8 +111,12 @@ import org.hibernate.mapping.Property;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.TypeDef;
+
 import org.jboss.logging.Logger;
 
+import static org.hibernate.cfg.BinderHelper.toAliasEntityMap;
+import static org.hibernate.cfg.BinderHelper.toAliasTableMap;
+
 /**
  * Base class for binding different types of collections to Hibernate configuration objects.
  *

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

@@ -23,14 +23,10 @@
  */
 package org.hibernate.cfg.annotations;
 
-import static org.hibernate.cfg.BinderHelper.toAliasEntityMap;
-import static org.hibernate.cfg.BinderHelper.toAliasTableMap;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.persistence.Access;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
@@ -87,7 +83,6 @@ import org.hibernate.cfg.ObjectNameSource;
 import org.hibernate.cfg.PropertyHolder;
 import org.hibernate.cfg.UniqueConstraintHolder;
 import org.hibernate.engine.OptimisticLockStyle;
-import org.hibernate.engine.internal.Versioning;
 import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle;
 import org.hibernate.engine.spi.FilterDefinition;
 import org.hibernate.internal.CoreMessageLogger;
@@ -101,8 +96,12 @@ import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.TableOwner;
 import org.hibernate.mapping.Value;
+
 import org.jboss.logging.Logger;
 
+import static org.hibernate.cfg.BinderHelper.toAliasEntityMap;
+import static org.hibernate.cfg.BinderHelper.toAliasTableMap;
+
 
 /**
  * Stateful holder and processor for binding Entity information

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

@@ -25,8 +25,6 @@ package org.hibernate.cfg.annotations;
 
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.AnnotationException;
 import org.hibernate.MappingException;
 import org.hibernate.annotations.OrderBy;
@@ -49,6 +47,8 @@ import org.hibernate.mapping.OneToMany;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.SimpleValue;
 
+import org.jboss.logging.Logger;
+
 /**
  * Bind a list to the underlying Hibernate configuration
  *

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

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg.annotations;
+
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -47,7 +48,6 @@ import org.hibernate.cfg.Ejb3Column;
 import org.hibernate.cfg.Ejb3JoinColumn;
 import org.hibernate.cfg.Mappings;
 import org.hibernate.cfg.PropertyData;
-import org.hibernate.cfg.PropertyHolder;
 import org.hibernate.cfg.PropertyHolderBuilder;
 import org.hibernate.cfg.PropertyPreloadedData;
 import org.hibernate.cfg.SecondPass;

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

@@ -23,15 +23,15 @@
  */
 package org.hibernate.cfg.annotations;
 
-import javax.persistence.NamedStoredProcedureQuery;
-import javax.persistence.ParameterMode;
-import javax.persistence.StoredProcedureParameter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.persistence.NamedStoredProcedureQuery;
+import javax.persistence.ParameterMode;
+import javax.persistence.StoredProcedureParameter;
 
 import org.hibernate.MappingException;
 import org.hibernate.engine.ResultSetMappingDefinition;
@@ -40,9 +40,9 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.SessionFactoryImpl;
 import org.hibernate.internal.util.StringHelper;
 import org.hibernate.procedure.ProcedureCallMemento;
-import org.hibernate.procedure.spi.ParameterStrategy;
 import org.hibernate.procedure.internal.ProcedureCallMementoImpl;
 import org.hibernate.procedure.internal.Util;
+import org.hibernate.procedure.spi.ParameterStrategy;
 
 import static org.hibernate.procedure.internal.ProcedureCallMementoImpl.ParameterMemento;
 

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

@@ -25,7 +25,6 @@ package org.hibernate.cfg.annotations;
 
 import java.lang.annotation.Annotation;
 import java.util.Map;
-
 import javax.persistence.EmbeddedId;
 import javax.persistence.Id;
 import javax.persistence.Lob;
@@ -62,6 +61,7 @@ import org.hibernate.tuple.AnnotationValueGeneration;
 import org.hibernate.tuple.GenerationTiming;
 import org.hibernate.tuple.ValueGeneration;
 import org.hibernate.tuple.ValueGenerator;
+
 import org.jboss.logging.Logger;
 
 /**

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

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg.annotations;
+
 import java.util.HashMap;
 import javax.persistence.NamedNativeQueries;
 import javax.persistence.NamedNativeQuery;
@@ -31,8 +32,6 @@ import javax.persistence.NamedStoredProcedureQuery;
 import javax.persistence.SqlResultSetMapping;
 import javax.persistence.SqlResultSetMappings;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.CacheMode;
@@ -52,6 +51,8 @@ import org.hibernate.engine.spi.NamedSQLQueryDefinition;
 import org.hibernate.engine.spi.NamedSQLQueryDefinitionBuilder;
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * Query binder
  *

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

@@ -36,8 +36,6 @@ import javax.persistence.EntityResult;
 import javax.persistence.FieldResult;
 import javax.persistence.SqlResultSetMapping;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.LockMode;
 import org.hibernate.MappingException;
 import org.hibernate.cfg.BinderHelper;
@@ -55,6 +53,8 @@ import org.hibernate.mapping.Property;
 import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.Value;
 
+import org.jboss.logging.Logger;
+
 /**
  * @author Emmanuel Bernard
  */

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

@@ -23,6 +23,10 @@
  */
 package org.hibernate.cfg.annotations;
 
+import java.io.Serializable;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Properties;
 import javax.persistence.Enumerated;
 import javax.persistence.Id;
 import javax.persistence.Lob;
@@ -30,12 +34,6 @@ import javax.persistence.MapKeyEnumerated;
 import javax.persistence.MapKeyTemporal;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-import java.io.Serializable;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Properties;
-
-import org.jboss.logging.Logger;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
@@ -72,6 +70,8 @@ import org.hibernate.type.StringNVarcharType;
 import org.hibernate.type.WrappedMaterializedBlobType;
 import org.hibernate.usertype.DynamicParameterizedType;
 
+import org.jboss.logging.Logger;
+
 /**
  * @author Emmanuel Bernard
  */

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

@@ -28,8 +28,6 @@ import java.util.Iterator;
 import java.util.List;
 import javax.persistence.UniqueConstraint;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
 import org.hibernate.annotations.Index;
@@ -56,6 +54,8 @@ import org.hibernate.mapping.Table;
 import org.hibernate.mapping.ToOne;
 import org.hibernate.mapping.Value;
 
+import org.jboss.logging.Logger;
+
 /**
  * Table related operations
  *

hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg.annotations.reflection;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
@@ -38,13 +39,13 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.SqlResultSetMapping;
 import javax.persistence.TableGenerator;
 
-import org.dom4j.Element;
-
 import org.hibernate.annotations.common.reflection.AnnotationReader;
 import org.hibernate.annotations.common.reflection.MetadataProvider;
 import org.hibernate.annotations.common.reflection.java.JavaMetadataProvider;
 import org.hibernate.internal.util.ReflectHelper;
 
+import org.dom4j.Element;
+
 /**
  * MetadataProvider aware of the JPA Deployment descriptor
  *

hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverriddenAnnotationReader.java

@@ -129,10 +129,6 @@ import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
 import javax.persistence.Version;
 
-import org.dom4j.Attribute;
-import org.dom4j.Element;
-import org.jboss.logging.Logger;
-
 import org.hibernate.AnnotationException;
 import org.hibernate.annotations.Any;
 import org.hibernate.annotations.Cascade;
@@ -147,6 +143,11 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.internal.util.StringHelper;
 
+import org.jboss.logging.Logger;
+
+import org.dom4j.Attribute;
+import org.dom4j.Element;
+
 /**
  * Encapsulates the overriding of Java annotations from an EJB 3.0 descriptor.
  *

hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java

@@ -26,18 +26,13 @@
 
 package org.hibernate.cfg.annotations.reflection;
 
-import javax.persistence.AccessType;
-import javax.persistence.AttributeConverter;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import javax.persistence.AccessType;
-import org.dom4j.Document;
+import javax.persistence.AttributeConverter;
-import org.dom4j.Element;
-
-import org.jboss.logging.Logger;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.cfg.AttributeConverterDefinition;
@@ -46,6 +41,11 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.internal.util.StringHelper;
 
+import org.jboss.logging.Logger;
+
+import org.dom4j.Document;
+import org.dom4j.Element;
+
 /**
  * @author Emmanuel Bernard
  * @author Brett Meyer

hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java

@@ -22,6 +22,7 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.cfg.beanvalidation;
+
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
@@ -33,8 +34,6 @@ import javax.validation.Validation;
 import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.EntityMode;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -47,6 +46,8 @@ import org.hibernate.event.spi.PreUpdateEventListener;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.persister.entity.EntityPersister;
 
+import org.jboss.logging.Logger;
+
 /**
  * Event listener used to enable Bean Validation for insert/update/delete events.
  *

hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java

@@ -27,17 +27,17 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Set;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.HibernateException;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.integrator.spi.Integrator;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.metamodel.source.MetadataImplementor;
-import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.service.spi.SessionFactoryServiceRegistry;
 
+import org.jboss.logging.Logger;
+
 /**
  * @author Steve Ebersole
  */

hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java

@@ -23,6 +23,15 @@
  */
 package org.hibernate.cfg.beanvalidation;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
 import javax.validation.Validation;
 import javax.validation.ValidatorFactory;
 import javax.validation.constraints.Digits;
@@ -33,17 +42,6 @@ import javax.validation.constraints.Size;
 import javax.validation.metadata.BeanDescriptor;
 import javax.validation.metadata.ConstraintDescriptor;
 import javax.validation.metadata.PropertyDescriptor;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.jboss.logging.Logger;
 
 import org.hibernate.AssertionFailure;
 import org.hibernate.MappingException;
@@ -63,6 +61,8 @@ import org.hibernate.mapping.Property;
 import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.SingleTableSubclass;
 
+import org.jboss.logging.Logger;
+
 /**
  * @author Emmanuel Bernard
  * @author Hardy Ferentschik

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

@@ -31,7 +31,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
-
 import javax.naming.NamingException;
 
 import org.hibernate.AssertionFailure;
@@ -54,6 +53,7 @@ import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.type.Type;
+
 import org.jboss.logging.Logger;
 
 /**

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

@@ -32,8 +32,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.internal.CoreMessageLogger;
@@ -41,6 +39,8 @@ import org.hibernate.loader.CollectionAliases;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.type.Type;
 
+import org.jboss.logging.Logger;
+
 /**
  * A persistent wrapper for an array. Lazy initialization
  * is NOT supported. Use of Hibernate arrays is not really

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

@@ -32,8 +32,6 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.dom4j.Element;
-
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SessionImplementor;
@@ -41,6 +39,8 @@ import org.hibernate.loader.CollectionAliases;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.type.Type;
 
+import org.dom4j.Element;
+
 /**
  * A persistent wrapper for an XML element
  *

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

@@ -34,8 +34,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.dom4j.Element;
-
 import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -45,6 +43,8 @@ import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.type.Type;
 import org.hibernate.type.XmlRepresentableType;
 
+import org.dom4j.Element;
+
 /**
  * A persistent wrapper for an XML element
  *

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

@@ -26,14 +26,14 @@ package org.hibernate.collection.internal;
 import java.io.Serializable;
 import java.util.List;
 
-import org.dom4j.Element;
-
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.type.IntegerType;
 import org.hibernate.type.Type;
 
+import org.dom4j.Element;
+
 /**
  * Wraps a collection of DOM sub-elements as a List
  *

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

@@ -26,14 +26,14 @@ package org.hibernate.collection.internal;
 import java.io.Serializable;
 import java.util.List;
 
-import org.dom4j.Element;
-
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.type.Type;
 import org.hibernate.type.XmlRepresentableType;
 
+import org.dom4j.Element;
+
 /**
  * Wraps a collection of DOM sub-elements as a Map
  *

hibernate-core/src/main/java/org/hibernate/context/internal/JTASessionContext.java

@@ -23,13 +23,11 @@
  */
 package org.hibernate.context.internal;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.transaction.Synchronization;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.jboss.logging.Logger;
 
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.HibernateException;
@@ -40,6 +38,8 @@ import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * An implementation of {@link org.hibernate.context.spi.CurrentSessionContext} which scopes the notion
  * of a current session to a JTA transaction.  Because JTA gives us a nice tie-in to clean up after

hibernate-core/src/main/java/org/hibernate/context/internal/ThreadLocalSessionContext.java

@@ -35,8 +35,6 @@ import java.util.HashMap;
 import java.util.Map;
 import javax.transaction.Synchronization;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.ConnectionReleaseMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
@@ -49,6 +47,8 @@ import org.hibernate.engine.transaction.spi.TransactionContext;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * A {@link org.hibernate.context.spi.CurrentSessionContext} impl which scopes the notion of current
  * session by the current thread of execution.  Unlike the JTA counterpart, threads do not give us a nice

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

@@ -26,8 +26,6 @@ package org.hibernate.dialect;
 import java.lang.reflect.Method;
 import java.sql.Types;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.MappingException;
 import org.hibernate.dialect.function.AnsiTrimFunction;
 import org.hibernate.dialect.function.DerbyConcatFunction;
@@ -36,6 +34,8 @@ import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.sql.CaseFragment;
 import org.hibernate.sql.DerbyCaseFragment;
 
+import org.jboss.logging.Logger;
+
 /**
  * Hibernate Dialect for Cloudscape 10 - aka Derby. This implements both an
  * override for the identity column generator as well as for the case statement

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

@@ -92,6 +92,7 @@ import org.hibernate.sql.JoinFragment;
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.descriptor.sql.ClobTypeDescriptor;
 import org.hibernate.type.descriptor.sql.SqlTypeDescriptor;
+
 import org.jboss.logging.Logger;
 
 /**

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

@@ -23,6 +23,9 @@
  */
 package org.hibernate.dialect;
 
+import java.sql.SQLException;
+import java.sql.Types;
+
 import org.hibernate.JDBCException;
 import org.hibernate.PessimisticLockException;
 import org.hibernate.cfg.AvailableSettings;
@@ -39,10 +42,8 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.JdbcExceptionHelper;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.type.StandardBasicTypes;
-import org.jboss.logging.Logger;
 
-import java.sql.SQLException;
+import org.jboss.logging.Logger;
-import java.sql.Types;
 
 /**
  * A dialect compatible with the H2 database.

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

@@ -51,6 +51,7 @@ import org.hibernate.internal.util.JdbcExceptionHelper;
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.persister.entity.Lockable;
 import org.hibernate.type.StandardBasicTypes;
+
 import org.jboss.logging.Logger;
 
 /**

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

@@ -28,8 +28,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.cfg.Environment;
 import org.hibernate.dialect.function.NoArgSQLFunction;
 import org.hibernate.dialect.function.NvlFunction;
@@ -42,6 +40,8 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.JdbcExceptionHelper;
 import org.hibernate.type.StandardBasicTypes;
 
+import org.jboss.logging.Logger;
+
 /**
  * An SQL dialect for Oracle 9 (uses ANSI-style syntax where possible).
  *

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

@@ -22,9 +22,8 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.dialect;
-import java.sql.Types;
 
-import org.jboss.logging.Logger;
+import java.sql.Types;
 
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.sql.CaseFragment;
@@ -32,6 +31,8 @@ import org.hibernate.sql.DecodeCaseFragment;
 import org.hibernate.sql.JoinFragment;
 import org.hibernate.sql.OracleJoinFragment;
 
+import org.jboss.logging.Logger;
+
 /**
  * An SQL dialect for Oracle, compatible with Oracle 8.
  *

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

@@ -23,12 +23,12 @@
  */
 package org.hibernate.dialect;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.HibernateException;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ReflectHelper;
 
+import org.jboss.logging.Logger;
+
 /**
  * A Helper for dealing with the OracleTypes class
  *

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

@@ -25,8 +25,6 @@ package org.hibernate.dialect;
 
 import java.sql.Types;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.LockMode;
 import org.hibernate.dialect.function.NoArgSQLFunction;
 import org.hibernate.dialect.function.SQLFunctionTemplate;
@@ -45,6 +43,8 @@ import org.hibernate.sql.CaseFragment;
 import org.hibernate.sql.DecodeCaseFragment;
 import org.hibernate.type.StandardBasicTypes;
 
+import org.jboss.logging.Logger;
+
 /**
  * This is the Hibernate dialect for the Unisys 2200 Relational Database (RDMS).
  * This dialect was developed for use with Hibernate 3.0.5. Other versions may

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

@@ -22,14 +22,15 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.dialect.function;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * Delegate for handling function "templates".
  *

hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java

@@ -27,8 +27,6 @@ import java.io.Serializable;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 import org.hibernate.LockMode;
@@ -40,6 +38,8 @@ import org.hibernate.persister.entity.Lockable;
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.sql.Update;
 
+import org.jboss.logging.Logger;
+
 /**
  * A pessimistic locking strategy where the locks are obtained through update statements.
  * <p/>

hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java

@@ -27,8 +27,6 @@ import java.io.Serializable;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 import org.hibernate.LockMode;
@@ -40,6 +38,8 @@ import org.hibernate.persister.entity.Lockable;
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.sql.Update;
 
+import org.jboss.logging.Logger;
+
 /**
  * A pessimistic locking strategy where the locks are obtained through update statements.
  * <p/>

hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java

@@ -27,8 +27,6 @@ import java.io.Serializable;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.HibernateException;
 import org.hibernate.JDBCException;
 import org.hibernate.LockMode;
@@ -40,6 +38,8 @@ import org.hibernate.persister.entity.Lockable;
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.sql.Update;
 
+import org.jboss.logging.Logger;
+
 /**
  * A locking strategy where the locks are obtained through update statements.
  * <p/>

hibernate-core/src/main/java/org/hibernate/engine/config/internal/ConfigurationServiceImpl.java

@@ -26,15 +26,15 @@ package org.hibernate.engine.config.internal;
 import java.util.Collections;
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
-import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.service.spi.ServiceRegistryAwareService;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
+import org.jboss.logging.Logger;
+
 /**
  * The standard ConfigurationService implementation
  *

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

@@ -39,6 +39,7 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.pretty.MessageHelper;
 import org.hibernate.type.CollectionType;
+
 import org.jboss.logging.Logger;
 
 /**

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

@@ -29,12 +29,12 @@ import java.io.ObjectOutputStream;
 import java.util.IdentityHashMap;
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.LockMode;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.ManagedEntity;
 
+import org.jboss.logging.Logger;
+
 /**
  * Defines a context for maintaining the relation between an entity associated with the Session ultimately owning this
  * EntityEntryContext instance and that entity's corresponding EntityEntry.  2 approaches are supported:<ul>

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

@@ -31,8 +31,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.AssertionFailure;
 import org.hibernate.cache.spi.NaturalIdCacheKey;
 import org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy;
@@ -42,6 +40,8 @@ import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.type.Type;
 
+import org.jboss.logging.Logger;
+
 /**
  * Maintains a {@link org.hibernate.engine.spi.PersistenceContext}-level 2-way cross-reference (xref) between the 
  * identifiers and natural ids of entities associated with the PersistenceContext.

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

@@ -23,11 +23,11 @@
  */
 package org.hibernate.engine.internal;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.Collections;
 
 import org.hibernate.engine.spi.SessionImplementor;
 

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

@@ -28,8 +28,6 @@ import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.QueryParameters;
 import org.hibernate.engine.spi.SessionImplementor;
@@ -37,6 +35,8 @@ import org.hibernate.engine.spi.TypedValue;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.type.Type;
 
+import org.jboss.logging.Logger;
+
 /**
  * Centralizes the commonality regarding binding of parameter values into PreparedStatements as this logic is
  * used in many places.

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

@@ -39,8 +39,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentMap;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.AssertionFailure;
 import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
@@ -79,6 +77,8 @@ import org.hibernate.proxy.LazyInitializer;
 import org.hibernate.tuple.ElementWrapper;
 import org.hibernate.type.CollectionType;
 
+import org.jboss.logging.Logger;
+
 /**
  * A <strong>stateful</strong> implementation of the {@link PersistenceContext} contract meaning that we maintain this
  * state throughout the life of the persistence context.

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

@@ -23,10 +23,10 @@
  */
 package org.hibernate.engine.internal;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.BaseSessionEventListener;
 
+import org.jboss.logging.Logger;
+
 /**
  * @author Steve Ebersole
  */

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

@@ -25,8 +25,6 @@ package org.hibernate.engine.internal;
 
 import java.io.Serializable;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.AssertionFailure;
 import org.hibernate.CacheMode;
 import org.hibernate.HibernateException;
@@ -55,6 +53,8 @@ import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.type.Type;
 import org.hibernate.type.TypeHelper;
 
+import org.jboss.logging.Logger;
+
 /**
  * Functionality relating to the Hibernate two-phase loading process, that may be reused by persisters
  * that do not use the Loader framework

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

@@ -23,13 +23,13 @@
  */
 package org.hibernate.engine.internal;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.type.VersionType;
 
+import org.jboss.logging.Logger;
+
 /**
  * Utilities for dealing with optimistic locking values.
  *

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

@@ -30,12 +30,12 @@ import java.lang.reflect.Proxy;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.ClassLoaderHelper;
 
+import org.jboss.logging.Logger;
+
 /**
  * A proxy for a ResultSet delegate, responsible for locally caching the columnName-to-columnIndex resolution that
  * has been found to be inefficient in a few vendor's drivers (i.e., Oracle and Postgres).

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

@@ -28,8 +28,6 @@ import java.sql.SQLException;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.engine.jdbc.batch.spi.Batch;
 import org.hibernate.engine.jdbc.batch.spi.BatchKey;
 import org.hibernate.engine.jdbc.batch.spi.BatchObserver;
@@ -40,6 +38,8 @@ import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
 import org.hibernate.engine.transaction.spi.TransactionContext;
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * Convenience base class for implementers of the Batch interface.
  *

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

@@ -25,8 +25,6 @@ package org.hibernate.engine.jdbc.batch.internal;
 
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.jdbc.batch.spi.Batch;
 import org.hibernate.engine.jdbc.batch.spi.BatchBuilder;
@@ -36,6 +34,8 @@ import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.service.spi.Configurable;
 
+import org.jboss.logging.Logger;
+
 /**
  * A builder for {@link Batch} instances.
  *

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

@@ -26,10 +26,10 @@ package org.hibernate.engine.jdbc.batch.internal;
 import java.util.Map;
 
 import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.cfg.Environment;
 import org.hibernate.engine.jdbc.batch.spi.BatchBuilder;
 import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.service.spi.ServiceException;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 

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

@@ -22,17 +22,18 @@
  * Boston, MA  02110-1301  USA
  */
 package org.hibernate.engine.jdbc.batch.internal;
+
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Map;
 
-import org.jboss.logging.Logger;
-
 import org.hibernate.HibernateException;
 import org.hibernate.engine.jdbc.batch.spi.BatchKey;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.internal.CoreMessageLogger;
 
+import org.jboss.logging.Logger;
+
 /**
  * A {@link org.hibernate.engine.jdbc.batch.spi.Batch} implementation which does bathing based on a given size.  Once
  * the batch size is reached for a statement in the batch, the entire batch is implicitly executed.

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

@@ -31,6 +31,7 @@ import org.hibernate.JDBCException;
 import org.hibernate.engine.jdbc.batch.spi.BatchKey;
 import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
 import org.hibernate.internal.CoreMessageLogger;
+
 import org.jboss.logging.Logger;
 
 /**