diff --git a/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/database/AbstractDatabaseProfileImpl.java b/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/database/AbstractDatabaseProfileImpl.java index a365618af9..0e0edb6fe1 100644 --- a/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/database/AbstractDatabaseProfileImpl.java +++ b/buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/database/AbstractDatabaseProfileImpl.java @@ -33,7 +33,6 @@ import java.util.Properties; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; import org.gradle.api.logging.Logging; - import org.slf4j.Logger; import org.hibernate.build.qalab.DatabaseAllocation; diff --git a/buildSrc/src/main/groovy/org/hibernate/build/gradle/util/Jdk.java b/buildSrc/src/main/groovy/org/hibernate/build/gradle/util/Jdk.java index 99c65dde4c..4eb21f61b0 100644 --- a/buildSrc/src/main/groovy/org/hibernate/build/gradle/util/Jdk.java +++ b/buildSrc/src/main/groovy/org/hibernate/build/gradle/util/Jdk.java @@ -28,7 +28,6 @@ import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import java.lang.String; import org.apache.tools.ant.taskdefs.condition.Os; import org.apache.tools.ant.util.FileUtils; diff --git a/documentation/src/main/docbook/devguide/en-US/chapters/events/extras/AuditInterceptor.java b/documentation/src/main/docbook/devguide/en-US/chapters/events/extras/AuditInterceptor.java index 041db6ed67..b5801321fa 100644 --- a/documentation/src/main/docbook/devguide/en-US/chapters/events/extras/AuditInterceptor.java +++ b/documentation/src/main/docbook/devguide/en-US/chapters/events/extras/AuditInterceptor.java @@ -1,6 +1,5 @@ import java.io.Serializable; import java.util.Date; -import java.util.Iterator; import org.hibernate.EmptyInterceptor; import org.hibernate.Transaction; diff --git a/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java b/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java index b90a5d5103..e9feac5f44 100644 --- a/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java +++ b/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java @@ -23,15 +23,14 @@ */ package org.hibernate.service.jdbc.connections.internal; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.Properties; +import javax.sql.DataSource; import com.mchange.v2.c3p0.DataSources; - import org.jboss.logging.Logger; import org.hibernate.HibernateException; diff --git a/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0MessageLogger.java b/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0MessageLogger.java index 71adefc452..434af89276 100644 --- a/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0MessageLogger.java +++ b/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0MessageLogger.java @@ -23,17 +23,18 @@ */ package org.hibernate.service.jdbc.connections.internal; -import static org.jboss.logging.Logger.Level.INFO; -import static org.jboss.logging.Logger.Level.WARN; import java.sql.SQLException; -import org.hibernate.internal.CoreMessageLogger; - import org.jboss.logging.Cause; import org.jboss.logging.LogMessage; import org.jboss.logging.Message; import org.jboss.logging.MessageLogger; +import org.hibernate.internal.CoreMessageLogger; + +import static org.jboss.logging.Logger.Level.INFO; +import static org.jboss.logging.Logger.Level.WARN; + /** * The jboss-logging {@link MessageLogger} for the hibernate-c3p0 module. It reserves message ids ranging from * 10001 to 15000 inclusively. diff --git a/hibernate-core/src/main/java/org/hibernate/Hibernate.java b/hibernate-core/src/main/java/org/hibernate/Hibernate.java index eb3e542ad7..05423561ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/Hibernate.java +++ b/hibernate-core/src/main/java/org/hibernate/Hibernate.java @@ -29,7 +29,6 @@ import org.hibernate.bytecode.instrumentation.internal.FieldInterceptionHelper; import org.hibernate.bytecode.instrumentation.spi.FieldInterceptor; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.HibernateIterator; -import org.hibernate.engine.jdbc.LobCreationContext; import org.hibernate.engine.jdbc.LobCreator; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.proxy.HibernateProxy; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionType.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionType.java index d7cfc0e8a7..199ab14ff9 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionType.java @@ -23,7 +23,7 @@ */ package org.hibernate.annotations; -import java.lang.annotation.*; +import java.lang.annotation.Retention; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java index 1d30f5df7f..84cf003f0f 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.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; - /** * This specifies that a property is part of the natural id of the entity. * diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java index 5ef84c7f5e..fe8b6424a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; + import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Arrays; @@ -34,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; @@ -80,6 +80,8 @@ import javax.persistence.TableGenerator; import javax.persistence.UniqueConstraint; import javax.persistence.Version; +import org.jboss.logging.Logger; + import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; @@ -125,7 +127,6 @@ import org.hibernate.annotations.Sort; import org.hibernate.annotations.Source; import org.hibernate.annotations.Tuplizer; import org.hibernate.annotations.Tuplizers; -import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.hibernate.annotations.TypeDefs; import org.hibernate.annotations.Where; @@ -168,7 +169,6 @@ 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; /** * JSR 175 annotation binder which reads the annotations from classes, applies the diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java index 545f65cbd7..ec5f982e2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java @@ -23,6 +23,14 @@ */ package org.hibernate.cfg.annotations; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.StringTokenizer; import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; import javax.persistence.ElementCollection; @@ -35,14 +43,6 @@ import javax.persistence.ManyToMany; import javax.persistence.MapKey; import javax.persistence.MapKeyColumn; import javax.persistence.OneToMany; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.StringTokenizer; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java index 2d59c61fec..659546d298 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java @@ -27,7 +27,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; - import javax.persistence.Access; import javax.persistence.Entity; import javax.persistence.JoinColumn; @@ -36,6 +35,8 @@ import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.SecondaryTable; import javax.persistence.SecondaryTables; +import org.jboss.logging.Logger; + import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; @@ -89,7 +90,6 @@ 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; /** * Stateful holder and processor for binding Entity information diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java index a27f3ac423..400488a0f8 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java @@ -30,7 +30,6 @@ import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.function.VarArgsSQLFunction; import org.hibernate.type.StandardBasicTypes; -import org.hibernate.type.descriptor.sql.SmallIntTypeDescriptor; import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; import org.hibernate.type.descriptor.sql.TinyIntTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java index 6976ec4bd5..418f74a82f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java @@ -22,9 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; + import java.io.Serializable; -import org.hibernate.JDBCException; import org.hibernate.StaleObjectStateException; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java index 3730c226e8..ecaa6d2e00 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java @@ -26,10 +26,8 @@ package org.hibernate.dialect.lock; import java.io.Serializable; import org.hibernate.HibernateException; -import org.hibernate.JDBCException; import org.hibernate.LockMode; import org.hibernate.OptimisticLockException; -import org.hibernate.StaleObjectStateException; import org.hibernate.action.internal.EntityVerifyVersionProcess; import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java index 2545d2e2f5..e2ee073d02 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java @@ -31,7 +31,6 @@ import java.sql.SQLException; import org.hibernate.JDBCException; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.PessimisticLockException; import org.hibernate.StaleObjectStateException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java index a1463b0845..7f65fcfcec 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java @@ -27,6 +27,8 @@ 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; @@ -37,7 +39,6 @@ import org.hibernate.internal.CoreMessageLogger; 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. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java index 613e4f423c..a3341bf159 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java @@ -31,7 +31,6 @@ import java.sql.SQLException; import org.hibernate.JDBCException; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.PessimisticLockException; import org.hibernate.StaleObjectStateException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java index 6fc57712d1..83622057c0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java @@ -27,6 +27,8 @@ 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; @@ -37,7 +39,6 @@ import org.hibernate.internal.CoreMessageLogger; 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. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdXrefDelegate.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdXrefDelegate.java index 270fe2e1c9..df2a45ad17 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdXrefDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdXrefDelegate.java @@ -40,7 +40,6 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.event.spi.EventSource; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.Type; -import org.hibernate.type.TypeHelper; /** * Maintains a {@link org.hibernate.engine.spi.PersistenceContext}-level 2-way cross-reference (xref) between the diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java index 2ba0961651..56546f5ffc 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java @@ -36,7 +36,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; + import org.jboss.logging.Logger; + import org.hibernate.AssertionFailure; import org.hibernate.Hibernate; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java index 76230cedc6..e14fe21090 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java @@ -49,8 +49,8 @@ import org.hibernate.engine.jdbc.spi.SchemaNameResolver; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.jdbc.spi.SqlStatementLogger; import org.hibernate.exception.internal.SQLExceptionTypeDelegate; -import org.hibernate.exception.internal.StandardSQLExceptionConverter; import org.hibernate.exception.internal.SQLStateConversionDelegate; +import org.hibernate.exception.internal.StandardSQLExceptionConverter; import org.hibernate.exception.spi.SQLExceptionConverter; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.ReflectHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java index b08406f972..b2bcc272d8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java @@ -25,7 +25,6 @@ package org.hibernate.engine.query.spi; import java.io.Serializable; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; 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 fd0f4fb438..0cf7f84d1c 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 @@ -31,6 +31,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; + import org.jboss.logging.Logger; import org.hibernate.MappingException; 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 b0eab6de8a..f4c943c10c 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 @@ -45,12 +45,12 @@ import org.hibernate.action.internal.CollectionAction; import org.hibernate.action.internal.CollectionRecreateAction; import org.hibernate.action.internal.CollectionRemoveAction; import org.hibernate.action.internal.CollectionUpdateAction; -import org.hibernate.action.internal.UnresolvedEntityInsertActions; import org.hibernate.action.internal.EntityAction; import org.hibernate.action.internal.EntityDeleteAction; import org.hibernate.action.internal.EntityIdentityInsertAction; import org.hibernate.action.internal.EntityInsertAction; import org.hibernate.action.internal.EntityUpdateAction; +import org.hibernate.action.internal.UnresolvedEntityInsertActions; import org.hibernate.action.spi.AfterTransactionCompletionProcess; import org.hibernate.action.spi.BeforeTransactionCompletionProcess; import org.hibernate.action.spi.Executable; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java index 92a9b11747..5ed0c4012c 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/CascadingAction.java @@ -33,7 +33,6 @@ import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.ReplicationMode; -import org.hibernate.TransientObjectException; import org.hibernate.TransientPropertyValueException; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.internal.ForeignKeys; diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java index d20fde89d0..3f6c2c524a 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultRefreshEventListener.java @@ -42,7 +42,6 @@ import org.hibernate.event.spi.EventSource; import org.hibernate.event.spi.RefreshEvent; import org.hibernate.event.spi.RefreshEventListener; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.internal.util.collections.IdentityMap; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.CollectionType; diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultResolveNaturalIdEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultResolveNaturalIdEventListener.java index 8d95951acb..b1a2bfbe58 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultResolveNaturalIdEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultResolveNaturalIdEventListener.java @@ -25,6 +25,8 @@ package org.hibernate.event.internal; import java.io.Serializable; +import org.jboss.logging.Logger; + import org.hibernate.HibernateException; import org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy; import org.hibernate.engine.spi.CachedNaturalIdValueSource; @@ -34,7 +36,6 @@ import org.hibernate.event.spi.ResolveNaturalIdEventListener; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; -import org.jboss.logging.Logger; /** * Defines the default load event listeners used by hibernate for loading entities diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java b/hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java index d28dcf9191..f44fa989c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Set; import org.hibernate.AssertionFailure; -import org.hibernate.internal.util.collections.IdentityMap; /** * EventCache is a Map implementation that can be used by an event diff --git a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java index cee4393ff1..07a7ef1569 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java @@ -39,7 +39,6 @@ import org.hibernate.JDBCException; import org.hibernate.QueryTimeoutException; import org.hibernate.exception.ConstraintViolationException; import org.hibernate.exception.DataException; -import org.hibernate.exception.GenericJDBCException; import org.hibernate.exception.JDBCConnectionException; import org.hibernate.exception.LockAcquisitionException; import org.hibernate.exception.SQLGrammarException; diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/AbstractSQLExceptionConversionDelegate.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/AbstractSQLExceptionConversionDelegate.java index 08ad788ef8..1e146f0765 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/spi/AbstractSQLExceptionConversionDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/AbstractSQLExceptionConversionDelegate.java @@ -23,10 +23,6 @@ */ package org.hibernate.exception.spi; -import java.sql.SQLException; - -import org.hibernate.JDBCException; - /** * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java index e860cb16fa..d2c6ada9bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java @@ -87,8 +87,6 @@ import org.hibernate.hql.internal.ast.util.SyntheticAndFactory; import org.hibernate.hql.spi.QueryTranslator; import org.hibernate.id.BulkInsertionCapableIdentifierGenerator; import org.hibernate.id.IdentifierGenerator; -import org.hibernate.id.PostInsertIdentifierGenerator; -import org.hibernate.id.SequenceGenerator; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.collections.ArrayHelper; 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 cf2f29d475..30a9458743 100755 --- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSessionImpl.java @@ -37,7 +37,6 @@ import org.hibernate.ScrollableResults; import org.hibernate.SessionException; import org.hibernate.SharedSessionContract; import org.hibernate.cache.spi.CacheKey; -import org.hibernate.cache.spi.NaturalIdCacheKey; import org.hibernate.engine.jdbc.LobCreationContext; import org.hibernate.engine.jdbc.spi.JdbcConnectionAccess; import org.hibernate.engine.query.spi.HQLQueryPlan; 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 03352081e3..74a4ec3fc7 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java @@ -39,10 +39,11 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; - import javax.naming.Reference; import javax.naming.StringRefAddr; +import org.jboss.logging.Logger; + import org.hibernate.AssertionFailure; import org.hibernate.Cache; import org.hibernate.ConnectionReleaseMode; @@ -145,7 +146,6 @@ import org.hibernate.tuple.entity.EntityTuplizer; import org.hibernate.type.AssociationType; import org.hibernate.type.Type; import org.hibernate.type.TypeResolver; -import org.jboss.logging.Logger; /** @@ -1249,15 +1249,15 @@ public final class SessionFactoryImpl } public NamedQueryDefinition getNamedQuery(String queryName) { - return namedQueries.get(queryName); + return namedQueries.get( queryName ); } public NamedSQLQueryDefinition getNamedSQLQuery(String queryName) { - return namedSqlQueries.get(queryName); + return namedSqlQueries.get( queryName ); } public ResultSetMappingDefinition getResultSetMapping(String resultSetName) { - return sqlResultSetMappings.get(resultSetName); + return sqlResultSetMappings.get( resultSetName ); } public Type getIdentifierType(String className) throws MappingException { @@ -1347,7 +1347,7 @@ public final class SessionFactoryImpl } } } - return results.toArray( new String[ results.size() ] ); + return results.toArray( new String[results.size()] ); } public String getImportedClassName(String className) { 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 8b1807b435..b6372d426c 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java @@ -46,6 +46,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.jboss.logging.Logger; + import org.hibernate.AssertionFailure; import org.hibernate.CacheMode; import org.hibernate.ConnectionReleaseMode; @@ -153,7 +155,6 @@ import org.hibernate.stat.SessionStatistics; import org.hibernate.stat.internal.SessionStatisticsImpl; import org.hibernate.type.SerializationException; import org.hibernate.type.Type; -import org.jboss.logging.Logger; /** * Concrete implementation of a Session. 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 b146001219..f8c39337b6 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 @@ -31,15 +31,28 @@ */ package org.hibernate.internal.util.collections; + import java.io.IOException; import java.io.Serializable; -import java.util.*; +import java.util.AbstractCollection; +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; +import java.util.NoSuchElementException; +import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.ReentrantLock; - - import static java.util.Collections.singletonMap; import static java.util.Collections.unmodifiableMap; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java index e5ebf617ef..59c5775cad 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; + import java.io.Serializable; import java.util.HashSet; import java.util.Iterator; @@ -32,7 +33,6 @@ import org.jboss.logging.Logger; import org.hibernate.MappingException; import org.hibernate.engine.spi.Mapping; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.collections.SingletonIterator; diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java index 1f85446677..9c2bc3e2e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java @@ -23,9 +23,9 @@ */ package org.hibernate.service.jdbc.connections.spi; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; +import javax.sql.DataSource; import org.hibernate.service.UnknownUnwrapTypeException; diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java index 9b60841b9e..cbc119b054 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java @@ -23,10 +23,10 @@ */ package org.hibernate.service.jdbc.connections.spi; -import javax.naming.Context; -import javax.sql.DataSource; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import javax.naming.Context; +import javax.sql.DataSource; import org.hibernate.HibernateException; import org.hibernate.cfg.AvailableSettings; diff --git a/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java b/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java index a19c17d0c3..3e6c4dba52 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java @@ -26,6 +26,8 @@ package org.hibernate.service.jdbc.dialect.internal; import java.sql.DatabaseMetaData; import java.sql.SQLException; +import org.jboss.logging.Logger; + import org.hibernate.dialect.CUBRIDDialect; import org.hibernate.dialect.DB2400Dialect; import org.hibernate.dialect.DB2Dialect; @@ -52,7 +54,6 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.SybaseAnywhereDialect; import org.hibernate.internal.CoreMessageLogger; -import org.jboss.logging.Logger; /** * The standard Hibernate Dialect resolver. diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/ConcurrentStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/ConcurrentStatisticsImpl.java index be6e9c31c2..e89e7c0384 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/ConcurrentStatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/ConcurrentStatisticsImpl.java @@ -27,6 +27,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; +import org.jboss.logging.Logger; + import org.hibernate.cache.spi.Region; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.CoreMessageLogger; @@ -38,7 +40,6 @@ import org.hibernate.stat.NaturalIdCacheStatistics; import org.hibernate.stat.QueryStatistics; import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.stat.spi.StatisticsImplementor; -import org.jboss.logging.Logger; /** * Implementation of {@link org.hibernate.stat.Statistics} based on the {@link java.util.concurrent} package. diff --git a/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java b/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java index 7629a9ed91..985479b10a 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java @@ -25,7 +25,6 @@ package org.hibernate.stat.spi; import org.hibernate.service.Service; import org.hibernate.stat.Statistics; -import org.hibernate.stat.internal.ConcurrentSecondLevelCacheStatisticsImpl; /** * Statistics SPI for the Hibernate core. This is essentially the "statistic collector" API, its the contract diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java index dc1620a9c1..f8ce45e5b2 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java @@ -39,7 +39,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; -import org.hibernate.internal.util.StringHelper; import org.jboss.logging.Logger; import org.hibernate.HibernateException; @@ -56,11 +55,11 @@ import org.hibernate.engine.jdbc.spi.SqlStatementLogger; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.ConfigHelper; import org.hibernate.internal.util.ReflectHelper; +import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistryBuilder; -import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.config.spi.ConfigurationService; import org.hibernate.service.internal.StandardServiceRegistryImpl; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayTypeDescriptor.java index 9b7323433e..fae1cc5d32 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CharacterArrayTypeDescriptor.java @@ -26,10 +26,8 @@ package org.hibernate.type.descriptor.java; import java.io.Reader; import java.io.StringReader; import java.sql.Clob; -import java.sql.SQLException; import java.util.Arrays; -import org.hibernate.HibernateException; import org.hibernate.type.descriptor.CharacterStream; import org.hibernate.type.descriptor.WrapperOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobTypeDescriptor.java index 98b9a1f21b..e417d2c0fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/ClobTypeDescriptor.java @@ -25,10 +25,8 @@ package org.hibernate.type.descriptor.java; import java.io.Serializable; import java.sql.Clob; -import java.sql.SQLException; import java.util.Comparator; -import org.hibernate.HibernateException; import org.hibernate.engine.jdbc.ClobProxy; import org.hibernate.engine.jdbc.WrappedClob; import org.hibernate.type.descriptor.CharacterStream; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayTypeDescriptor.java index 7d01ccd9b9..21e54cd0df 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/PrimitiveCharacterArrayTypeDescriptor.java @@ -26,10 +26,8 @@ package org.hibernate.type.descriptor.java; import java.io.Reader; import java.io.StringReader; import java.sql.Clob; -import java.sql.SQLException; import java.util.Arrays; -import org.hibernate.HibernateException; import org.hibernate.type.descriptor.CharacterStream; import org.hibernate.type.descriptor.WrapperOptions; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java index 1dc0a4c819..3747f90d5b 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CascadeToEmbeddedManyToOneTest.java @@ -30,7 +30,6 @@ import org.junit.Test; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairHolder.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairHolder.java index 01233b9508..2eed219078 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairHolder.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairHolder.java @@ -24,15 +24,11 @@ package org.hibernate.test.annotations.cascade; import java.io.Serializable; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; import javax.persistence.Table; -import org.hibernate.annotations.ForeignKey; @Entity @Table(name = "CODED_PAIR_HOLDER") diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairSetHolder.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairSetHolder.java index b19a269348..6ef28b3af0 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairSetHolder.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/CodedPairSetHolder.java @@ -27,15 +27,15 @@ import java.io.Serializable; import java.util.Collections; import java.util.HashSet; import java.util.Set; - import javax.persistence.Column; +import javax.persistence.ElementCollection; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.Table; -import javax.persistence.ElementCollection; + import org.hibernate.annotations.ForeignKey; @Entity diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Parent.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Parent.java index 0633daca9b..8adeb7c4a4 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Parent.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Parent.java @@ -24,7 +24,6 @@ package org.hibernate.test.annotations.cascade; import java.util.Set; - import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -33,9 +32,6 @@ import javax.persistence.JoinColumn; import javax.persistence.OneToMany; import javax.persistence.OneToOne; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; - /** * @author Jeff Schnitzer */ diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Person.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Person.java index b6432ce30c..f782c590d6 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Person.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/Person.java @@ -24,7 +24,6 @@ package org.hibernate.test.annotations.cascade; import java.io.Serializable; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/PersonPair.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/PersonPair.java index d8cf15f935..1dd8e1d115 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/PersonPair.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/PersonPair.java @@ -24,7 +24,6 @@ package org.hibernate.test.annotations.cascade; import java.io.Serializable; - import javax.persistence.CascadeType; import javax.persistence.Embeddable; import javax.persistence.FetchType; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java index 3c493f7465..ca0efa7ce4 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java @@ -26,9 +26,7 @@ package org.hibernate.test.annotations.cascade.circle.identity; import org.junit.Test; import org.hibernate.Session; -import org.hibernate.testing.DialectCheck; import org.hibernate.testing.DialectChecks; -import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/AbstractEntity.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/AbstractEntity.java index b547078049..5f306846f1 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/AbstractEntity.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/AbstractEntity.java @@ -26,7 +26,6 @@ package org.hibernate.test.annotations.cascade.circle.sequence; import java.io.Serializable; import java.util.Date; import java.util.UUID; - import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java index 2ff25e635d..18be62da10 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java @@ -23,15 +23,14 @@ */ package org.hibernate.test.annotations.cascade.circle.sequence; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.testing.DialectChecks; -import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.junit.Test; - @RequiresDialectFeature(DialectChecks.SupportsSequences.class) public class CascadeCircleSequenceIdTest extends BaseCoreFunctionalTestCase { @Test diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java index 7a24e503bc..9dd70b6b08 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/Query.java @@ -23,14 +23,14 @@ */ package org.hibernate.test.annotations.collectionelement.embeddables.withcustomenumdef; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; import javax.persistence.ElementCollection; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java index edc35df99b..611f53e699 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java @@ -23,10 +23,9 @@ */ package org.hibernate.test.annotations.collectionelement.embeddables.withcustomenumdef; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static junit.framework.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/A.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/A.java index dd41cb6942..62859d0f76 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/A.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/A.java @@ -25,7 +25,6 @@ package org.hibernate.test.annotations.naturalid; import java.util.HashSet; import java.util.Set; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java index 3abc760524..5e7361b32f 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java @@ -26,7 +26,6 @@ package org.hibernate.test.annotations.naturalid; import java.util.List; import org.jboss.logging.Logger; - import org.junit.After; import org.junit.Test; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java index 706058fe3b..bf8137c5d7 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/naturalid/NaturalIdTest.java @@ -23,12 +23,11 @@ */ package org.hibernate.test.annotations.naturalid; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.List; +import org.junit.After; +import org.junit.Test; + import org.hibernate.Criteria; import org.hibernate.NaturalIdLoadAccess; import org.hibernate.Session; @@ -39,8 +38,9 @@ import org.hibernate.metadata.ClassMetadata; import org.hibernate.stat.Statistics; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.junit.After; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Test case for NaturalId annotation diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java index 3559081e2e..7e6e8c2851 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/annotations/onetoone/OneToOneTest.java @@ -40,7 +40,6 @@ import org.hibernate.test.annotations.Customer; import org.hibernate.test.annotations.Discount; import org.hibernate.test.annotations.Passport; import org.hibernate.test.annotations.Ticket; -import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java index 5f373d8f13..902b66d997 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/cascade/circle/MultiPathCircleCascadeTest.java @@ -30,12 +30,10 @@ import org.junit.Test; import org.hibernate.JDBCException; import org.hibernate.PropertyValueException; import org.hibernate.Session; -import org.hibernate.TransientObjectException; import org.hibernate.TransientPropertyValueException; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.id.IdentityGenerator; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/cid/CompositeIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/cid/CompositeIdTest.java index 16a1c0ecea..e8bf975463 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/cid/CompositeIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/cid/CompositeIdTest.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cid; + import java.math.BigDecimal; import java.util.Calendar; import java.util.Collections; @@ -35,7 +36,6 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.engine.query.spi.HQLQueryPlan; import org.hibernate.hql.spi.QueryTranslator; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/User.java b/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/User.java index 12314948bf..5e4567587c 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/User.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/User.java @@ -23,6 +23,9 @@ */ package org.hibernate.test.collection.custom.basic; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -32,9 +35,6 @@ import javax.persistence.OneToMany; import javax.persistence.OrderColumn; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.hibernate.annotations.CollectionType; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java index 12983af1dc..1b44533ae0 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/basic/UserCollectionTypeTest.java @@ -23,12 +23,11 @@ */ package org.hibernate.test.collection.custom.basic; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/Entity.java b/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/Entity.java index 56c50f5596..be183a5e6f 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/Entity.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/Entity.java @@ -1,12 +1,13 @@ package org.hibernate.test.collection.custom.parameterized; + +import java.util.ArrayList; +import java.util.List; import javax.persistence.Column; import javax.persistence.ElementCollection; import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OrderColumn; -import java.util.ArrayList; -import java.util.List; import org.hibernate.annotations.CollectionType; import org.hibernate.annotations.Parameter; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeTest.java index da40ddd4a6..d59c9ec4d8 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/ParameterizedUserCollectionTypeTest.java @@ -23,12 +23,11 @@ */ package org.hibernate.test.collection.custom.parameterized; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/PersistentDefaultableList.java b/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/PersistentDefaultableList.java index 3c5c6bd3ed..29c8342bd4 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/PersistentDefaultableList.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/collection/custom/parameterized/PersistentDefaultableList.java @@ -1,5 +1,7 @@ package org.hibernate.test.collection.custom.parameterized; + import java.util.List; + import org.hibernate.collection.internal.PersistentList; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/collection/list/PersistentListTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/collection/list/PersistentListTest.java index 2177026e21..70447ed22a 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/collection/list/PersistentListTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/collection/list/PersistentListTest.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.collection.list; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -38,7 +39,6 @@ import org.hibernate.jdbc.Work; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.sql.SimpleSelect; - import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java index 788f19003d..c1010be4fb 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/ComponentJoinsTest.java @@ -23,10 +23,9 @@ */ package org.hibernate.test.component.basic2; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; /** diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Name.java b/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Name.java index 1e78afd574..efaa422c37 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Name.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Name.java @@ -23,9 +23,9 @@ */ package org.hibernate.test.component.basic2; +import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Embeddable; -import java.io.Serializable; /** * @author Steve Ebersole diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Person.java b/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Person.java index d75eac6e53..206cc75bce 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Person.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/component/basic2/Person.java @@ -23,10 +23,10 @@ */ package org.hibernate.test.component.basic2; +import java.io.Serializable; import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.Id; -import java.io.Serializable; /** * @author Steve Ebersole diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/CriteriaQueryTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/criteria/CriteriaQueryTest.java index db7600cb16..8646f74733 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/criteria/CriteriaQueryTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/criteria/CriteriaQueryTest.java @@ -57,11 +57,11 @@ import org.hibernate.exception.SQLGrammarException; import org.hibernate.internal.util.SerializationHelper; import org.hibernate.test.hql.Animal; import org.hibernate.test.hql.Reptile; -import org.hibernate.testing.SkipForDialect; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; +import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.transform.Transformers; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.Type; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java b/hibernate-core/src/matrix/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java index 1afd53d668..dcfb74c33b 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/flush/TestCollectionInitializingDuringFlush.java @@ -23,8 +23,6 @@ */ package org.hibernate.test.flush; -import java.util.Collection; - import org.junit.Test; import org.hibernate.Hibernate; @@ -39,7 +37,6 @@ import org.hibernate.integrator.spi.Integrator; import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.service.BootstrapServiceRegistryBuilder; import org.hibernate.service.spi.SessionFactoryServiceRegistry; - import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/BulkManipulationTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/hql/BulkManipulationTest.java index a7555cb777..64c8514c3e 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/hql/BulkManipulationTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/hql/BulkManipulationTest.java @@ -35,7 +35,6 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.MySQLDialect; -import org.hibernate.hql.internal.ast.HqlSqlWalker; import org.hibernate.id.BulkInsertionCapableIdentifierGenerator; import org.hibernate.id.IdentifierGenerator; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java index f9e0500c90..8796f55525 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/hql/FunctionNameAsColumnTest.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.hql; + import java.util.List; import org.junit.Test; @@ -33,7 +34,6 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Restrictions; -import org.hibernate.dialect.SybaseASE157Dialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.function.SQLFunction; import org.hibernate.testing.SkipForDialect; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java index 346fbfc92b..7500acd798 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/hql/joinedSubclass/JoinedSubclassBulkManipTest.java @@ -23,10 +23,9 @@ */ package org.hibernate.test.hql.joinedSubclass; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java index 01636f9c57..4089cc09ee 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/inheritancediscriminator/PersistChildEntitiesWithDiscriminatorTest.java @@ -23,12 +23,12 @@ */ package org.hibernate.test.inheritancediscriminator; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.dialect.PostgreSQLDialect; - import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.junit.Test; /** * @author Pawel Stawicki diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/join/JoinTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/join/JoinTest.java index 7c86ae118a..84d9ed3a84 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/join/JoinTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/join/JoinTest.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.join; -import java.math.BigDecimal; + import java.sql.Connection; import java.sql.SQLException; import java.util.Iterator; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/AbstractJPATest.java b/hibernate-core/src/matrix/java/org/hibernate/test/jpa/AbstractJPATest.java index b0f67b0f63..8c8e9b0c5e 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/AbstractJPATest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/jpa/AbstractJPATest.java @@ -42,7 +42,6 @@ import org.hibernate.event.spi.FlushEntityEventListener; import org.hibernate.event.spi.FlushEventListener; import org.hibernate.event.spi.PersistEventListener; import org.hibernate.integrator.spi.Integrator; -import org.hibernate.internal.util.collections.IdentityMap; import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.proxy.EntityNotFoundDelegate; import org.hibernate.service.BootstrapServiceRegistryBuilder; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java index 6b5f6873b7..8cfc91aab2 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/ImmutableNaturalIdTest.java @@ -36,7 +36,6 @@ import org.hibernate.test.jpa.AbstractJPATest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java index 46a5aff501..2196d464f6 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/jpa/naturalid/MutableNaturalIdTest.java @@ -23,10 +23,9 @@ */ package org.hibernate.test.jpa.naturalid; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Session; import org.hibernate.test.jpa.AbstractJPATest; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java index 3c08c19546..438badd4ed 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/FooBarTest.java @@ -43,6 +43,7 @@ import java.util.TreeMap; import java.util.TreeSet; import org.jboss.logging.Logger; +import org.junit.Test; import org.hibernate.Criteria; import org.hibernate.FetchMode; @@ -83,14 +84,11 @@ import org.hibernate.jdbc.AbstractReturningWork; import org.hibernate.jdbc.AbstractWork; import org.hibernate.proxy.HibernateProxy; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.type.StandardBasicTypes; - -import org.junit.Test; - import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.env.ConnectionProviderBuilder; +import org.hibernate.type.StandardBasicTypes; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ParentChildTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ParentChildTest.java index 8e586bdea4..96c8fc2482 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ParentChildTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/legacy/ParentChildTest.java @@ -34,6 +34,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.junit.Test; + import org.hibernate.Criteria; import org.hibernate.FetchMode; import org.hibernate.Hibernate; @@ -51,11 +53,8 @@ import org.hibernate.engine.spi.EntityEntry; import org.hibernate.internal.SessionImpl; import org.hibernate.jdbc.AbstractWork; import org.hibernate.proxy.HibernateProxy; -import org.hibernate.type.StandardBasicTypes; - -import org.junit.Test; - import org.hibernate.testing.FailureExpected; +import org.hibernate.type.StandardBasicTypes; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/lob/ClobLocatorTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/lob/ClobLocatorTest.java index 0fbbcc3e71..95c5add9c8 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/lob/ClobLocatorTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/lob/ClobLocatorTest.java @@ -22,17 +22,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.lob; + import java.sql.Clob; import org.junit.Test; import org.hibernate.LockMode; import org.hibernate.Session; +import org.hibernate.dialect.SybaseASE157Dialect; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.type.descriptor.java.DataHelper; -import org.hibernate.dialect.SybaseASE157Dialect; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java index 41a4ae4389..72e65d2e2f 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java @@ -25,6 +25,10 @@ package org.hibernate.test.locking; import java.util.concurrent.TimeoutException; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.PessimisticLockException; @@ -32,19 +36,12 @@ import org.hibernate.Session; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.exception.GenericJDBCException; import org.hibernate.exception.LockAcquisitionException; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import org.hibernate.testing.FailureExpected; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.async.Executable; import org.hibernate.testing.async.TimedExecutor; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java index d3b2ab979e..99a5f14dd1 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/mapcompelem/MapCompositeElementTest.java @@ -22,13 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.mapcompelem; -import java.util.List; -import org.hibernate.Session; -import org.hibernate.Transaction; +import java.util.List; import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.Transaction; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java index 24cbb1c8b3..2f4d2b839d 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/mapelemformula/MapElementFormulaTest.java @@ -23,11 +23,10 @@ */ package org.hibernate.test.mapelemformula; -import org.hibernate.Session; -import org.hibernate.Transaction; - import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.Transaction; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mixed/DocumentInterceptor.java b/hibernate-core/src/matrix/java/org/hibernate/test/mixed/DocumentInterceptor.java index 2718238362..d7818265b0 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/mixed/DocumentInterceptor.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/mixed/DocumentInterceptor.java @@ -1,8 +1,10 @@ //$Id: DocumentInterceptor.java 8670 2005-11-25 17:36:29Z epbernard $ package org.hibernate.test.mixed; + import java.io.Serializable; import java.util.Calendar; import java.util.Iterator; + import org.hibernate.CallbackException; import org.hibernate.EntityMode; import org.hibernate.Interceptor; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/mixed/MixedTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/mixed/MixedTest.java index ee23ce6f2a..387b65c308 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/mixed/MixedTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/mixed/MixedTest.java @@ -23,12 +23,11 @@ */ package org.hibernate.test.mixed; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.SybaseASE15Dialect; - -import org.junit.Test; - import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.SkipLog; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java index bf66e94c71..2b63545666 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/namingstrategy/NamingStrategyTest.java @@ -23,12 +23,11 @@ */ package org.hibernate.test.namingstrategy; +import org.junit.Test; + import org.hibernate.cfg.Configuration; import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; - -import org.junit.Test; - import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java index eadfa656cd..be11727203 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableEntityNaturalIdTest.java @@ -22,8 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.naturalid.immutable; + import java.lang.reflect.Field; +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.HibernateException; import org.hibernate.Session; @@ -31,9 +34,6 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Restrictions; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java index 1833a307cb..83ce28e107 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java @@ -23,15 +23,14 @@ */ package org.hibernate.test.naturalid.immutable; +import org.junit.Test; + import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Restrictions; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java index a85e22ece3..d0b9633ae9 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/immutableentity/ImmutableEntityNaturalIdTest.java @@ -23,10 +23,7 @@ */ package org.hibernate.test.naturalid.immutableentity; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import org.junit.Test; import org.hibernate.NaturalIdLoadAccess; import org.hibernate.Session; @@ -35,10 +32,13 @@ import org.hibernate.annotations.Immutable; import org.hibernate.cfg.Configuration; import org.hibernate.metadata.ClassMetadata; import org.hibernate.stat.Statistics; - import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * Test case for NaturalId annotation on an {@link Immutable} entity diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/InheritedNaturalIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/InheritedNaturalIdTest.java index e2e77acd97..a32e2bcfd0 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/InheritedNaturalIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/InheritedNaturalIdTest.java @@ -23,10 +23,9 @@ */ package org.hibernate.test.naturalid.inheritance; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/Principal.java b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/Principal.java index 56ce33b907..2f3b23b4ba 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/Principal.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/Principal.java @@ -29,7 +29,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/spread/SpreadNaturalIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/spread/SpreadNaturalIdTest.java index 8aa14864c0..86b591c28a 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/spread/SpreadNaturalIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/inheritance/spread/SpreadNaturalIdTest.java @@ -23,11 +23,10 @@ */ package org.hibernate.test.naturalid.inheritance.spread; -import org.hibernate.AnnotationException; -import org.hibernate.cfg.Configuration; - import org.junit.Test; +import org.hibernate.AnnotationException; +import org.hibernate.cfg.Configuration; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java index 675ec73636..ae3394df33 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java @@ -22,17 +22,17 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.naturalid.mutable; + import java.lang.reflect.Field; +import org.junit.Test; + import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Restrictions; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/cached/CachedMutableNaturalIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/cached/CachedMutableNaturalIdTest.java index 4a5e39fc20..7eb4b81e58 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/cached/CachedMutableNaturalIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/mutable/cached/CachedMutableNaturalIdTest.java @@ -23,23 +23,14 @@ */ package org.hibernate.test.naturalid.mutable.cached; -import java.lang.reflect.Field; - -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.criterion.Restrictions; - import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.hibernate.test.naturalid.mutable.User; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; /** diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/NullableNaturalIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/NullableNaturalIdTest.java index b5a4dc4eb1..250418bda2 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/NullableNaturalIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/naturalid/nullable/NullableNaturalIdTest.java @@ -23,10 +23,9 @@ */ package org.hibernate.test.naturalid.nullable; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; /** diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java index 706c8887f2..9a97e0909b 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/AbstractOperationTestCase.java @@ -26,17 +26,17 @@ package org.hibernate.test.nonflushedchanges; import java.util.Collections; import java.util.HashMap; import java.util.Map; + import org.hibernate.ConnectionReleaseMode; import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; +import org.hibernate.engine.internal.StatefulPersistenceContext; import org.hibernate.engine.spi.EntityKey; import org.hibernate.engine.spi.NonFlushedChanges; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.engine.internal.StatefulPersistenceContext; import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory; import org.hibernate.internal.util.SerializationHelper; - import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/CreateTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/CreateTest.java index 6285e88f86..6b74e8e791 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/CreateTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/CreateTest.java @@ -23,19 +23,18 @@ */ package org.hibernate.test.nonflushedchanges; -import javax.transaction.RollbackException; import java.util.ArrayList; import java.util.Collection; +import javax.transaction.RollbackException; + +import org.junit.Assert; +import org.junit.Test; import org.hibernate.Hibernate; import org.hibernate.PersistentObjectException; import org.hibernate.Session; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.exception.ConstraintViolationException; - -import org.junit.Assert; -import org.junit.Test; - import org.hibernate.testing.jta.TestingJtaBootstrap; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/DeleteTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/DeleteTest.java index 1dc3590617..d2dfa9d73d 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/DeleteTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/DeleteTest.java @@ -24,10 +24,9 @@ package org.hibernate.test.nonflushedchanges; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.jta.TestingJtaBootstrap; /** diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java index a5354aa666..759e780ace 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/GetLoadTest.java @@ -22,15 +22,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.nonflushedchanges; + import java.util.List; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; - -import org.junit.Test; - import org.hibernate.testing.jta.TestingJtaBootstrap; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/MergeTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/MergeTest.java index cbad973644..f9f6026dc3 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/MergeTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/MergeTest.java @@ -1,20 +1,25 @@ //$Id: MergeTest.java 11037 2007-01-09 16:04:16Z steve.ebersole@jboss.com $ package org.hibernate.test.nonflushedchanges; + import java.util.ArrayList; import java.util.List; import java.util.Set; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.NonUniqueObjectException; import org.hibernate.Session; import org.hibernate.StaleObjectStateException; import org.hibernate.criterion.Projections; - -import org.junit.Test; - import org.hibernate.testing.jta.TestingJtaBootstrap; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * adapted this from "ops" tests version diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java index 807a7d9b27..525d28a73f 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/nonflushedchanges/SaveOrUpdateTest.java @@ -23,6 +23,8 @@ */ package org.hibernate.test.nonflushedchanges; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.Session; @@ -31,9 +33,6 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Projections; import org.hibernate.proxy.HibernateProxy; - -import org.junit.Test; - import org.hibernate.testing.jta.TestingJtaBootstrap; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ondelete/OnDeleteTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/ondelete/OnDeleteTest.java index 61352f72e2..82b8ec2de5 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/ondelete/OnDeleteTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/ondelete/OnDeleteTest.java @@ -22,16 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.ondelete; + import java.util.List; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.stat.Statistics; - -import org.junit.Test; - import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java index 6c19026a11..35da12cb2c 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/AbstractRecursiveBidirectionalOneToManyTest.java @@ -22,13 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.onetomany; + import java.util.ArrayList; -import org.hibernate.CacheMode; -import org.hibernate.Session; -import org.hibernate.Transaction; import org.junit.Test; +import org.hibernate.CacheMode; +import org.hibernate.Session; +import org.hibernate.Transaction; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/OneToManyTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/OneToManyTest.java index 518d8ead8f..b8c59e7c48 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/OneToManyTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/onetomany/OneToManyTest.java @@ -23,11 +23,10 @@ */ package org.hibernate.test.onetomany; -import org.hibernate.Session; -import org.hibernate.Transaction; - import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.Transaction; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java index fbf731266e..d4f97be72e 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/formula/OneToOneFormulaTest.java @@ -23,6 +23,8 @@ */ package org.hibernate.test.onetoone.formula; +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.Hibernate; import org.hibernate.Session; @@ -30,9 +32,6 @@ import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Property; - -import org.junit.Test; - import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.type.AbstractSingleColumnStandardBasicType; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java index d2169bcc8d..98904d66d0 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/joined/JoinedSubclassOneToOneTest.java @@ -22,16 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.onetoone.joined; + import java.util.List; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.stat.EntityStatistics; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java index d5bbacac2e..4a2f2b02ba 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/link/OneToOneLinkTest.java @@ -22,14 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.onetoone.link; + import java.util.Date; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java index a06968bbcb..215c0886c1 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java @@ -1,16 +1,16 @@ //$Id: DynamicMapOneToOneTest.java 10977 2006-12-12 23:28:04Z steve.ebersole@jboss.com $ package org.hibernate.test.onetoone.nopojo; + import java.util.HashMap; import java.util.Map; +import org.junit.Test; + import org.hibernate.EntityMode; import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.stat.EntityStatistics; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java index a7814760b3..3661494b94 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/optional/OptionalOneToOneTest.java @@ -23,12 +23,11 @@ */ package org.hibernate.test.onetoone.optional; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java index e19d7380f6..c0dd3b97e0 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/onetoone/singletable/DiscrimSubclassOneToOneTest.java @@ -22,16 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.onetoone.singletable; + import java.util.List; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.stat.EntityStatistics; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/AbstractOperationTestCase.java b/hibernate-core/src/matrix/java/org/hibernate/test/ops/AbstractOperationTestCase.java index 28b1caa01a..51523353c2 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/ops/AbstractOperationTestCase.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/ops/AbstractOperationTestCase.java @@ -22,9 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.ops; + import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/CreateTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/ops/CreateTest.java index 0180188312..f35a0956dc 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/ops/CreateTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/ops/CreateTest.java @@ -26,13 +26,13 @@ package org.hibernate.test.ops; import java.util.ArrayList; import java.util.Collection; +import org.junit.Test; + import org.hibernate.PersistentObjectException; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.exception.ConstraintViolationException; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/DeleteTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/ops/DeleteTest.java index 9a52fb34b6..4e9e55250a 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/ops/DeleteTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/ops/DeleteTest.java @@ -23,10 +23,10 @@ */ package org.hibernate.test.ops; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Session; + /** * @author Steve Ebersole */ diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/GetLoadTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/ops/GetLoadTest.java index 61b59650ae..8d3658757c 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/ops/GetLoadTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/ops/GetLoadTest.java @@ -23,14 +23,13 @@ */ package org.hibernate.test.ops; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/MergeTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/ops/MergeTest.java index 365241cfd9..f3a01eb033 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/ops/MergeTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/ops/MergeTest.java @@ -22,10 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.ops; + import java.util.ArrayList; import java.util.List; import java.util.Set; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.NonUniqueObjectException; import org.hibernate.Session; @@ -33,8 +36,6 @@ import org.hibernate.StaleObjectStateException; import org.hibernate.Transaction; import org.hibernate.criterion.Projections; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/SaveOrUpdateTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/ops/SaveOrUpdateTest.java index b5abe0afdc..8bd1ffd0fe 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/ops/SaveOrUpdateTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/ops/SaveOrUpdateTest.java @@ -23,6 +23,8 @@ */ package org.hibernate.test.ops; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.Session; @@ -31,9 +33,6 @@ import org.hibernate.bytecode.instrumentation.internal.FieldInterceptionHelper; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Projections; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ops/SimpleOpsTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/ops/SimpleOpsTest.java index 44b738bbf9..61c73d8a11 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/ops/SimpleOpsTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/ops/SimpleOpsTest.java @@ -23,15 +23,13 @@ */ package org.hibernate.test.ops; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; -import org.junit.Test; - -import org.hibernate.testing.FailureExpected; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/optlock/OptimisticLockTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/optlock/OptimisticLockTest.java index 06e619d9b5..d4abb8e636 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/optlock/OptimisticLockTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/optlock/OptimisticLockTest.java @@ -24,14 +24,13 @@ package org.hibernate.test.optlock; +import org.junit.Test; + import org.hibernate.JDBCException; import org.hibernate.Session; import org.hibernate.StaleObjectStateException; import org.hibernate.StaleStateException; import org.hibernate.dialect.SQLServerDialect; - -import org.junit.Test; - import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ordered/OrderByTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/ordered/OrderByTest.java index 32abe5e678..a72f4231a0 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/ordered/OrderByTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/ordered/OrderByTest.java @@ -25,19 +25,18 @@ package org.hibernate.test.ordered; import java.util.Iterator; +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Test; - -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; - /** * @author Gavin King */ diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/OrphanTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/OrphanTest.java index 62a29d1bcf..9a0314f12f 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/OrphanTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/OrphanTest.java @@ -23,14 +23,13 @@ */ package org.hibernate.test.orphan; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.LockMode; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.internal.util.SerializationHelper; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/PropertyRefTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/PropertyRefTest.java index 35be37cc32..af2d20431a 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/PropertyRefTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/PropertyRefTest.java @@ -23,11 +23,10 @@ */ package org.hibernate.test.orphan; -import org.hibernate.Session; -import org.hibernate.Transaction; - import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.Transaction; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java index b8aadafcbe..18a8cf33a4 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/bidirectional/DeleteOneToOneOrphansTest.java @@ -22,11 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.orphan.one2one.fk.bidirectional; + import java.util.List; -import org.hibernate.Session; import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java index c2af0d70dd..eff8102af5 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/composite/DeleteOneToOneOrphansTest.java @@ -22,11 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.orphan.one2one.fk.composite; + import java.util.List; -import org.hibernate.Session; import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java index 363a46e121..516fae7382 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/bidirectional/DeleteOneToOneOrphansTest.java @@ -22,11 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.orphan.one2one.fk.reversed.bidirectional; + import java.util.List; -import org.hibernate.Session; import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java index dc0ad0846c..cb7de17296 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/fk/reversed/unidirectional/DeleteOneToOneOrphansTest.java @@ -22,11 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.orphan.one2one.fk.reversed.unidirectional; + import java.util.List; -import org.hibernate.Session; import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java index bb50e3c270..6750f4cafa 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/bidirectional/DeleteOneToOneOrphansTest.java @@ -22,11 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.orphan.one2one.pk.bidirectional; + import java.util.List; -import org.hibernate.Session; import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java index c1aee32291..d60246cea6 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/orphan/one2one/pk/unidirectional/DeleteOneToOneOrphansTest.java @@ -22,11 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.orphan.one2one.pk.unidirectional; + import java.util.List; -import org.hibernate.Session; import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/pagination/DistinctSelectTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/pagination/DistinctSelectTest.java index 88aa0d8a00..f37e7c655e 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/pagination/DistinctSelectTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/pagination/DistinctSelectTest.java @@ -22,15 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.pagination; + import java.util.ArrayList; import java.util.List; import java.util.UUID; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.dialect.SQLServerDialect; import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.dialect.SQLServerDialect; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java index 8bd8d4eb1c..35750de714 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/basic/PropertyRefTest.java @@ -26,6 +26,8 @@ package org.hibernate.test.propertyref.basic; import java.util.Iterator; import java.util.List; +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.Hibernate; import org.hibernate.Session; @@ -35,6 +37,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.mapping.Column; import org.hibernate.mapping.ForeignKey; import org.hibernate.mapping.PersistentClass; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -43,10 +46,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import org.junit.Test; - -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; - /** * @author Gavin King */ diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java index de93e9b135..e301632214 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/cachedcollections/CachedPropertyRefCollectionTest.java @@ -23,14 +23,13 @@ */ package org.hibernate.test.propertyref.cachedcollections; +import org.junit.Test; + import org.hibernate.Criteria; import org.hibernate.FetchMode; import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; - -import org.junit.Test; - import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java index e803e9c3c1..b6831a207b 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/complete/CompleteComponentPropertyRefTest.java @@ -24,11 +24,10 @@ package org.hibernate.test.propertyref.component.complete; -import org.hibernate.Hibernate; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Hibernate; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java index 6a1f156502..0cc13332cf 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/component/partial/PartialComponentPropertyRefTest.java @@ -23,11 +23,10 @@ */ package org.hibernate.test.propertyref.component.partial; -import org.hibernate.Hibernate; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Hibernate; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java index 47c7cf1d7c..91a7c9d79c 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/discrim/SubclassPropertyRefTest.java @@ -23,12 +23,11 @@ */ package org.hibernate.test.propertyref.inheritence.discrim; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java index 2e9dd70aa3..1b717c1e0c 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/joined/JoinedSubclassPropertyRefTest.java @@ -23,13 +23,12 @@ */ package org.hibernate.test.propertyref.inheritence.joined; +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java index d2044ab582..d899e96dc1 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/propertyref/inheritence/union/UnionSubclassPropertyRefTest.java @@ -23,12 +23,11 @@ */ package org.hibernate.test.propertyref.inheritence.union; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/proxy/ProxyTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/proxy/ProxyTest.java index abb7c764f0..d9acf165bf 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/proxy/ProxyTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/proxy/ProxyTest.java @@ -26,6 +26,8 @@ package org.hibernate.test.proxy; import java.math.BigDecimal; import java.util.List; +import org.junit.Test; + import org.hibernate.FlushMode; import org.hibernate.Hibernate; import org.hibernate.LazyInitializationException; @@ -39,9 +41,6 @@ import org.hibernate.cfg.Environment; import org.hibernate.internal.SessionImpl; import org.hibernate.internal.util.SerializationHelper; import org.hibernate.proxy.HibernateProxy; - -import org.junit.Test; - import org.hibernate.testing.FailureExpected; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java index 870c920f4c..a72b797a57 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/querycache/AbstractQueryCacheResultTransformerTest.java @@ -29,6 +29,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.junit.Test; + import org.hibernate.CacheMode; import org.hibernate.Criteria; import org.hibernate.FetchMode; @@ -46,16 +48,13 @@ import org.hibernate.criterion.Restrictions; import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.proxy.HibernateProxy; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.transform.AliasToBeanConstructorResultTransformer; import org.hibernate.transform.ResultTransformer; import org.hibernate.transform.Transformers; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.Type; -import org.junit.Test; - -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java index 1bca320e33..74a63826e8 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/querycache/HqlQueryCacheIgnoreResultTransformerTest.java @@ -23,10 +23,9 @@ */ package org.hibernate.test.querycache; -import org.hibernate.CacheMode; - import org.junit.Test; +import org.hibernate.CacheMode; import org.hibernate.testing.FailureExpected; /** diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/QueryCacheTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/querycache/QueryCacheTest.java index 99e0a1728b..a64051dde7 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/querycache/QueryCacheTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/querycache/QueryCacheTest.java @@ -27,6 +27,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; @@ -34,14 +36,11 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.stat.EntityStatistics; import org.hibernate.stat.QueryStatistics; -import org.hibernate.transform.Transformers; - -import org.junit.Test; - import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.transform.Transformers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java index 8cd9ec5519..3efdefd681 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/GetHqlQueryPlanTest.java @@ -22,15 +22,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.queryplan; + import java.util.Map; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.engine.query.spi.HQLQueryPlan; import org.hibernate.engine.query.spi.QueryPlanCache; import org.hibernate.engine.spi.SessionImplementor; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertNotSame; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java index 1f078e90fa..ab140c8039 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryPlanEqualsTest.java @@ -23,14 +23,13 @@ */ package org.hibernate.test.queryplan; +import org.junit.Test; + import org.hibernate.engine.query.spi.NativeSQLQueryPlan; import org.hibernate.engine.query.spi.QueryPlanCache; import org.hibernate.engine.query.spi.sql.NativeSQLQueryReturn; import org.hibernate.engine.query.spi.sql.NativeSQLQueryScalarReturn; import org.hibernate.engine.query.spi.sql.NativeSQLQuerySpecification; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java index b4394a91ab..f51687be2d 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/queryplan/NativeSQLQueryReturnEqualsAndHashCodeTest.java @@ -22,17 +22,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.queryplan; + import java.util.Collections; import java.util.HashMap; + +import org.junit.Test; + import org.hibernate.LockMode; import org.hibernate.engine.query.spi.sql.NativeSQLQueryCollectionReturn; import org.hibernate.engine.query.spi.sql.NativeSQLQueryJoinReturn; import org.hibernate.engine.query.spi.sql.NativeSQLQueryReturn; import org.hibernate.engine.query.spi.sql.NativeSQLQueryRootReturn; import org.hibernate.engine.query.spi.sql.NativeSQLQueryScalarReturn; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertFalse; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java index ac68d95bb3..cf19688a51 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/AbstractReadOnlyTest.java @@ -22,11 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.readonly; + import org.hibernate.CacheMode; import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java index 2a3f21abc2..1f4db7acf4 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyCriteriaQueryTest.java @@ -25,6 +25,8 @@ package org.hibernate.test.readonly; import java.util.List; +import org.junit.Test; + import org.hibernate.Criteria; import org.hibernate.Hibernate; import org.hibernate.ScrollableResults; @@ -43,8 +45,6 @@ import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; import org.hibernate.testing.SkipForDialect; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java index 57a92ddb93..d790170f5a 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyProxyTest.java @@ -22,8 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.readonly; + import java.math.BigDecimal; +import org.junit.Test; + import org.hibernate.CacheMode; import org.hibernate.Hibernate; import org.hibernate.Session; @@ -34,9 +37,6 @@ import org.hibernate.UnresolvableObjectException; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; - -import org.junit.Test; - import org.hibernate.testing.FailureExpected; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java index e4a3237f55..d197b0a0ae 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java @@ -30,14 +30,14 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.proxy.HibernateProxy; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionTest.java index 1e25f074b0..898fa5ba98 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlySessionTest.java @@ -22,10 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.readonly; + import java.math.BigDecimal; import java.util.Iterator; import java.util.List; +import org.junit.Test; + import org.hibernate.CacheMode; import org.hibernate.Hibernate; import org.hibernate.Query; @@ -35,8 +38,6 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.proxy.HibernateProxy; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyTest.java index 118a4d014f..1fed5715dd 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyTest.java @@ -22,17 +22,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.readonly; + import java.math.BigDecimal; import java.util.List; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java index d2d578515a..135f9d24fc 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/readonly/ReadOnlyVersionedNodesTest.java @@ -23,10 +23,9 @@ */ package org.hibernate.test.readonly; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.FailureExpected; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java index 96dea0371c..1439e8ef07 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/CollectionReattachmentTest.java @@ -23,10 +23,9 @@ */ package org.hibernate.test.reattachment; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; /** diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java index 573c6a58ec..27c520629c 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/reattachment/ProxyReattachmentTest.java @@ -27,10 +27,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java index 5d81eccf5c..f5d89cd270 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/resulttransformer/ResultTransformerTest.java @@ -25,17 +25,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.resulttransformer; + import java.util.List; + +import org.junit.Test; + import org.hibernate.Query; import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.transform.ResultTransformer; - -import org.junit.Test; - import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.transform.ResultTransformer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdTest.java index 98058f5a27..c90b2317f7 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdTest.java @@ -28,13 +28,12 @@ import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.Oracle9iDialect; import org.hibernate.jdbc.Work; - -import org.junit.Test; - import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdType.java b/hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdType.java index 739b44c3a8..abca48e161 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdType.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/rowid/RowIdType.java @@ -1,10 +1,12 @@ //$Id: RowIdType.java 6477 2005-04-21 07:39:21Z oneovthafew $ package org.hibernate.test.rowid; + import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; + import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.usertype.UserType; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sorted/SortTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sorted/SortTest.java index 150b2b14dd..c78277ccb3 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sorted/SortTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sorted/SortTest.java @@ -22,15 +22,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.sorted; + import java.util.Iterator; +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/AutoDiscoveryTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/AutoDiscoveryTest.java index 615dcf3911..531ebe00cc 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/AutoDiscoveryTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/AutoDiscoveryTest.java @@ -30,13 +30,12 @@ import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.List; -import org.hibernate.Session; -import org.hibernate.jdbc.Work; -import org.hibernate.loader.custom.NonUniqueDiscoveredSqlAliasException; - import org.junit.Assert; import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.jdbc.Work; +import org.hibernate.loader.custom.NonUniqueDiscoveredSqlAliasException; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Group.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Group.java index f672e707da..a6c499cb9a 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Group.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Group.java @@ -23,12 +23,12 @@ */ package org.hibernate.test.sql.autodiscovery; +import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; -import java.util.Set; /** * @author Steve Ebersole diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Membership.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Membership.java index 40f3e33b86..58794d6690 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Membership.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/Membership.java @@ -23,13 +23,12 @@ */ package org.hibernate.test.sql.autodiscovery; +import java.util.Date; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; -import java.util.Date; /** * @author Steve Ebersole diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/User.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/User.java index ec4f083175..def662fc14 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/User.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/autodiscovery/User.java @@ -23,12 +23,12 @@ */ package org.hibernate.test.sql.autodiscovery; +import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; -import java.util.Set; /** * @author Steve Ebersole diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java index a978066bda..a8dfcc2aa0 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java @@ -24,7 +24,6 @@ package org.hibernate.test.sql.check; import org.hibernate.dialect.Oracle9iDialect; - import org.hibernate.testing.RequiresDialect; /** diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java index 63ad74e72a..9449d4148f 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.sql.check; -import org.hibernate.HibernateException; -import org.hibernate.JDBCException; -import org.hibernate.Session; import org.junit.Test; +import org.hibernate.HibernateException; +import org.hibernate.JDBCException; +import org.hibernate.Session; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/MonetaryAmountUserType.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/MonetaryAmountUserType.java index d4bca9e1da..76e8e37b2e 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/MonetaryAmountUserType.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/MonetaryAmountUserType.java @@ -1,4 +1,5 @@ package org.hibernate.test.sql.hand; + import java.io.Serializable; import java.math.BigDecimal; import java.sql.PreparedStatement; @@ -6,6 +7,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import java.util.Currency; + import org.hibernate.HibernateException; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.usertype.UserType; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java index 14e1f82a14..1d671f70f6 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java @@ -26,19 +26,19 @@ package org.hibernate.test.sql.hand.custom; import java.io.Serializable; import java.util.Date; import java.util.Iterator; + +import org.junit.Test; + import org.hibernate.LockMode; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.internal.util.collections.ArrayHelper; - -import org.junit.Test; - -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.test.sql.hand.Employment; import org.hibernate.test.sql.hand.ImageHolder; import org.hibernate.test.sql.hand.Organization; import org.hibernate.test.sql.hand.Person; import org.hibernate.test.sql.hand.TextHolder; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java index ec7538786f..b43ccac65f 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java @@ -22,15 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.sql.hand.custom; + import java.sql.SQLException; import java.util.List; + +import org.junit.Test; + import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.test.sql.hand.Employment; import org.hibernate.test.sql.hand.Organization; import org.hibernate.test.sql.hand.Person; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java index 771d4b8dc7..dbdcc8c581 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java @@ -24,9 +24,8 @@ package org.hibernate.test.sql.hand.custom.datadirect.oracle; import org.hibernate.dialect.DataDirectOracle9Dialect; - -import org.hibernate.testing.RequiresDialect; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; +import org.hibernate.testing.RequiresDialect; /** * Custom SQL tests for Oracle via the DataDirect drivers. diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java index 8a51bee477..358f3bc036 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java @@ -24,9 +24,8 @@ package org.hibernate.test.sql.hand.custom.db2; import org.hibernate.dialect.DB2Dialect; - -import org.hibernate.testing.RequiresDialect; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; +import org.hibernate.testing.RequiresDialect; /** * Custom SQL tests for DB2 diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java index 990448baa2..fe0bcbefda 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java @@ -24,9 +24,8 @@ package org.hibernate.test.sql.hand.custom.mysql; import org.hibernate.dialect.MySQLDialect; - -import org.hibernate.testing.RequiresDialect; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; +import org.hibernate.testing.RequiresDialect; /** * Custom SQL tests for MySQL diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java index b8dd7bcc82..b40b369cb3 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java @@ -24,9 +24,8 @@ package org.hibernate.test.sql.hand.custom.oracle; import org.hibernate.dialect.Oracle9iDialect; - -import org.hibernate.testing.RequiresDialect; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; +import org.hibernate.testing.RequiresDialect; /** * Custom SQL tests for Oracle diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java index f532c024c2..051dc85fbb 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java @@ -24,9 +24,8 @@ package org.hibernate.test.sql.hand.custom.sqlserver; import org.hibernate.dialect.SQLServerDialect; - -import org.hibernate.testing.RequiresDialect; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; +import org.hibernate.testing.RequiresDialect; /** * Custom SQL tests for SQLServer diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java index 7236018a0a..e027288f3c 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java @@ -27,9 +27,8 @@ import org.hibernate.dialect.Sybase11Dialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.SybaseAnywhereDialect; import org.hibernate.dialect.SybaseDialect; - -import org.hibernate.testing.RequiresDialect; import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; +import org.hibernate.testing.RequiresDialect; /** * Custom SQL tests for Sybase dialects diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java index 9055cfab5e..3b0dc1f275 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java @@ -23,15 +23,14 @@ */ package org.hibernate.test.sql.hand.identity; -import org.hibernate.JDBCException; -import org.hibernate.Session; - import org.junit.Test; +import org.hibernate.JDBCException; +import org.hibernate.Session; +import org.hibernate.test.sql.hand.Organization; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; -import org.hibernate.test.sql.hand.Organization; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java index c91d5f947e..29910bd56a 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java @@ -8,6 +8,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.Query; @@ -18,19 +20,6 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; import org.hibernate.internal.util.collections.ArrayHelper; -import org.hibernate.testing.SkipForDialect; -import org.hibernate.transform.BasicTransformerAdapter; -import org.hibernate.transform.DistinctRootEntityResultTransformer; -import org.hibernate.transform.Transformers; -import org.hibernate.type.FloatType; -import org.hibernate.type.LongType; -import org.hibernate.type.StringType; -import org.hibernate.type.TimestampType; - -import org.junit.Test; - -import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.test.sql.hand.Dimension; import org.hibernate.test.sql.hand.Employment; import org.hibernate.test.sql.hand.Group; @@ -42,6 +31,16 @@ import org.hibernate.test.sql.hand.Product; import org.hibernate.test.sql.hand.SpaceShip; import org.hibernate.test.sql.hand.Speech; import org.hibernate.test.sql.hand.TextHolder; +import org.hibernate.testing.FailureExpected; +import org.hibernate.testing.SkipForDialect; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.transform.BasicTransformerAdapter; +import org.hibernate.transform.DistinctRootEntityResultTransformer; +import org.hibernate.transform.Transformers; +import org.hibernate.type.FloatType; +import org.hibernate.type.LongType; +import org.hibernate.type.StringType; +import org.hibernate.type.TimestampType; import static org.hibernate.testing.junit4.ExtraAssertions.assertClassAssignability; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java index 5b4700e65c..4f8363feb8 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.sql.hand.quotedidentifiers; -import org.hibernate.SQLQuery; -import org.hibernate.Session; -import org.hibernate.dialect.Dialect; import org.junit.Test; +import org.hibernate.SQLQuery; +import org.hibernate.Session; +import org.hibernate.dialect.Dialect; import org.hibernate.testing.DialectCheck; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java index 63b9f26872..71a211217d 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionQueryTest.java @@ -22,17 +22,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.stateless; + import java.util.ArrayList; import java.util.List; + +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.Session; import org.hibernate.StatelessSession; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionTest.java index c398b8fc0c..7d714e20eb 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/stateless/StatelessSessionTest.java @@ -22,15 +22,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.stateless; + import java.util.Date; +import org.junit.Test; + import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.StatelessSession; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java index ac723eee82..391268320d 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java @@ -26,6 +26,7 @@ package org.hibernate.test.stateless.fetching; import java.util.Date; import org.jboss.logging.Logger; +import org.junit.Test; import org.hibernate.Hibernate; import org.hibernate.Session; @@ -33,9 +34,6 @@ import org.hibernate.StatelessSession; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.DefaultNamingStrategy; import org.hibernate.internal.util.StringHelper; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertFalse; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stats/SessionStatsTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/stats/SessionStatsTest.java index e07d567540..d1562a453a 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/stats/SessionStatsTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/stats/SessionStatsTest.java @@ -25,14 +25,13 @@ package org.hibernate.test.stats; import java.util.HashSet; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.stat.SessionStatistics; import org.hibernate.stat.Statistics; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/stats/StatsTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/stats/StatsTest.java index 59fc68fb63..3d9c6c253d 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/stats/StatsTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/stats/StatsTest.java @@ -22,9 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.stats; + import java.util.HashSet; import java.util.Iterator; +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.Hibernate; import org.hibernate.ScrollableResults; @@ -36,9 +39,6 @@ import org.hibernate.cfg.Environment; import org.hibernate.mapping.Collection; import org.hibernate.stat.QueryStatistics; import org.hibernate.stat.Statistics; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java index 910e57c789..1101da6a72 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/DiscrimSubclassFilterTest.java @@ -22,16 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.subclassfilter; + import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import org.hibernate.Session; -import org.hibernate.Transaction; - import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.Transaction; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java index 31af9124ed..5bfb4f0234 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/JoinedSubclassFilterTest.java @@ -22,16 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.subclassfilter; + import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import org.hibernate.Session; -import org.hibernate.Transaction; - import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.Transaction; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java index 3fbfcc4ce2..d79bf7aefb 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/subclassfilter/UnionSubclassFilterTest.java @@ -28,11 +28,10 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import org.hibernate.Session; -import org.hibernate.Transaction; - import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.Transaction; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subselect/SubselectTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/subselect/SubselectTest.java index e883e33fc9..b35ede4292 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/subselect/SubselectTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/subselect/SubselectTest.java @@ -25,12 +25,11 @@ package org.hibernate.test.subselect; import java.util.List; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java index f9e8b6ca6d..7d64b312e2 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/subselectfetch/SubselectFetchTest.java @@ -25,6 +25,8 @@ package org.hibernate.test.subselectfetch; import java.util.List; +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.Hibernate; import org.hibernate.Session; @@ -33,9 +35,6 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Order; import org.hibernate.criterion.Property; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/ternary/TernaryTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/ternary/TernaryTest.java index 9a466f43d3..d850a4f4f7 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/ternary/TernaryTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/ternary/TernaryTest.java @@ -30,12 +30,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/timestamp/TimestampTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/timestamp/TimestampTest.java index bf2366233f..35c9b96156 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/timestamp/TimestampTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/timestamp/TimestampTest.java @@ -25,13 +25,12 @@ package org.hibernate.test.timestamp; import java.util.Date; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/tm/CMTTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/tm/CMTTest.java index 7f1c2fe740..bed3c6ee79 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/tm/CMTTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/tm/CMTTest.java @@ -23,11 +23,13 @@ */ package org.hibernate.test.tm; -import javax.transaction.Transaction; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import javax.transaction.Transaction; + +import org.junit.Test; import org.hibernate.ConnectionReleaseMode; import org.hibernate.EntityMode; @@ -37,9 +39,6 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.criterion.Order; import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory; - -import org.junit.Test; - import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.jta.TestingJtaBootstrap; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/tm/TransactionTimeoutTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/tm/TransactionTimeoutTest.java index 4c0987623f..63cd5fe317 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/tm/TransactionTimeoutTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/tm/TransactionTimeoutTest.java @@ -30,8 +30,6 @@ import org.hibernate.Transaction; import org.hibernate.TransactionException; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.engine.transaction.internal.jdbc.JdbcTransaction; - import org.hibernate.test.jdbc.Person; import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/CharInNativeQueryTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/CharInNativeQueryTest.java index fdc2397269..1a8548af7b 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/CharInNativeQueryTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/CharInNativeQueryTest.java @@ -22,14 +22,17 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.typedescriptor; - -import static org.junit.Assert.*; + import org.junit.Test; import org.hibernate.Session; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * @author Strong Liu */ diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/VariousTypesEntity.java b/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/VariousTypesEntity.java index 0586dca6d3..23e820c4e2 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/VariousTypesEntity.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/typedescriptor/VariousTypesEntity.java @@ -26,7 +26,6 @@ package org.hibernate.test.typedescriptor; import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Lob; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java index ea7f6e1d0a..8ecd2d3ab0 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/typedmanytoone/TypedManyToOneTest.java @@ -25,12 +25,11 @@ package org.hibernate.test.typedmanytoone; import java.util.List; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java index 24c529f95a..9c23cd3df1 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/typedonetoone/TypedOneToOneTest.java @@ -25,12 +25,11 @@ package org.hibernate.test.typedonetoone; import java.util.List; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/H2DialectOverrideVarcharSqlCode.java b/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/H2DialectOverrideVarcharSqlCode.java index 9e5c2935dd..40255161c6 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/H2DialectOverrideVarcharSqlCode.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/H2DialectOverrideVarcharSqlCode.java @@ -24,6 +24,7 @@ package org.hibernate.test.typeoverride; import java.sql.Types; + import org.hibernate.dialect.H2Dialect; import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/TypeOverrideTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/TypeOverrideTest.java index 227c72a863..061e424159 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/TypeOverrideTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/typeoverride/TypeOverrideTest.java @@ -23,21 +23,20 @@ */ package org.hibernate.test.typeoverride; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.testing.SkipForDialect; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.type.descriptor.sql.BlobTypeDescriptor; import org.hibernate.type.descriptor.sql.IntegerTypeDescriptor; import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; import org.hibernate.type.descriptor.sql.VarcharTypeDescriptor; -import org.junit.Test; - -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/TypeParameterTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/TypeParameterTest.java index cf165f40c4..b05e926f06 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/TypeParameterTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/typeparameters/TypeParameterTest.java @@ -28,12 +28,11 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.jdbc.Work; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/UnconstrainedTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/UnconstrainedTest.java index d74406028e..da743cba94 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/UnconstrainedTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/unconstrained/UnconstrainedTest.java @@ -23,14 +23,13 @@ */ package org.hibernate.test.unconstrained; +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Restrictions; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unidir/BackrefTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/unidir/BackrefTest.java index 0a0b76c823..756f4615a2 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/unidir/BackrefTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/unidir/BackrefTest.java @@ -23,12 +23,11 @@ */ package org.hibernate.test.unidir; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java index 6f2b5951e9..1708acbe90 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/UnionSubclassTest.java @@ -26,15 +26,14 @@ package org.hibernate.test.unionsubclass; import java.util.Iterator; import java.util.List; +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.Hibernate; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Order; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java index 06ddfc9540..b5423b16c3 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass/alias/SellCarTest.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.unionsubclass.alias; -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.Transaction; import org.junit.Test; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.Transaction; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java index ac2a50299b..813cc134f8 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/unionsubclass2/UnionSubclassTest.java @@ -26,15 +26,14 @@ package org.hibernate.test.unionsubclass2; import java.math.BigDecimal; import java.util.List; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.criterion.Property; import org.hibernate.criterion.Restrictions; import org.hibernate.dialect.HSQLDialect; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/VersionTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/version/VersionTest.java index 4413f4bc00..82fb0aa866 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/version/VersionTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/version/VersionTest.java @@ -23,12 +23,11 @@ */ package org.hibernate.test.version; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.Session; import org.hibernate.Transaction; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/db/DbVersionTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/version/db/DbVersionTest.java index 9d1e783431..428bac6989 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/version/db/DbVersionTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/version/db/DbVersionTest.java @@ -25,13 +25,12 @@ package org.hibernate.test.version.db; import java.sql.Timestamp; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.type.StandardBasicTypes; - import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.Transaction; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.type.StandardBasicTypes; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java index bfcf2c8d25..a580396e7e 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/version/sybase/SybaseTimestampVersioningTest.java @@ -23,17 +23,15 @@ */ package org.hibernate.test.version.sybase; +import org.junit.Test; + import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.dialect.SybaseASE15Dialect; -import org.hibernate.dialect.SybaseDialect; -import org.hibernate.type.BinaryType; - -import org.junit.Test; - import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; +import org.hibernate.type.BinaryType; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/where/WhereTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/where/WhereTest.java index e6f9c995b6..175b8ee12a 100755 --- a/hibernate-core/src/matrix/java/org/hibernate/test/where/WhereTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/where/WhereTest.java @@ -23,12 +23,11 @@ */ package org.hibernate.test.where; +import org.junit.Test; + import org.hibernate.FetchMode; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java index f63be12a0f..4d763ff5a5 100644 --- a/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java @@ -23,16 +23,15 @@ */ package org.hibernate.dialect.resolver; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; - import java.sql.Connection; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Properties; +import org.junit.Before; +import org.junit.Test; + import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.dialect.DB2400Dialect; @@ -63,8 +62,10 @@ import org.hibernate.service.jdbc.dialect.internal.DialectResolverSet; import org.hibernate.service.jdbc.dialect.internal.StandardDialectResolver; import org.hibernate.service.jdbc.dialect.spi.DialectResolver; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.junit.Before; -import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/version/Customer.java b/hibernate-core/src/test/java/org/hibernate/jpa/version/Customer.java index fdcab11599..16b8b654dd 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/version/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/version/Customer.java @@ -23,14 +23,14 @@ */ package org.hibernate.jpa.version; +import java.util.ArrayList; +import java.util.List; import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Version; -import java.util.ArrayList; -import java.util.List; /** * @author Steve Ebersole diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/version/JpaSpecVersionValueUpdatingTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/version/JpaSpecVersionValueUpdatingTest.java index e28f9b799c..66b3340567 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/version/JpaSpecVersionValueUpdatingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/version/JpaSpecVersionValueUpdatingTest.java @@ -23,11 +23,9 @@ */ package org.hibernate.jpa.version; -import org.hibernate.Session; - import org.junit.Test; -import org.hibernate.testing.FailureExpected; +import org.hibernate.Session; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/property/DirectPropertyAccessorTest.java b/hibernate-core/src/test/java/org/hibernate/property/DirectPropertyAccessorTest.java index 6773ab2cd3..722e663f59 100644 --- a/hibernate-core/src/test/java/org/hibernate/property/DirectPropertyAccessorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/property/DirectPropertyAccessorTest.java @@ -24,8 +24,6 @@ */ package org.hibernate.property; -import java.util.Date; - import org.junit.Test; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/test/java/org/hibernate/property/Order.java b/hibernate-core/src/test/java/org/hibernate/property/Order.java index 43f5380922..5b2ab79860 100644 --- a/hibernate-core/src/test/java/org/hibernate/property/Order.java +++ b/hibernate-core/src/test/java/org/hibernate/property/Order.java @@ -26,8 +26,8 @@ package org.hibernate.property; import java.io.Serializable; -import java.util.Set; import java.util.HashSet; +import java.util.Set; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Id; diff --git a/hibernate-core/src/test/java/org/hibernate/serialization/SessionFactorySerializationTest.java b/hibernate-core/src/test/java/org/hibernate/serialization/SessionFactorySerializationTest.java index 6c4fdeffda..d81aaf0193 100644 --- a/hibernate-core/src/test/java/org/hibernate/serialization/SessionFactorySerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/serialization/SessionFactorySerializationTest.java @@ -24,23 +24,18 @@ package org.hibernate.serialization; -import javax.naming.NamingException; import javax.naming.Reference; import javax.naming.StringRefAddr; -import java.io.InvalidObjectException; +import org.junit.Test; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; -import org.hibernate.id.UUIDGenerator; import org.hibernate.internal.SessionFactoryRegistry; import org.hibernate.internal.util.SerializationHelper; -import org.hibernate.type.SerializationException; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseUnitTestCase; +import org.hibernate.type.SerializationException; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; diff --git a/hibernate-core/src/test/java/org/hibernate/sharedSession/SessionWithSharedConnectionTest.java b/hibernate-core/src/test/java/org/hibernate/sharedSession/SessionWithSharedConnectionTest.java index 4a078e79b9..adec19accb 100644 --- a/hibernate-core/src/test/java/org/hibernate/sharedSession/SessionWithSharedConnectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/sharedSession/SessionWithSharedConnectionTest.java @@ -23,15 +23,12 @@ */ package org.hibernate.sharedSession; -import org.hibernate.Criteria; +import org.junit.Test; + import org.hibernate.IrrelevantEntity; import org.hibernate.Session; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.transaction.spi.TransactionContext; - -import org.junit.Test; - -import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/Customer.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/Customer.java index a4948636e8..ebebc1cfd3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/Customer.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/Customer.java @@ -23,13 +23,13 @@ */ package org.hibernate.test.annotations.embeddables.nested; +import java.util.ArrayList; +import java.util.List; import javax.persistence.ElementCollection; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import java.util.ArrayList; -import java.util.List; import org.hibernate.annotations.GenericGenerator; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/Investment.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/Investment.java index ca87c0c22d..32d25ee3d5 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/Investment.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/Investment.java @@ -23,9 +23,9 @@ */ package org.hibernate.test.annotations.embeddables.nested; +import java.util.Date; import javax.persistence.Column; import javax.persistence.Embeddable; -import java.util.Date; /** * @author Thomas Vanstals diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/MonetaryAmount.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/MonetaryAmount.java index 58e61f125f..054018a879 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/MonetaryAmount.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/MonetaryAmount.java @@ -23,11 +23,11 @@ */ package org.hibernate.test.annotations.embeddables.nested; +import java.math.BigDecimal; import javax.persistence.Column; import javax.persistence.Embeddable; import javax.persistence.EnumType; import javax.persistence.Enumerated; -import java.math.BigDecimal; /** * @author Thomas Vanstals diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java index 77b4f779e1..062f862f7d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/nested/NestedEmbeddableMetadataTest.java @@ -25,6 +25,8 @@ package org.hibernate.test.annotations.embeddables.nested; import java.sql.Types; +import org.junit.Test; + import org.hibernate.cfg.Configuration; import org.hibernate.engine.spi.Mapping; import org.hibernate.mapping.Collection; @@ -32,12 +34,8 @@ import org.hibernate.mapping.Component; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.SimpleValue; -import org.hibernate.type.CustomType; -import org.hibernate.type.EnumType; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseUnitTestCase; +import org.hibernate.type.CustomType; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dirtiness/CustomDirtinessStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/test/dirtiness/CustomDirtinessStrategyTest.java index b95fc045a5..bfc0cbea84 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dirtiness/CustomDirtinessStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/dirtiness/CustomDirtinessStrategyTest.java @@ -23,15 +23,13 @@ */ package org.hibernate.test.dirtiness; +import org.junit.Test; + import org.hibernate.CustomEntityDirtinessStrategy; import org.hibernate.Session; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.persister.entity.EntityPersister; - -import org.junit.Before; -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-core/src/test/java/org/hibernate/test/dirtiness/Thing.java b/hibernate-core/src/test/java/org/hibernate/test/dirtiness/Thing.java index 14d36afd7d..93c353618d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/dirtiness/Thing.java +++ b/hibernate-core/src/test/java/org/hibernate/test/dirtiness/Thing.java @@ -23,14 +23,13 @@ */ package org.hibernate.test.dirtiness; +import java.util.HashMap; +import java.util.Map; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Transient; -import java.util.HashMap; -import java.util.Map; - import org.hibernate.annotations.GenericGenerator; /** diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/EhCacheMessageLogger.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/EhCacheMessageLogger.java index 294c042001..c7fdc74ea2 100644 --- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/EhCacheMessageLogger.java +++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/EhCacheMessageLogger.java @@ -23,14 +23,14 @@ */ package org.hibernate.cache.ehcache; -import static org.jboss.logging.Logger.Level.WARN; - -import org.hibernate.internal.CoreMessageLogger; - import org.jboss.logging.LogMessage; import org.jboss.logging.Message; import org.jboss.logging.MessageLogger; +import org.hibernate.internal.CoreMessageLogger; + +import static org.jboss.logging.Logger.Level.WARN; + /** * The jboss-logging {@link MessageLogger} for the hibernate-ehcache module. It reserves message ids ranging from * 20001 to 25000 inclusively. diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/regions/EhcacheTimestampsRegion.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/regions/EhcacheTimestampsRegion.java index 266d93ecde..bbc87dfd00 100644 --- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/regions/EhcacheTimestampsRegion.java +++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/regions/EhcacheTimestampsRegion.java @@ -23,13 +23,13 @@ */ package org.hibernate.cache.ehcache.internal.regions; +import java.util.Properties; + import net.sf.ehcache.Ehcache; import org.hibernate.cache.ehcache.internal.strategy.EhcacheAccessStrategyFactory; import org.hibernate.cache.spi.TimestampsRegion; -import java.util.Properties; - /** * A timestamps region specific wrapper around an Ehcache instance. * diff --git a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/strategy/EhcacheAccessStrategyFactoryImpl.java b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/strategy/EhcacheAccessStrategyFactoryImpl.java index 5179d4525a..94cc5dc042 100644 --- a/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/strategy/EhcacheAccessStrategyFactoryImpl.java +++ b/hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/internal/strategy/EhcacheAccessStrategyFactoryImpl.java @@ -23,6 +23,8 @@ */ package org.hibernate.cache.ehcache.internal.strategy; +import org.jboss.logging.Logger; + import org.hibernate.cache.ehcache.EhCacheMessageLogger; import org.hibernate.cache.ehcache.internal.regions.EhcacheCollectionRegion; import org.hibernate.cache.ehcache.internal.regions.EhcacheEntityRegion; @@ -31,7 +33,6 @@ import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy; import org.hibernate.cache.spi.access.EntityRegionAccessStrategy; import org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy; -import org.jboss.logging.Logger; /** * Class implementing {@link EhcacheAccessStrategyFactory} diff --git a/hibernate-ehcache/src/test/java/org/hibernate/cache/ehcache/internal/strategy/ItemValueExtractor.java b/hibernate-ehcache/src/test/java/org/hibernate/cache/ehcache/internal/strategy/ItemValueExtractor.java index 88ebc70034..690c7b09b1 100644 --- a/hibernate-ehcache/src/test/java/org/hibernate/cache/ehcache/internal/strategy/ItemValueExtractor.java +++ b/hibernate-ehcache/src/test/java/org/hibernate/cache/ehcache/internal/strategy/ItemValueExtractor.java @@ -1,7 +1,6 @@ package org.hibernate.cache.ehcache.internal.strategy; import org.hibernate.cache.ehcache.internal.regions.EhcacheTransactionalDataRegion; -import org.hibernate.cache.ehcache.internal.strategy.AbstractReadWriteEhcacheAccessStrategy; import org.hibernate.cfg.Settings; diff --git a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/EhcacheStatsImplTest.java b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/EhcacheStatsImplTest.java index 4563433cd5..be342b5481 100644 --- a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/EhcacheStatsImplTest.java +++ b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/EhcacheStatsImplTest.java @@ -1,13 +1,11 @@ package org.hibernate.test.cache; import net.sf.ehcache.CacheManager; - -import org.hibernate.cache.ehcache.management.impl.EhcacheStatsImpl; -import org.hibernate.cache.ehcache.management.impl.EhcacheStatsImpl; - import org.junit.BeforeClass; import org.junit.Test; +import org.hibernate.cache.ehcache.management.impl.EhcacheStatsImpl; + import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/HibernateCacheTest.java b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/HibernateCacheTest.java index 55b865d6e9..e118a6c163 100644 --- a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/HibernateCacheTest.java +++ b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/HibernateCacheTest.java @@ -1,6 +1,13 @@ package org.hibernate.test.cache; +import java.util.Date; +import java.util.List; +import java.util.Map; + import org.hamcrest.CoreMatchers; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; import org.hibernate.HibernateException; import org.hibernate.Session; @@ -19,14 +26,6 @@ import org.hibernate.test.domain.Person; import org.hibernate.test.domain.PhoneNumber; import org.hibernate.test.domain.VersionedItem; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.util.Date; -import java.util.List; -import java.util.Map; - import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; diff --git a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java index 70f7c655ab..ba599b4032 100644 --- a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java +++ b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java @@ -1,12 +1,12 @@ package org.hibernate.test.cache.ehcache; +import java.lang.reflect.Field; +import java.util.Map; + import org.hibernate.cache.ehcache.EhCacheRegionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import java.lang.reflect.Field; -import java.util.Map; - /** * @author Alex Snaps */ diff --git a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java index 7ae1f100a3..7e81124210 100644 --- a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java +++ b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java @@ -1,12 +1,12 @@ package org.hibernate.test.cache.ehcache; +import java.util.Map; + import org.hibernate.cache.ehcache.EhCacheRegionFactory; import org.hibernate.cache.ehcache.internal.strategy.ItemValueExtractor; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import java.util.Map; - /** * @author Alex Snaps */ diff --git a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheTest.java b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheTest.java index e289154873..8e9f29e8e7 100644 --- a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheTest.java +++ b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheTest.java @@ -25,6 +25,8 @@ package org.hibernate.test.cache.ehcache; import java.util.Map; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; @@ -32,9 +34,6 @@ import org.hibernate.cfg.Environment; import org.hibernate.engine.transaction.internal.jdbc.JdbcTransactionFactory; import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.stat.Statistics; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java index 53155a51c1..8c7e84f965 100755 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java @@ -32,7 +32,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.persistence.CacheRetrieveMode; import javax.persistence.CacheStoreMode; import javax.persistence.EntityExistsException; @@ -64,6 +63,8 @@ import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.TransactionManager; +import org.jboss.logging.Logger; + import org.hibernate.AssertionFailure; import org.hibernate.CacheMode; import org.hibernate.FlushMode; @@ -113,7 +114,6 @@ import org.hibernate.proxy.HibernateProxy; import org.hibernate.service.jta.platform.spi.JtaPlatform; import org.hibernate.transform.BasicTransformerAdapter; import org.hibernate.type.Type; -import org.jboss.logging.Logger; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java index 2dbb9463a7..e02285644c 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java @@ -23,16 +23,16 @@ */ package org.hibernate.ejb; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; import javax.persistence.CacheRetrieveMode; import javax.persistence.CacheStoreMode; import javax.persistence.FlushModeType; import javax.persistence.Parameter; import javax.persistence.TransactionRequiredException; import javax.persistence.TypedQuery; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; import org.jboss.logging.Logger; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java index 2699010e86..4accb666bf 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java @@ -60,6 +60,10 @@ import javax.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; import org.dom4j.Element; +import org.jboss.logging.Logger; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; + import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.MappingException; @@ -105,9 +109,6 @@ import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.service.internal.StandardServiceRegistryImpl; import org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl; -import org.jboss.logging.Logger; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; /** * Allow a fine tuned configuration of an EJB 3.0 EntityManagerFactory diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java index 5c2b25b0c4..2f06db754c 100755 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Properties; - import javax.persistence.Cache; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java index 4ee33e8b31..e0cc54e2e6 100755 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java @@ -29,6 +29,8 @@ import javax.persistence.PersistenceException; import javax.persistence.spi.PersistenceUnitTransactionType; import javax.transaction.Synchronization; +import org.jboss.logging.Logger; + import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.Session; @@ -37,7 +39,6 @@ import org.hibernate.annotations.common.util.ReflectHelper; import org.hibernate.cfg.Environment; import org.hibernate.ejb.internal.EntityManagerMessageLogger; import org.hibernate.engine.spi.SessionImplementor; -import org.jboss.logging.Logger; /** * Hibernate implementation of {@link javax.persistence.EntityManager}. diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManager.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManager.java index 511924519b..fb47a82239 100755 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManager.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManager.java @@ -22,7 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb; + import javax.persistence.EntityManager; + import org.hibernate.Session; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java index f2f7268493..8f1913e352 100755 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerFactory.java @@ -23,8 +23,8 @@ */ package org.hibernate.ejb; -import javax.persistence.EntityManagerFactory; import java.io.Serializable; +import javax.persistence.EntityManagerFactory; import org.hibernate.SessionFactory; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java index b05d669e72..b6c015a1ab 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java @@ -22,12 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb; + import java.util.List; import java.util.Map; import javax.persistence.LockModeType; import javax.persistence.PersistenceException; import javax.persistence.TypedQuery; import javax.persistence.criteria.Selection; + import org.hibernate.HibernateException; import org.hibernate.LockOptions; import org.hibernate.StaleStateException; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java index 0b2a0de3d0..f3c32040fd 100755 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java @@ -29,6 +29,7 @@ import javax.persistence.spi.LoadState; import javax.persistence.spi.PersistenceProvider; import javax.persistence.spi.PersistenceUnitInfo; import javax.persistence.spi.ProviderUtil; + import org.hibernate.ejb.util.PersistenceUtilHelper; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java index 074aff71d2..2b6e6fd5d7 100755 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb; -import static javax.persistence.TemporalType.DATE; -import static javax.persistence.TemporalType.TIME; -import static javax.persistence.TemporalType.TIMESTAMP; + import java.util.Calendar; import java.util.Collection; import java.util.Collections; @@ -41,6 +39,9 @@ import javax.persistence.Query; import javax.persistence.TemporalType; import javax.persistence.TransactionRequiredException; import javax.persistence.TypedQuery; + +import org.jboss.logging.Logger; + import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.HibernateException; @@ -51,11 +52,14 @@ import org.hibernate.TypeMismatchException; import org.hibernate.ejb.internal.EntityManagerMessageLogger; import org.hibernate.ejb.util.LockModeTypeHelper; import org.hibernate.engine.query.spi.NamedParameterDescriptor; -import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.query.spi.OrdinalParameterDescriptor; +import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.hql.internal.QueryExecutionRequestException; import org.hibernate.internal.AbstractQueryImpl; -import org.jboss.logging.Logger; + +import static javax.persistence.TemporalType.DATE; +import static javax.persistence.TemporalType.TIME; +import static javax.persistence.TemporalType.TIMESTAMP; /** * Hibernate implementation of both the {@link Query} and {@link TypedQuery} contracts. diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/TransactionImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/TransactionImpl.java index c95f7576c4..8d7b54dedb 100755 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/TransactionImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/TransactionImpl.java @@ -22,9 +22,11 @@ //$Id$ package org.hibernate.ejb; + import javax.persistence.EntityTransaction; import javax.persistence.PersistenceException; import javax.persistence.RollbackException; + import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java index 99e6dca9fd..497a6edce8 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java @@ -20,15 +20,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.connection; + import java.sql.Connection; import java.sql.SQLException; import java.util.Properties; import javax.sql.DataSource; + +import org.jboss.logging.Logger; + import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.ejb.internal.EntityManagerMessageLogger; import org.hibernate.service.jdbc.connections.internal.DatasourceConnectionProviderImpl; -import org.jboss.logging.Logger; /** * A specialization of {@link DatasourceConnectionProviderImpl} which uses the {@link DataSource} specified vi diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaBuilderImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaBuilderImpl.java index c5dd464dc3..92be735469 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaBuilderImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaBuilderImpl.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria; + import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; @@ -40,6 +41,7 @@ import javax.persistence.criteria.ParameterExpression; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Selection; import javax.persistence.criteria.Subquery; + import org.hibernate.ejb.EntityManagerFactoryImpl; import org.hibernate.ejb.criteria.expression.BinaryArithmeticOperation; import org.hibernate.ejb.criteria.expression.CoalesceExpression; @@ -77,7 +79,6 @@ import org.hibernate.ejb.criteria.predicate.ComparisonPredicate; import org.hibernate.ejb.criteria.predicate.ComparisonPredicate.ComparisonOperator; import org.hibernate.ejb.criteria.predicate.CompoundPredicate; import org.hibernate.ejb.criteria.predicate.ExistsPredicate; -import org.hibernate.ejb.criteria.predicate.ImplicitNumericExpressionTypeDeterminer; import org.hibernate.ejb.criteria.predicate.InPredicate; import org.hibernate.ejb.criteria.predicate.IsEmptyPredicate; import org.hibernate.ejb.criteria.predicate.LikePredicate; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java index 5c1a003fcf..5f753e2ad4 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java @@ -39,12 +39,13 @@ import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.ParameterExpression; -import org.hibernate.ejb.internal.EntityManagerMessageLogger; +import org.jboss.logging.Logger; + import org.hibernate.ejb.HibernateEntityManagerImplementor; +import org.hibernate.ejb.internal.EntityManagerMessageLogger; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.StringHelper; import org.hibernate.type.Type; -import org.jboss.logging.Logger; /** * Compiles a JPA criteria query into an executable {@link TypedQuery}. Its single contract is the {@link #compile} diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java index 17d5511bf6..712e00062c 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria; + import java.io.Serializable; import java.util.Arrays; import java.util.Collections; @@ -37,6 +38,7 @@ import javax.persistence.criteria.Root; import javax.persistence.criteria.Selection; import javax.persistence.criteria.Subquery; import javax.persistence.metamodel.EntityType; + import org.hibernate.ejb.HibernateEntityManagerImplementor; import org.hibernate.type.Type; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java index 8be5ea2f54..bc91c77e50 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria; + import java.io.Serializable; import java.util.List; import java.util.Set; @@ -37,6 +38,7 @@ import javax.persistence.criteria.Root; import javax.persistence.criteria.SetJoin; import javax.persistence.criteria.Subquery; import javax.persistence.metamodel.EntityType; + import org.hibernate.ejb.criteria.expression.ExpressionImpl; import org.hibernate.ejb.criteria.path.RootImpl; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java index 76385a496e..6911f3fca6 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria; + import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -42,6 +43,7 @@ import javax.persistence.criteria.Root; import javax.persistence.criteria.Selection; import javax.persistence.criteria.Subquery; import javax.persistence.metamodel.EntityType; + import org.hibernate.ejb.criteria.path.RootImpl; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java index e70833f69d..6b200c4a01 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java @@ -22,7 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; + import org.hibernate.ejb.criteria.AbstractNode; import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.TupleElementImplementor; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java index 01a08fcf9d..f2e95e7453 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java index 6afc2bfbc5..457f417956 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java @@ -22,11 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; import javax.persistence.criteria.CriteriaBuilder.Coalesce; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java index 8cca85ee39..a6b343a883 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java @@ -22,12 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; import javax.persistence.Tuple; import javax.persistence.criteria.CompoundSelection; import javax.persistence.criteria.Selection; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java index 7435ab92aa..6f70ae386f 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java index 42e91fbf6f..d8276e7242 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java @@ -22,7 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java index 4a8f0951a5..22869cea07 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java @@ -22,12 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Collection; import javax.persistence.criteria.Expression; import javax.persistence.criteria.Predicate; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.ExpressionImplementor; import org.hibernate.ejb.criteria.expression.function.CastFunction; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java index fc6bbecd26..602e8d412d 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import javax.persistence.metamodel.ListAttribute; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java index 6ba078983e..be0cc371fa 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java @@ -22,7 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/MapEntryExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/MapEntryExpression.java index 36b876898e..20da99aae1 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/MapEntryExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/MapEntryExpression.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import java.util.Map; import javax.persistence.criteria.Expression; import javax.persistence.metamodel.MapAttribute; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullLiteralExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullLiteralExpression.java index 8788030d82..e7054b502f 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullLiteralExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullLiteralExpression.java @@ -22,7 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java index b7b17519d7..71ff07cb50 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java index 11d44dc312..ab934e9a93 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import javax.persistence.criteria.ParameterExpression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/PathTypeExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/PathTypeExpression.java index 9c6f95d618..51ba3a2338 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/PathTypeExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/PathTypeExpression.java @@ -22,7 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java index d318c9e5a5..5bfc10a8c5 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java @@ -22,11 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; import javax.persistence.criteria.CriteriaBuilder.Case; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java index 58567a33f1..e0b955c18e 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import java.util.Collections; import java.util.List; import javax.persistence.criteria.Selection; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.ParameterContainer; import org.hibernate.ejb.criteria.SelectionImplementor; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java index f090c4fa9b..49953db624 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java @@ -22,11 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; import javax.persistence.criteria.CriteriaBuilder.SimpleCase; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java index fc03478076..c3dcf677ef 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import java.util.Collection; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java index eb06bf26d0..c6954d6540 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java @@ -22,13 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import javax.persistence.criteria.Subquery; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; import org.hibernate.ejb.criteria.Renderable; -import org.hibernate.ejb.criteria.expression.SubqueryComparisonModifierExpression.Modifier; /** * Represents a {@link Modifier#ALL}, {@link Modifier#ANY}, {@link Modifier#SOME} modifier appplied to a subquery as diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java index 5d16254b89..b62253eb9c 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java index 657417f64d..0c68b4c809 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java index ce3defc30d..d4a8a5fa35 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import java.util.List; import javax.persistence.criteria.Expression; import javax.persistence.criteria.Root; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.expression.LiteralExpression; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java index 448a88061e..9edaac695b 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java @@ -22,7 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java index 047e072b9a..537bd2e932 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java @@ -22,7 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java index 3faa471a4b..210ebe4610 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import java.sql.Date; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java index 11c4e6791f..9949f9f291 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import java.sql.Time; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java index caa0a58028..e451ebb781 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import java.sql.Timestamp; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java index 836b3131fe..c105685acd 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java index 8803b67191..6228da7a19 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java index 1a3176bac6..3a5cd365d6 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java index 8195dfa1eb..46d5465e5b 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterContainer; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java index dc37f1c6fa..1a007dae48 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java index 0f4f1c153b..a3b0976adf 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java index 9c7f48846a..4263ef7389 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java @@ -22,9 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import javax.persistence.criteria.CriteriaBuilder.Trimspec; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java index 9a1c416c8c..311b64c389 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.expression.function; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java index 6c1042977d..b9b8c94697 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractFromImpl.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import java.io.Serializable; import java.util.Collections; import java.util.LinkedHashSet; @@ -43,6 +44,7 @@ import javax.persistence.metamodel.PluralAttribute; import javax.persistence.metamodel.SetAttribute; import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.Type; + import org.hibernate.ejb.criteria.BasicPathUsageException; import org.hibernate.ejb.criteria.CollectionJoinImplementor; import org.hibernate.ejb.criteria.CriteriaBuilderImpl; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractJoinImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractJoinImpl.java index fd494ebe6e..bd93253a8a 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractJoinImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractJoinImpl.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import java.io.Serializable; import javax.persistence.criteria.From; import javax.persistence.criteria.JoinType; import javax.persistence.metamodel.Attribute; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.CriteriaSubqueryImpl; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java index f684bb5ada..24c0600ec2 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/AbstractPathImpl.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import java.io.Serializable; import java.util.Collection; import java.util.HashMap; @@ -32,6 +33,7 @@ import javax.persistence.metamodel.Attribute; import javax.persistence.metamodel.MapAttribute; import javax.persistence.metamodel.PluralAttribute; import javax.persistence.metamodel.SingularAttribute; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/CollectionAttributeJoin.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/CollectionAttributeJoin.java index ac9bae48b6..c040032f7c 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/CollectionAttributeJoin.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/CollectionAttributeJoin.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import java.io.Serializable; import java.util.Collection; import javax.persistence.criteria.JoinType; import javax.persistence.metamodel.CollectionAttribute; + import org.hibernate.ejb.criteria.CollectionJoinImplementor; import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaSubqueryImpl; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/ListAttributeJoin.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/ListAttributeJoin.java index 262ec7c77f..4fe57c1626 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/ListAttributeJoin.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/ListAttributeJoin.java @@ -22,11 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import java.io.Serializable; import java.util.List; import javax.persistence.criteria.Expression; import javax.persistence.criteria.JoinType; import javax.persistence.metamodel.ListAttribute; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaSubqueryImpl; import org.hibernate.ejb.criteria.FromImplementor; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapAttributeJoin.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapAttributeJoin.java index d9606148ba..487ab16ebb 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapAttributeJoin.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapAttributeJoin.java @@ -22,12 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import java.io.Serializable; import java.util.Map; import javax.persistence.criteria.Expression; import javax.persistence.criteria.JoinType; import javax.persistence.criteria.Path; import javax.persistence.metamodel.MapAttribute; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaSubqueryImpl; import org.hibernate.ejb.criteria.FromImplementor; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapKeyHelpers.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapKeyHelpers.java index 9711e36fd6..fb7c1e097c 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapKeyHelpers.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/MapKeyHelpers.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import java.io.Serializable; import java.lang.reflect.Member; import java.util.Map; @@ -34,6 +35,7 @@ import javax.persistence.metamodel.ManagedType; import javax.persistence.metamodel.MapAttribute; import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.Type; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.MapJoinImplementor; import org.hibernate.ejb.criteria.PathImplementor; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributeJoinSupport.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributeJoinSupport.java index 9c8b004715..919b531173 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributeJoinSupport.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributeJoinSupport.java @@ -22,12 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import javax.persistence.criteria.JoinType; import javax.persistence.criteria.PluralJoin; import javax.persistence.metamodel.Attribute; import javax.persistence.metamodel.ManagedType; import javax.persistence.metamodel.PluralAttribute; import javax.persistence.metamodel.Type; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.PathSource; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributePath.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributePath.java index ac835183f2..7869875f0c 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributePath.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/PluralAttributePath.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import java.io.Serializable; import javax.persistence.metamodel.Attribute; import javax.persistence.metamodel.Bindable; import javax.persistence.metamodel.PluralAttribute; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.PathSource; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/RootImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/RootImpl.java index 507a987463..1f8db66a2a 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/RootImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/RootImpl.java @@ -22,9 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import java.io.Serializable; import javax.persistence.criteria.Root; import javax.persistence.metamodel.EntityType; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.CriteriaSubqueryImpl; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SetAttributeJoin.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SetAttributeJoin.java index 4ba0d69964..703e3050e7 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SetAttributeJoin.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SetAttributeJoin.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import java.io.Serializable; import java.util.Set; import javax.persistence.criteria.JoinType; import javax.persistence.metamodel.SetAttribute; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaSubqueryImpl; import org.hibernate.ejb.criteria.FromImplementor; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributeJoin.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributeJoin.java index dd45800e64..228abadbd1 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributeJoin.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributeJoin.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import javax.persistence.criteria.JoinType; import javax.persistence.metamodel.Attribute; import javax.persistence.metamodel.Bindable; import javax.persistence.metamodel.SingularAttribute; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaSubqueryImpl; import org.hibernate.ejb.criteria.FromImplementor; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributePath.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributePath.java index 66211f28a7..11be27b59c 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributePath.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/path/SingularAttributePath.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.path; + import java.io.Serializable; import javax.persistence.metamodel.Attribute; import javax.persistence.metamodel.Bindable; @@ -29,6 +30,7 @@ import javax.persistence.metamodel.EmbeddableType; import javax.persistence.metamodel.IdentifiableType; import javax.persistence.metamodel.ManagedType; import javax.persistence.metamodel.SingularAttribute; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.PathSource; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java index 262c997fc2..30a6c154e0 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import java.util.List; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Selection; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.expression.ExpressionImpl; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java index 20a38014bc..98118f5722 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import java.util.Collections; import java.util.List; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java index 1350232bc1..382af3ff23 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanAssertionPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanAssertionPredicate.java index 8d9d4e7c76..a0842ff782 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanAssertionPredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanAssertionPredicate.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java index 96be2444df..79a848a1f2 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java @@ -22,9 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import javax.persistence.criteria.Expression; import javax.persistence.criteria.Predicate; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanStaticAssertionPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanStaticAssertionPredicate.java index 0c34cee6c4..24ada02831 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanStaticAssertionPredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanStaticAssertionPredicate.java @@ -22,7 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java index b54baaa707..09809a4eae 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java index e13cf96a07..874b019010 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java @@ -22,12 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.persistence.criteria.Expression; import javax.persistence.criteria.Predicate; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java index ebbbc9cd6d..1c81c795b5 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import javax.persistence.criteria.Subquery; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java index 61b92af15d..5c5cc43568 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ImplicitNumericExpressionTypeDeterminer.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ImplicitNumericExpressionTypeDeterminer.java index 99aa70d8de..afcb4f7256 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ImplicitNumericExpressionTypeDeterminer.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ImplicitNumericExpressionTypeDeterminer.java @@ -26,8 +26,6 @@ package org.hibernate.ejb.criteria.predicate; import java.math.BigDecimal; import java.math.BigInteger; -import org.hibernate.ejb.criteria.expression.BinaryArithmeticOperation.Operation; - /** * @author Steve Ebersole */ diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java index cf6bfe6b16..8b07c667ca 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -29,6 +30,7 @@ import java.util.Collection; import java.util.List; import javax.persistence.criteria.Expression; import javax.persistence.criteria.Subquery; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java index 08f5238f1a..1bfb158645 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import java.util.Collection; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java index dda940fde1..1b72291680 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java index 2bc4f9ac18..7d1d85c24a 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java @@ -22,9 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import java.util.Collection; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java index 03279754ee..052093a029 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.criteria.predicate; + import java.io.Serializable; import javax.persistence.criteria.Expression; + import org.hibernate.ejb.criteria.CriteriaBuilderImpl; import org.hibernate.ejb.criteria.CriteriaQueryCompiler; import org.hibernate.ejb.criteria.ParameterRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java index a66d531c20..46a9561d45 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java @@ -23,18 +23,19 @@ */ package org.hibernate.ejb.event; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.ExcludeDefaultListeners; -import javax.persistence.ExcludeSuperclassListeners; -import javax.persistence.MappedSuperclass; -import javax.persistence.PersistenceException; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Target; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; +import javax.persistence.Entity; +import javax.persistence.EntityListeners; +import javax.persistence.ExcludeDefaultListeners; +import javax.persistence.ExcludeSuperclassListeners; +import javax.persistence.MappedSuperclass; +import javax.persistence.PersistenceException; + import org.jboss.logging.Logger; import org.hibernate.annotations.common.reflection.ReflectionManager; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java index 753f2eb6e1..c80b615c66 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3AutoFlushEventListener.java @@ -26,9 +26,8 @@ package org.hibernate.ejb.event; import java.util.IdentityHashMap; import org.hibernate.engine.spi.CascadingAction; -import org.hibernate.event.spi.AutoFlushEventListener; import org.hibernate.event.internal.DefaultAutoFlushEventListener; -import org.hibernate.internal.util.collections.IdentityMap; +import org.hibernate.event.spi.AutoFlushEventListener; /** * In JPA, it is the create operation that is cascaded to unmanaged entities at flush time (instead of the save-update diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java index aac071fe3c..e4c82cda8a 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java @@ -25,9 +25,9 @@ package org.hibernate.ejb.event; import java.io.Serializable; +import org.hibernate.event.internal.DefaultDeleteEventListener; import org.hibernate.event.spi.DeleteEvent; import org.hibernate.event.spi.EventSource; -import org.hibernate.event.internal.DefaultDeleteEventListener; import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java index 04ade587b4..3c4cea1a58 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3FlushEventListener.java @@ -26,9 +26,8 @@ package org.hibernate.ejb.event; import java.util.IdentityHashMap; import org.hibernate.engine.spi.CascadingAction; -import org.hibernate.event.spi.FlushEventListener; import org.hibernate.event.internal.DefaultFlushEventListener; -import org.hibernate.internal.util.collections.IdentityMap; +import org.hibernate.event.spi.FlushEventListener; /** * In EJB3, it is the create operation that is cascaded to unmanaged entities at flush time (instead of the diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java index faad5ee22c..70036d141b 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3MergeEventListener.java @@ -25,8 +25,8 @@ package org.hibernate.ejb.event; import java.io.Serializable; -import org.hibernate.event.spi.EventSource; import org.hibernate.event.internal.DefaultMergeEventListener; +import org.hibernate.event.spi.EventSource; /** * Overrides the LifeCycle OnSave call to call the PrePersist operation diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java index 20b21b259b..9025130e7e 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PersistEventListener.java @@ -28,8 +28,8 @@ import java.io.Serializable; import org.hibernate.engine.spi.CascadingAction; import org.hibernate.engine.spi.EJB3CascadeStyle; import org.hibernate.engine.spi.EJB3CascadingAction; -import org.hibernate.event.spi.EventSource; import org.hibernate.event.internal.DefaultPersistEventListener; +import org.hibernate.event.spi.EventSource; /** * Overrides the LifeCycle OnSave call to call the PrePersist operation diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java index 3df780c6aa..3af1ddbdbc 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveEventListener.java @@ -25,8 +25,8 @@ package org.hibernate.ejb.event; import java.io.Serializable; -import org.hibernate.event.spi.EventSource; import org.hibernate.event.internal.DefaultSaveEventListener; +import org.hibernate.event.spi.EventSource; /** * Overrides the LifeCycle OnSave call to call the PrePersist operation diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java index c84892e9c9..addbd917c7 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java @@ -25,8 +25,8 @@ package org.hibernate.ejb.event; import java.io.Serializable; -import org.hibernate.event.spi.EventSource; import org.hibernate.event.internal.DefaultSaveOrUpdateEventListener; +import org.hibernate.event.spi.EventSource; /** * Overrides the LifeCycle OnSave call to call the PrePersist operation diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java index 857db75377..589e685e90 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/EntityCallbackHandler.java @@ -23,6 +23,8 @@ */ package org.hibernate.ejb.event; +import java.io.Serializable; +import java.util.HashMap; import javax.persistence.PostLoad; import javax.persistence.PostPersist; import javax.persistence.PostRemove; @@ -30,8 +32,6 @@ import javax.persistence.PostUpdate; import javax.persistence.PrePersist; import javax.persistence.PreRemove; import javax.persistence.PreUpdate; -import java.io.Serializable; -import java.util.HashMap; import org.hibernate.annotations.common.reflection.ReflectionManager; import org.hibernate.annotations.common.reflection.XClass; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/JpaIntegrator.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/JpaIntegrator.java index d3c10aa5d0..78250d8e28 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/JpaIntegrator.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/JpaIntegrator.java @@ -33,6 +33,9 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.ejb.AvailableSettings; import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.event.service.spi.DuplicationStrategy; +import org.hibernate.event.service.spi.EventListenerGroup; +import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; import org.hibernate.integrator.spi.Integrator; import org.hibernate.mapping.PersistentClass; @@ -45,9 +48,6 @@ import org.hibernate.secure.internal.JACCPreUpdateEventListener; import org.hibernate.secure.internal.JACCSecurityListener; import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.classloading.spi.ClassLoadingException; -import org.hibernate.event.service.spi.DuplicationStrategy; -import org.hibernate.event.service.spi.EventListenerGroup; -import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.SessionFactoryServiceRegistry; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/internal/EntityManagerFactoryRegistry.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/internal/EntityManagerFactoryRegistry.java index dfe7d12d7b..020dac7ae8 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/internal/EntityManagerFactoryRegistry.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/internal/EntityManagerFactoryRegistry.java @@ -28,10 +28,11 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import javax.persistence.EntityManagerFactory; +import org.jboss.logging.Logger; + import org.hibernate.HibernateException; import org.hibernate.ejb.AvailableSettings; import org.hibernate.internal.CoreMessageLogger; -import org.jboss.logging.Logger; /** * An internal registry of all {@link org.hibernate.ejb.EntityManagerFactoryImpl} instances for the same diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/internal/EntityManagerMessageLogger.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/internal/EntityManagerMessageLogger.java index 3f27c0cbc3..7c00eb8b97 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/internal/EntityManagerMessageLogger.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/internal/EntityManagerMessageLogger.java @@ -23,18 +23,20 @@ */ package org.hibernate.ejb.internal; -import static org.jboss.logging.Logger.Level.ERROR; -import static org.jboss.logging.Logger.Level.INFO; -import static org.jboss.logging.Logger.Level.WARN; import java.net.URISyntaxException; import java.net.URL; -import org.hibernate.internal.CoreMessageLogger; import org.jboss.logging.Cause; import org.jboss.logging.LogMessage; import org.jboss.logging.Message; import org.jboss.logging.MessageLogger; +import org.hibernate.internal.CoreMessageLogger; + +import static org.jboss.logging.Logger.Level.ERROR; +import static org.jboss.logging.Logger.Level.INFO; +import static org.jboss.logging.Logger.Level.WARN; + /** * The jboss-logging {@link MessageLogger} for the hibernate-entitymanager module. It reserves message ids ranging from * 15001 to 20000 inclusively. diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractAttribute.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractAttribute.java index 81b35ab4e7..588590a622 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractAttribute.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractAttribute.java @@ -31,6 +31,7 @@ import java.lang.reflect.Member; import java.lang.reflect.Method; import javax.persistence.metamodel.Attribute; import javax.persistence.metamodel.ManagedType; + import org.hibernate.internal.util.ReflectHelper; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractManagedType.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractManagedType.java index 867901781f..36de63f002 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractManagedType.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AbstractManagedType.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.metamodel; + import java.io.Serializable; import java.util.HashMap; import java.util.HashSet; @@ -36,6 +37,7 @@ import javax.persistence.metamodel.MapAttribute; import javax.persistence.metamodel.PluralAttribute; import javax.persistence.metamodel.SetAttribute; import javax.persistence.metamodel.SingularAttribute; + import org.hibernate.annotations.common.AssertionFailure; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java index 376942d4d4..84596b191a 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.metamodel; + import java.lang.reflect.Field; import java.lang.reflect.Member; import java.lang.reflect.Method; @@ -34,6 +35,9 @@ import javax.persistence.metamodel.Attribute; import javax.persistence.metamodel.IdentifiableType; import javax.persistence.metamodel.PluralAttribute; import javax.persistence.metamodel.Type; + +import org.jboss.logging.Logger; + import org.hibernate.annotations.common.AssertionFailure; import org.hibernate.ejb.internal.EntityManagerMessageLogger; import org.hibernate.mapping.Collection; @@ -47,7 +51,6 @@ import org.hibernate.tuple.entity.EntityMetamodel; import org.hibernate.type.ComponentType; import org.hibernate.type.EmbeddedComponentType; import org.hibernate.type.EntityType; -import org.jboss.logging.Logger; /** * A factory for building {@link Attribute} instances. Exposes 3 main services for building
    diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/EmbeddableTypeImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/EmbeddableTypeImpl.java index 21ce289d21..83ab386c98 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/EmbeddableTypeImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/EmbeddableTypeImpl.java @@ -20,8 +20,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.metamodel; + import java.io.Serializable; import javax.persistence.metamodel.EmbeddableType; + import org.hibernate.type.ComponentType; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java index 9c8ae764f6..9da194db1e 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java @@ -20,6 +20,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.metamodel; + import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; @@ -32,6 +33,9 @@ import java.util.Set; import javax.persistence.metamodel.Attribute; import javax.persistence.metamodel.IdentifiableType; import javax.persistence.metamodel.SingularAttribute; + +import org.jboss.logging.Logger; + import org.hibernate.annotations.common.AssertionFailure; import org.hibernate.ejb.internal.EntityManagerMessageLogger; import org.hibernate.engine.spi.SessionFactoryImplementor; @@ -40,7 +44,6 @@ import org.hibernate.mapping.KeyValue; import org.hibernate.mapping.MappedSuperclass; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; -import org.jboss.logging.Logger; /** * Defines a context for storing information during the building of the {@link MetamodelImpl}. diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java index 45ed872657..d5c8a64d4d 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java @@ -20,6 +20,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.metamodel; + import java.io.Serializable; import java.util.HashSet; import java.util.Iterator; @@ -29,6 +30,7 @@ import javax.persistence.metamodel.EmbeddableType; import javax.persistence.metamodel.EntityType; import javax.persistence.metamodel.ManagedType; import javax.persistence.metamodel.Metamodel; + import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.mapping.MappedSuperclass; import org.hibernate.mapping.PersistentClass; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/PluralAttributeImpl.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/PluralAttributeImpl.java index 8374a6ed41..f56fe5cfc9 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/PluralAttributeImpl.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/PluralAttributeImpl.java @@ -20,6 +20,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.metamodel; + import java.io.Serializable; import java.lang.reflect.Member; import java.util.Collection; @@ -32,6 +33,7 @@ import javax.persistence.metamodel.MapAttribute; import javax.persistence.metamodel.PluralAttribute; import javax.persistence.metamodel.SetAttribute; import javax.persistence.metamodel.Type; + import org.hibernate.mapping.Property; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java index e2a48ae03f..34dcae39fd 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java @@ -20,6 +20,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.packaging; + import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; @@ -28,13 +29,13 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; + import javassist.bytecode.AnnotationsAttribute; import javassist.bytecode.ClassFile; +import org.jboss.logging.Logger; import org.hibernate.ejb.internal.EntityManagerMessageLogger; -import org.jboss.logging.Logger; - /** * Parse a JAR of any form (zip file, exploded directory, ...) * apply a set of filters (File filter, Class filter, Package filter) diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java index bfcdc45b26..cbb79e20e1 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java @@ -20,6 +20,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.packaging; + import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -30,10 +31,10 @@ import java.util.Enumeration; import java.util.jar.JarFile; import java.util.zip.ZipEntry; -import org.hibernate.ejb.internal.EntityManagerMessageLogger; - import org.jboss.logging.Logger; +import org.hibernate.ejb.internal.EntityManagerMessageLogger; + /** * @author Emmanuel Bernard diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java index 660932335c..1713cf11db 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java @@ -20,6 +20,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.packaging; + import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -31,10 +32,10 @@ import java.util.jar.JarFile; import java.util.jar.JarInputStream; import java.util.zip.ZipEntry; -import org.hibernate.ejb.internal.EntityManagerMessageLogger; - import org.jboss.logging.Logger; +import org.hibernate.ejb.internal.EntityManagerMessageLogger; + /** * Work on a JAR that can be accessed through a File * diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java index 1674f1ede0..96799ea644 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java @@ -20,16 +20,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.packaging; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.URL; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; import java.util.zip.ZipEntry; -import org.hibernate.ejb.internal.EntityManagerMessageLogger; import org.jboss.logging.Logger; +import org.hibernate.ejb.internal.EntityManagerMessageLogger; + /** * Work on a JAR that can only be accessed through a inputstream diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java index fa25a25f4d..dd2c8b6b52 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarProtocolVisitor.java @@ -20,9 +20,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.packaging; + import java.io.IOException; import java.net.URL; import java.util.Set; + import org.hibernate.annotations.common.AssertionFailure; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java index d24decc4e8..aeaf603c21 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java @@ -28,9 +28,10 @@ import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; +import org.jboss.logging.Logger; + import org.hibernate.ejb.internal.EntityManagerMessageLogger; import org.hibernate.internal.util.StringHelper; -import org.jboss.logging.Logger; /** * @author Emmanuel Bernard diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/NativeScanner.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/NativeScanner.java index 44e457c511..42ac816c43 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/NativeScanner.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/NativeScanner.java @@ -20,6 +20,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.packaging; + import java.io.IOException; import java.lang.annotation.Annotation; import java.net.URL; @@ -30,6 +31,7 @@ import java.util.Set; import javax.persistence.Embeddable; import javax.persistence.Entity; import javax.persistence.MappedSuperclass; + import org.hibernate.AssertionFailure; import org.hibernate.internal.util.ReflectHelper; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java index df60ffc6e9..ccbd567068 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java @@ -40,10 +40,7 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; -import org.hibernate.ejb.AvailableSettings; -import org.hibernate.ejb.internal.EntityManagerMessageLogger; -import org.hibernate.ejb.util.ConfigurationHelper; -import org.hibernate.internal.util.StringHelper; + import org.jboss.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -54,6 +51,11 @@ import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXParseException; +import org.hibernate.ejb.AvailableSettings; +import org.hibernate.ejb.internal.EntityManagerMessageLogger; +import org.hibernate.ejb.util.ConfigurationHelper; +import org.hibernate.internal.util.StringHelper; + /** * Handler for persistence.xml files. * diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java index 7b11b3427d..360727add4 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java @@ -20,8 +20,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.packaging; + import java.util.ArrayList; import java.util.Iterator; + import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/CacheModeHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/CacheModeHelper.java index 0c5e328d91..ad1067075d 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/CacheModeHelper.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/CacheModeHelper.java @@ -22,8 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.util; + import javax.persistence.CacheRetrieveMode; import javax.persistence.CacheStoreMode; + import org.hibernate.CacheMode; /** diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java index 9fba01205a..2fa9690b14 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java @@ -23,10 +23,10 @@ */ package org.hibernate.ejb.util; -import javax.persistence.FlushModeType; -import javax.persistence.PersistenceException; import java.util.Map; import java.util.Properties; +import javax.persistence.FlushModeType; +import javax.persistence.PersistenceException; import org.hibernate.AssertionFailure; import org.hibernate.CacheMode; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/LockModeTypeHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/LockModeTypeHelper.java index e42d1027fb..41b10bb287 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/LockModeTypeHelper.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/LockModeTypeHelper.java @@ -22,7 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.util; + import javax.persistence.LockModeType; + import org.hibernate.AssertionFailure; import org.hibernate.LockMode; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java index 26f0175355..582fe43079 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java @@ -1,4 +1,5 @@ package org.hibernate.ejb.util; + import java.io.Serializable; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; @@ -12,10 +13,11 @@ import java.util.Map; import java.util.WeakHashMap; import javax.persistence.PersistenceException; import javax.persistence.spi.LoadState; + import org.hibernate.AssertionFailure; -import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.bytecode.instrumentation.internal.FieldInterceptionHelper; import org.hibernate.bytecode.instrumentation.spi.FieldInterceptor; +import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/engine/spi/EJB3CascadingAction.java b/hibernate-entitymanager/src/main/java/org/hibernate/engine/spi/EJB3CascadingAction.java index e3e681dce1..d86641a1ba 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/engine/spi/EJB3CascadingAction.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/engine/spi/EJB3CascadingAction.java @@ -20,13 +20,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.spi; + import java.util.Iterator; import java.util.Map; + +import org.jboss.logging.Logger; + import org.hibernate.HibernateException; import org.hibernate.ejb.internal.EntityManagerMessageLogger; import org.hibernate.event.spi.EventSource; import org.hibernate.type.CollectionType; -import org.jboss.logging.Logger; /** * Because of CascadingAction constructor visibility diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/CriteriaCompilingTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/CriteriaCompilingTest.java index fea7331176..1305fd9684 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/CriteriaCompilingTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/CriteriaCompilingTest.java @@ -23,6 +23,11 @@ */ package org.hibernate.ejb.criteria; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutput; +import java.io.ObjectOutputStream; import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; import javax.persistence.TypedQuery; @@ -30,12 +35,9 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import javax.persistence.metamodel.EntityType; -import javax.persistence.metamodel.Metamodel; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutput; -import java.io.ObjectOutputStream; + +import org.junit.Assert; +import org.junit.Test; import org.hibernate.dialect.DB2Dialect; import org.hibernate.ejb.metamodel.Address; @@ -59,9 +61,6 @@ import org.hibernate.ejb.test.inheritance.Strawberry; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.RequiresDialect; -import org.junit.Assert; -import org.junit.Test; - /** * @author Steve Ebersole */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/ParameterTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/ParameterTest.java index b4887694ab..cb552f0e40 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/ParameterTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/ParameterTest.java @@ -24,17 +24,16 @@ package org.hibernate.ejb.criteria; import javax.persistence.EntityManager; -import javax.persistence.Parameter; import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.ParameterExpression; import javax.persistence.criteria.Path; import javax.persistence.criteria.Root; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + /** * @author Steve Ebersole */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/QueryBuilderTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/QueryBuilderTest.java index a4b62f83cd..50d41426fd 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/QueryBuilderTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/QueryBuilderTest.java @@ -23,14 +23,16 @@ */ package org.hibernate.ejb.criteria; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import javax.persistence.metamodel.EntityType; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; + +import org.junit.Test; import org.hibernate.ejb.criteria.predicate.ComparisonPredicate; import org.hibernate.ejb.metamodel.Address; @@ -48,8 +50,6 @@ import org.hibernate.ejb.metamodel.ShelfLife; import org.hibernate.ejb.metamodel.Spouse; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; -import org.junit.Test; - import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java index 003fdc818e..c6d22772d1 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/AggregationResultTest.java @@ -29,15 +29,16 @@ import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import junit.framework.AssertionFailedError; -import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest; -import org.hibernate.ejb.metamodel.Product; -import org.hibernate.ejb.metamodel.Product_; +import junit.framework.AssertionFailedError; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest; +import org.hibernate.ejb.metamodel.Product; +import org.hibernate.ejb.metamodel.Product_; + /** * @author Steve Ebersole */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java index e7f4aefac1..80492a1d2d 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java @@ -30,10 +30,10 @@ import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; import javax.persistence.metamodel.SingularAttribute; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java index cccd08d435..d082113757 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/ExpressionsTest.java @@ -23,6 +23,10 @@ */ package org.hibernate.ejb.criteria.basic; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Collections; +import java.util.List; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; import javax.persistence.criteria.CriteriaBuilder; @@ -30,10 +34,10 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.ParameterExpression; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Collections; -import java.util.List; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.hibernate.Query; import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest; @@ -42,10 +46,6 @@ import org.hibernate.ejb.metamodel.Product; import org.hibernate.ejb.metamodel.Product_; import org.hibernate.internal.AbstractQueryImpl; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/PredicateTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/PredicateTest.java index a4ef23857f..b3916ffefd 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/PredicateTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/basic/PredicateTest.java @@ -23,22 +23,21 @@ */ package org.hibernate.ejb.criteria.basic; +import java.util.List; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Path; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import java.util.List; + +import org.junit.Before; +import org.junit.Test; import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.ejb.metamodel.Customer_; import org.hibernate.ejb.metamodel.Order; import org.hibernate.ejb.metamodel.Order_; - -import org.junit.Before; -import org.junit.Test; - import org.hibernate.testing.TestForIssue; import static org.junit.Assert.assertEquals; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Helper.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Helper.java index 4041fae2e1..20ba80754d 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Helper.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Helper.java @@ -23,10 +23,8 @@ */ package org.hibernate.ejb.criteria.idclass; -import javax.persistence.Column; import javax.persistence.Id; import javax.persistence.IdClass; -import javax.persistence.Entity; import javax.persistence.MappedSuperclass; import javax.persistence.Table; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/IdClassPredicateTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/IdClassPredicateTest.java index cea56d8813..ab31a642c1 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/IdClassPredicateTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/IdClassPredicateTest.java @@ -25,8 +25,11 @@ package org.hibernate.ejb.criteria.idclass; import java.util.ArrayList; import java.util.List; -import javax.persistence.*; -import javax.persistence.criteria.*; +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Predicate; +import javax.persistence.criteria.Root; import junit.framework.Assert; import org.junit.After; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Tool.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Tool.java index 6c354b5a66..9b199c321a 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Tool.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Tool.java @@ -24,8 +24,6 @@ package org.hibernate.ejb.criteria.idclass; import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.IdClass; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Widget.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Widget.java index 9b2f1d1f35..69ac44b929 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Widget.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/idclass/Widget.java @@ -24,9 +24,9 @@ package org.hibernate.ejb.criteria.idclass; import javax.persistence.Column; +import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.IdClass; -import javax.persistence.Entity; import javax.persistence.Table; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/paths/ImplicitJoinTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/paths/ImplicitJoinTest.java index 7bf54ffe0f..92cfc9a293 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/paths/ImplicitJoinTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/paths/ImplicitJoinTest.java @@ -30,14 +30,14 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Join; import javax.persistence.criteria.Root; +import org.junit.Test; + import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.ejb.metamodel.LineItem; import org.hibernate.ejb.metamodel.LineItem_; import org.hibernate.ejb.metamodel.Order; import org.hibernate.ejb.metamodel.Order_; -import org.junit.Test; - /** * @author Steve Ebersole */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java index e9f0838f39..5f3fb61a2d 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/subquery/CorrelatedSubqueryTest.java @@ -30,6 +30,8 @@ import javax.persistence.criteria.Join; import javax.persistence.criteria.Root; import javax.persistence.criteria.Subquery; +import org.junit.Test; + import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.ejb.metamodel.Customer; @@ -38,9 +40,6 @@ import org.hibernate.ejb.metamodel.LineItem; import org.hibernate.ejb.metamodel.LineItem_; import org.hibernate.ejb.metamodel.Order; import org.hibernate.ejb.metamodel.Order_; - -import org.junit.Test; - import org.hibernate.testing.SkipForDialect; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java index cf4a9dbd68..756baee32f 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/subquery/UncorrelatedSubqueryTest.java @@ -30,14 +30,14 @@ import javax.persistence.criteria.Join; import javax.persistence.criteria.Root; import javax.persistence.criteria.Subquery; +import org.junit.Test; + import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.ejb.metamodel.Customer; import org.hibernate.ejb.metamodel.Customer_; import org.hibernate.ejb.metamodel.Order; import org.hibernate.ejb.metamodel.Order_; -import org.junit.Test; - /** * @author Steve Ebersole */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/tuple/TupleCriteriaTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/tuple/TupleCriteriaTest.java index 23ac7bc046..4bfe97a60b 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/tuple/TupleCriteriaTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/tuple/TupleCriteriaTest.java @@ -23,20 +23,20 @@ */ package org.hibernate.ejb.criteria.tuple; +import java.util.List; import javax.persistence.EntityManager; import javax.persistence.Tuple; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Path; import javax.persistence.criteria.Root; -import java.util.List; + +import org.junit.Test; import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest; import org.hibernate.ejb.metamodel.Customer; import org.hibernate.ejb.metamodel.Customer_; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/association/AssociationTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/association/AssociationTest.java index 80ff0cccad..28a3103b08 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/association/AssociationTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/association/AssociationTest.java @@ -2,10 +2,10 @@ package org.hibernate.ejb.test.association; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/beanvalidation/BeanValidationTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/beanvalidation/BeanValidationTest.java index 0546bae827..26cc411db3 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/beanvalidation/BeanValidationTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/beanvalidation/BeanValidationTest.java @@ -23,15 +23,15 @@ */ package org.hibernate.ejb.test.beanvalidation; +import java.math.BigDecimal; import javax.persistence.EntityManager; import javax.persistence.RollbackException; import javax.validation.ConstraintViolationException; -import java.math.BigDecimal; - -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java index f09fc18881..7f42df5a33 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java @@ -23,14 +23,14 @@ */ package org.hibernate.ejb.test.callbacks; -import javax.persistence.EntityManager; import java.util.Iterator; import java.util.List; - -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; +import javax.persistence.EntityManager; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java index ef95fcb929..129742af0d 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/callbacks/CallbacksTest.java @@ -1,16 +1,15 @@ package org.hibernate.ejb.test.callbacks; -import javax.persistence.EntityManager; import java.util.ArrayList; import java.util.Date; import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.ejb.test.Cat; import org.hibernate.ejb.test.Kitten; - -import org.junit.Test; - import org.hibernate.testing.FailureExpected; import static org.junit.Assert.assertEquals; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/CascadeTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/CascadeTest.java index e040e3d527..6dbdf5fdaa 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/CascadeTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/CascadeTest.java @@ -25,10 +25,11 @@ package org.hibernate.ejb.test.cascade; import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + /** * @author Max Rydahl Andersen */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java index b3fcdfd663..f5597a1d6f 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java @@ -31,12 +31,13 @@ import java.io.ObjectOutput; import java.io.ObjectOutputStream; import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; -import org.hibernate.Hibernate; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; +import org.hibernate.Hibernate; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/DetachAndContainsTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/DetachAndContainsTest.java index cbf200ccdc..52656b9db4 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/DetachAndContainsTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/DetachAndContainsTest.java @@ -23,19 +23,19 @@ */ package org.hibernate.ejb.test.cascade; +import java.util.ArrayList; +import java.util.Collection; import javax.persistence.Entity; import javax.persistence.EntityManager; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; -import java.util.ArrayList; -import java.util.Collection; - -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static javax.persistence.CascadeType.DETACH; import static javax.persistence.CascadeType.REMOVE; import static org.junit.Assert.assertEquals; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java index bd6aca2d1d..9c99f4153e 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/ExtractionDocument.java @@ -1,5 +1,6 @@ //$Id$ package org.hibernate.ejb.test.cascade; + import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; @@ -8,6 +9,7 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; import javax.persistence.Table; + import org.hibernate.annotations.Proxy; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/FetchTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/FetchTest.java index cd6cc86c47..eb60d1a8d0 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/FetchTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/FetchTest.java @@ -23,18 +23,18 @@ */ package org.hibernate.ejb.test.cascade; +import java.util.ArrayList; +import java.util.Date; import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; import javax.persistence.Query; -import java.util.ArrayList; -import java.util.Date; + +import org.junit.Test; import org.hibernate.Hibernate; import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; -import org.junit.Test; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/FetchTest2.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/FetchTest2.java index 0ad169bac1..89aee648d6 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/FetchTest2.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/FetchTest2.java @@ -25,10 +25,10 @@ package org.hibernate.ejb.test.cascade; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.fail; public class FetchTest2 extends BaseEntityManagerFunctionalTestCase { diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Student.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Student.java index 8a849cee11..6cc0d1b966 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Student.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Student.java @@ -1,10 +1,12 @@ package org.hibernate.ejb.test.cascade; + import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.ManyToOne; import javax.persistence.OneToOne; + import org.hibernate.annotations.AccessType; @Entity diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Teacher.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Teacher.java index ea68166b11..82f7e0e7ec 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Teacher.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Teacher.java @@ -1,4 +1,5 @@ package org.hibernate.ejb.test.cascade; + import java.util.HashSet; import java.util.Set; import javax.persistence.CascadeType; @@ -7,6 +8,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.OneToOne; + import org.hibernate.annotations.AccessType; @Entity diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Troop.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Troop.java index 80f255e31b..3fcda723eb 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Troop.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/Troop.java @@ -1,5 +1,6 @@ //$Id$ package org.hibernate.ejb.test.cascade; + import java.io.Serializable; import java.util.HashSet; import java.util.Set; @@ -9,6 +10,7 @@ import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToMany; + import org.hibernate.annotations.OrderBy; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multicircle/MultiCircleJpaCascadeTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multicircle/MultiCircleJpaCascadeTest.java index babb8ed891..482d465835 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multicircle/MultiCircleJpaCascadeTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multicircle/MultiCircleJpaCascadeTest.java @@ -31,14 +31,14 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.hibernate.TransientPropertyValueException; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.FailureExpected; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * This test uses a complicated model that requires Hibernate to delay * inserts until non-nullable transient entity dependencies are resolved. diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multilevel/MultiLevelCascadeTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multilevel/MultiLevelCascadeTest.java index 5ae2400d90..c24441d900 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multilevel/MultiLevelCascadeTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multilevel/MultiLevelCascadeTest.java @@ -23,8 +23,6 @@ */ package org.hibernate.ejb.test.cascade.multilevel; -import static org.junit.Assert.*; - import javax.persistence.EntityManager; import javax.persistence.EntityTransaction; @@ -33,6 +31,10 @@ import org.junit.Test; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; + public class MultiLevelCascadeTest extends BaseEntityManagerFunctionalTestCase { @TestForIssue( jiraKey = "HHH-5299" ) diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multilevel/Top.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multilevel/Top.java index b32ec2725b..9e23e6efdf 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multilevel/Top.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/cascade/multilevel/Top.java @@ -25,7 +25,6 @@ package org.hibernate.ejb.test.cascade.multilevel; import java.util.ArrayList; import java.util.List; - import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/FlushModeTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/FlushModeTest.java index c30045085e..907e57a854 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/FlushModeTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/FlushModeTest.java @@ -26,11 +26,12 @@ package org.hibernate.ejb.test.emops; import java.util.HashMap; import java.util.Map; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/FlushTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/FlushTest.java index 8505b95495..7e5e80e824 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/FlushTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/FlushTest.java @@ -31,11 +31,10 @@ import java.util.Set; import javax.persistence.EntityManager; import javax.persistence.Query; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Assert; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/GetReferenceTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/GetReferenceTest.java index 7ec0e8f506..9d55cf8ecb 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/GetReferenceTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/GetReferenceTest.java @@ -24,10 +24,11 @@ package org.hibernate.ejb.test.emops; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.fail; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/MergeTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/MergeTest.java index 6fda66a2ca..d7058b5025 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/MergeTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/MergeTest.java @@ -23,14 +23,14 @@ */ package org.hibernate.ejb.test.emops; -import javax.persistence.EntityManager; import java.util.ArrayList; import java.util.List; - -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; +import javax.persistence.EntityManager; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/RefreshTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/RefreshTest.java index 3834a77a6a..de567ac9a8 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/RefreshTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/RefreshTest.java @@ -25,10 +25,10 @@ package org.hibernate.ejb.test.emops; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.fail; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/RemoveTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/RemoveTest.java index fa691a3b48..5e86b7359b 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/RemoveTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/RemoveTest.java @@ -28,12 +28,11 @@ import javax.persistence.EntityManager; import javax.persistence.OptimisticLockException; import org.jboss.logging.Logger; - -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Assert; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java index 07454bc6f4..353fbf6435 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java @@ -25,12 +25,12 @@ package org.hibernate.ejb.test.emops.cascade; import javax.persistence.EntityManager; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.stat.Statistics; -import org.junit.Test; - import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/exception/ExceptionTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/exception/ExceptionTest.java index 24f4cc2bd1..ce0b2ef810 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/exception/ExceptionTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/exception/ExceptionTest.java @@ -23,20 +23,18 @@ */ package org.hibernate.ejb.test.exception; +import java.util.Map; import javax.persistence.EntityManager; import javax.persistence.EntityNotFoundException; import javax.persistence.OptimisticLockException; import javax.persistence.PersistenceException; -import java.util.Map; import org.jboss.logging.Logger; +import org.junit.Test; import org.hibernate.cfg.Environment; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.exception.ConstraintViolationException; - -import org.junit.Test; - import org.hibernate.testing.TestForIssue; import static org.junit.Assert.assertEquals; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java index bd4ef613e2..daa7ec9c78 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java @@ -25,10 +25,10 @@ package org.hibernate.ejb.test.inheritance; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertNotNull; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lob/BlobTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lob/BlobTest.java index 54438147b6..7a3edb6cbf 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lob/BlobTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lob/BlobTest.java @@ -23,18 +23,17 @@ */ package org.hibernate.ejb.test.lob; -import javax.persistence.EntityManager; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.HashMap; import java.util.Map; - -import org.hibernate.Session; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; +import javax.persistence.EntityManager; import org.junit.Test; +import org.hibernate.Session; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/QueryLockingTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/QueryLockingTest.java index 6ea48f9185..8bd7c32769 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/QueryLockingTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/QueryLockingTest.java @@ -23,9 +23,11 @@ */ package org.hibernate.ejb.test.lock; +import java.util.Map; import javax.persistence.EntityManager; import javax.persistence.LockModeType; -import java.util.Map; + +import org.junit.Test; import org.hibernate.LockMode; import org.hibernate.ejb.AvailableSettings; @@ -33,8 +35,6 @@ import org.hibernate.ejb.QueryImpl; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.internal.SessionImpl; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/UpgradeLockTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/UpgradeLockTest.java index 2cb27f3a2c..f5a4955f5f 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/UpgradeLockTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/lock/UpgradeLockTest.java @@ -28,10 +28,11 @@ import java.util.concurrent.TimeUnit; import javax.persistence.EntityManager; import javax.persistence.LockModeType; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.jboss.logging.Logger; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertTrue; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/FindTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/FindTest.java index 1efbb5186e..341bf72e21 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/FindTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/FindTest.java @@ -24,11 +24,12 @@ package org.hibernate.ejb.test.ops; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/GetLoadTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/GetLoadTest.java index e04c717b17..db198102c3 100755 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/GetLoadTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/GetLoadTest.java @@ -23,8 +23,10 @@ */ package org.hibernate.ejb.test.ops; -import javax.persistence.EntityManager; import java.util.Map; +import javax.persistence.EntityManager; + +import org.junit.Test; import org.hibernate.Hibernate; import org.hibernate.Session; @@ -32,8 +34,6 @@ import org.hibernate.cfg.Environment; import org.hibernate.ejb.EntityManagerFactoryImpl; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/MergeNewTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/MergeNewTest.java index 58c0187476..da4b32cf8c 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/MergeNewTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/MergeNewTest.java @@ -25,10 +25,10 @@ package org.hibernate.ejb.test.ops; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertNotNull; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/MergeTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/MergeTest.java index 68311b6f5d..3f48d1a0e9 100755 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/MergeTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/MergeTest.java @@ -25,13 +25,14 @@ package org.hibernate.ejb.test.ops; import java.util.Map; import javax.persistence.EntityManager; -import org.hibernate.cfg.Environment; -import org.hibernate.ejb.EntityManagerFactoryImpl; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; +import org.hibernate.cfg.Environment; +import org.hibernate.ejb.EntityManagerFactoryImpl; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + /** * @author Gavin King * @author Hardy Ferentschik diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/PersistTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/PersistTest.java index aa2c137425..c34227485d 100755 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/PersistTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/ops/PersistTest.java @@ -24,19 +24,19 @@ */ package org.hibernate.ejb.test.ops; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceException; -import javax.persistence.RollbackException; import java.util.ArrayList; import java.util.Collection; import java.util.Map; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceException; +import javax.persistence.RollbackException; + +import org.junit.Test; import org.hibernate.cfg.Environment; import org.hibernate.ejb.EntityManagerFactoryImpl; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/query/QueryTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/query/QueryTest.java index 02f10ef0a0..4057a8202a 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/query/QueryTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/query/QueryTest.java @@ -23,22 +23,21 @@ */ package org.hibernate.ejb.test.query; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import javax.persistence.EntityManager; import javax.persistence.Query; import javax.persistence.TemporalType; import javax.persistence.Tuple; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; + +import org.junit.Test; import org.hibernate.Hibernate; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.ejb.test.Distributor; import org.hibernate.ejb.test.Item; import org.hibernate.ejb.test.Wallet; - -import org.junit.Test; - import org.hibernate.testing.TestForIssue; import static org.junit.Assert.assertEquals; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java index 46c371cb43..361c30d983 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java @@ -23,21 +23,21 @@ */ package org.hibernate.ejb.test.transaction; +import java.util.List; import javax.persistence.EntityManager; import javax.persistence.LockModeType; import javax.persistence.OptimisticLockException; import javax.persistence.PersistenceException; import javax.persistence.RollbackException; import javax.persistence.TransactionRequiredException; -import java.util.List; + +import org.junit.Test; import org.hibernate.Session; import org.hibernate.ejb.HibernateEntityManagerFactory; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.stat.Statistics; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/transaction/TransactionJoiningTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/transaction/TransactionJoiningTest.java index 8f88a0d402..17094b0198 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/transaction/TransactionJoiningTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/transaction/TransactionJoiningTest.java @@ -23,8 +23,10 @@ */ package org.hibernate.ejb.test.transaction; -import javax.persistence.EntityManager; import java.util.Map; +import javax.persistence.EntityManager; + +import org.junit.Test; import org.hibernate.Session; import org.hibernate.Transaction; @@ -33,9 +35,6 @@ import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.transaction.internal.jta.CMTTransaction; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; - -import org.junit.Test; - import org.hibernate.testing.jta.TestingJtaBootstrap; import static org.junit.Assert.assertFalse; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/GetIdentifierTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/GetIdentifierTest.java index cda3c41f02..2e98adf444 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/GetIdentifierTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/GetIdentifierTest.java @@ -25,10 +25,10 @@ package org.hibernate.ejb.test.util; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/IsLoadedTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/IsLoadedTest.java index 6732bdd814..d7eb07fff4 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/IsLoadedTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/IsLoadedTest.java @@ -25,10 +25,10 @@ package org.hibernate.ejb.test.util; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java index 1c6301e61e..96b4e9cc15 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/util/PersistenceUtilHelperTest.java @@ -22,12 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.test.util; + import javax.persistence.spi.LoadState; import org.junit.Test; import org.hibernate.ejb.util.PersistenceUtilHelper; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; /** * Tests for HHH-5094 and HHH-5334 * diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java index 22a1caa8de..b8add44352 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java @@ -25,10 +25,10 @@ package org.hibernate.ejb.test.xml; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/XmlTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/XmlTest.java index c421f418ee..a9d33c6933 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/XmlTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/XmlTest.java @@ -25,10 +25,10 @@ package org.hibernate.ejb.test.xml; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/sequences/XmlAttributeOverrideTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/sequences/XmlAttributeOverrideTest.java index 3753d57556..3c4bca9f1b 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/sequences/XmlAttributeOverrideTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/sequences/XmlAttributeOverrideTest.java @@ -24,10 +24,11 @@ package org.hibernate.ejb.test.xml.sequences; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java index d09127b453..1fe6f2c32b 100644 --- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java +++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/xml/sequences/XmlTest.java @@ -25,10 +25,9 @@ package org.hibernate.ejb.test.xml.sequences; import javax.persistence.EntityManager; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/CastTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/CastTest.java index 7e5952e9b3..2ed3264ec2 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/CastTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/CastTest.java @@ -26,19 +26,17 @@ package org.hibernate.ejb.criteria.basic; import java.math.BigDecimal; import java.math.BigInteger; import java.util.List; - import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest; -import org.hibernate.ejb.metamodel.Product; -import org.hibernate.ejb.metamodel.Product_; - import org.junit.Assert; import org.junit.Test; +import org.hibernate.ejb.metamodel.AbstractMetamodelSpecificTest; +import org.hibernate.ejb.metamodel.Product; +import org.hibernate.ejb.metamodel.Product_; import org.hibernate.testing.TestForIssue; public class CastTest extends AbstractMetamodelSpecificTest { diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/components/ComponentCriteriaTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/components/ComponentCriteriaTest.java index 42c6b977dd..3cb31f1134 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/components/ComponentCriteriaTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/components/ComponentCriteriaTest.java @@ -23,17 +23,16 @@ */ package org.hibernate.ejb.criteria.components; +import java.util.List; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import java.util.List; - -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.junit.Assert; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; /** diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/EmbeddedTypeTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/EmbeddedTypeTest.java index 0d838fb5cd..d0f8a14245 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/EmbeddedTypeTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/EmbeddedTypeTest.java @@ -27,10 +27,9 @@ import javax.persistence.EntityManager; import javax.persistence.metamodel.EntityType; import javax.persistence.metamodel.SingularAttribute; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.testing.TestForIssue; import static org.junit.Assert.assertEquals; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/ThingWithQuantity.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/ThingWithQuantity.java index 5758086712..170d596496 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/ThingWithQuantity.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/ThingWithQuantity.java @@ -24,7 +24,6 @@ package org.hibernate.ejb.metamodel; import javax.persistence.Entity; -import javax.persistence.Id; /** * @author James Gilbertson diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/BaseEntityManagerFunctionalTestCase.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/BaseEntityManagerFunctionalTestCase.java index 7e58fc2e44..2da10375c6 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/BaseEntityManagerFunctionalTestCase.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/BaseEntityManagerFunctionalTestCase.java @@ -30,6 +30,10 @@ import java.util.Map; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; +import org.jboss.logging.Logger; +import org.junit.After; +import org.junit.Before; + import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; @@ -41,9 +45,6 @@ import org.hibernate.service.BootstrapServiceRegistryBuilder; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.service.internal.StandardServiceRegistryImpl; import org.hibernate.testing.junit4.BaseUnitTestCase; -import org.jboss.logging.Logger; -import org.junit.After; -import org.junit.Before; /** * A base class for all ejb tests. diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Cat.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Cat.java index 0290d4cc64..98038eccbe 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Cat.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Cat.java @@ -1,6 +1,13 @@ //$Id$ package org.hibernate.ejb.test; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.List; import javax.persistence.Basic; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -14,13 +21,6 @@ import javax.persistence.PostUpdate; import javax.persistence.Temporal; import javax.persistence.TemporalType; import javax.persistence.Transient; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.List; import org.jboss.logging.Logger; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/CountEntityWithCompositeIdTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/CountEntityWithCompositeIdTest.java index 544dbd285c..4c39914d45 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/CountEntityWithCompositeIdTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/CountEntityWithCompositeIdTest.java @@ -23,14 +23,16 @@ */ package org.hibernate.ejb.test; -import static org.junit.Assert.assertThat; -import static org.hamcrest.core.Is.is; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; + import org.junit.Test; +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; + /** * */ diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java index c228a5e28b..5af486ad97 100755 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/EntityManagerTest.java @@ -39,6 +39,8 @@ import javax.persistence.FlushModeType; import javax.persistence.PersistenceException; import javax.persistence.Query; +import org.junit.Test; + import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; @@ -47,7 +49,6 @@ import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.HibernateEntityManagerFactory; import org.hibernate.stat.Statistics; import org.hibernate.testing.TestForIssue; -import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SharedCacheModesTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SharedCacheModesTest.java index fa25aee6d5..423cf5a233 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SharedCacheModesTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/cacheable/cachemodes/SharedCacheModesTest.java @@ -28,6 +28,8 @@ import javax.persistence.CacheStoreMode; import javax.persistence.EntityManager; import javax.persistence.Query; +import org.junit.Test; + import org.hibernate.CacheMode; import org.hibernate.Session; import org.hibernate.ejb.AvailableSettings; @@ -36,8 +38,6 @@ import org.hibernate.ejb.HibernateQuery; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.internal.AbstractQueryImpl; -import org.junit.Test; - import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java index 942a65344c..06606154bb 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java @@ -21,8 +21,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.test.connection; + import java.io.File; -import junit.framework.TestCase; + import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java index dca1b61c77..c366f0403f 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java @@ -21,6 +21,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.test.connection; + import java.net.URL; import java.util.ArrayList; import java.util.Arrays; @@ -32,6 +33,7 @@ import javax.persistence.spi.ClassTransformer; import javax.persistence.spi.PersistenceUnitInfo; import javax.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; + import org.hibernate.cfg.Environment; import org.hibernate.ejb.HibernatePersistence; import org.hibernate.ejb.test.Distributor; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ConfigurationObjectSettingTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ConfigurationObjectSettingTest.java index ec4cd8b2de..42b740af61 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ConfigurationObjectSettingTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ConfigurationObjectSettingTest.java @@ -23,18 +23,16 @@ */ package org.hibernate.ejb.test.ejb3configuration; +import java.util.Collections; import javax.persistence.SharedCacheMode; import javax.persistence.ValidationMode; -import java.util.Collections; + +import org.junit.Test; import org.hibernate.HibernateException; import org.hibernate.ejb.AvailableSettings; import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.packaging.PersistenceMetadata; - -import org.junit.Test; - -import org.hibernate.testing.FailureExpected; import org.hibernate.testing.junit4.BaseUnitTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerFactorySerializationTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerFactorySerializationTest.java index 00da51dfea..f7a443683a 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerFactorySerializationTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerFactorySerializationTest.java @@ -23,8 +23,6 @@ */ package org.hibernate.ejb.test.ejb3configuration; -import static org.junit.Assert.assertTrue; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; @@ -34,6 +32,8 @@ import java.util.Date; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; +import org.junit.Test; + import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.ejb.test.Cat; @@ -41,7 +41,8 @@ import org.hibernate.ejb.test.Distributor; import org.hibernate.ejb.test.Item; import org.hibernate.ejb.test.Kitten; import org.hibernate.ejb.test.Wallet; -import org.junit.Test; + +import static org.junit.Assert.assertTrue; /** * @author Emmanuel Bernard diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java index 8e9167c0d5..0dae2b253c 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java @@ -32,6 +32,8 @@ import java.util.Date; import java.util.Map; import javax.persistence.EntityManager; +import org.junit.Test; + import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.ejb.test.Cat; @@ -40,7 +42,6 @@ import org.hibernate.ejb.test.Item; import org.hibernate.ejb.test.Kitten; import org.hibernate.ejb.test.NotSerializableClass; import org.hibernate.ejb.test.Wallet; -import org.junit.Test; /** * @author Emmanuel Bernard diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java index 7a248d95a3..60a534b6db 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java @@ -1,6 +1,8 @@ //$Id$ package org.hibernate.ejb.test.ejb3configuration; + import java.io.Serializable; + import org.hibernate.CallbackException; import org.hibernate.EmptyInterceptor; import org.hibernate.type.Type; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java index 6bba0d24a9..bc45540498 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/LocalExceptionInterceptor.java @@ -1,6 +1,8 @@ //$ package org.hibernate.ejb.test.ejb3configuration; + import java.io.Serializable; + import org.hibernate.CallbackException; import org.hibernate.type.Type; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersistenceUnitInfoAdapter.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersistenceUnitInfoAdapter.java index 39de6a2b23..2e322ca1c4 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersistenceUnitInfoAdapter.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersistenceUnitInfoAdapter.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.test.ejb3configuration; + import java.net.URL; import java.util.Collections; import java.util.List; @@ -32,6 +33,7 @@ import javax.persistence.spi.ClassTransformer; import javax.persistence.spi.PersistenceUnitInfo; import javax.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; + import org.hibernate.ejb.HibernatePersistence; /** diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersisterClassProviderTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersisterClassProviderTest.java index 365586b9fa..1b6fe490e7 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersisterClassProviderTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/PersisterClassProviderTest.java @@ -20,12 +20,11 @@ */ package org.hibernate.ejb.test.ejb3configuration; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceException; import java.io.Serializable; import java.util.Comparator; -import java.util.HashMap; import java.util.Map; +import javax.persistence.EntityManagerFactory; +import javax.persistence.PersistenceException; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java index 189e2d2590..14232ee1fb 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/id/IdentifierGeneratorStrategyProviderTest.java @@ -23,7 +23,6 @@ package org.hibernate.ejb.test.ejb3configuration.id; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; -import junit.framework.TestCase; import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/hibernateFilters/EntityManagerWithFilteredSessionTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/hibernateFilters/EntityManagerWithFilteredSessionTest.java index 7763a9cb40..100147a199 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/hibernateFilters/EntityManagerWithFilteredSessionTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/hibernateFilters/EntityManagerWithFilteredSessionTest.java @@ -25,11 +25,11 @@ package org.hibernate.ejb.test.hibernateFilters; import javax.persistence.EntityManager; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; -import org.junit.Test; - /** * @author Steve Ebersole */ diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java index 2c975b889b..c4fba17205 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java @@ -1,9 +1,11 @@ //$Id$ package org.hibernate.ejb.test.instrument; + import java.io.IOException; import java.io.InputStream; import java.lang.instrument.IllegalClassFormatException; import java.util.List; + import org.hibernate.ejb.instrument.InterceptFieldClassFileTransformer; /** diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java index fa4124c470..d7c61878c4 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java @@ -1,9 +1,10 @@ //$Id$ package org.hibernate.ejb.test.instrument; + import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import junit.framework.TestCase; + import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java index 357f10becc..2cc4b35fcc 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/jee/OrmVersionTest.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.ejb.test.jee; + import java.net.URL; import java.util.ArrayList; import java.util.Collections; @@ -34,7 +35,7 @@ import javax.persistence.spi.ClassTransformer; import javax.persistence.spi.PersistenceUnitInfo; import javax.persistence.spi.PersistenceUnitTransactionType; import javax.sql.DataSource; -import junit.framework.TestCase; + import org.junit.Assert; import org.junit.Test; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/mapping/QuotingTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/mapping/QuotingTest.java index db988f267e..165d4a837b 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/mapping/QuotingTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/mapping/QuotingTest.java @@ -23,11 +23,11 @@ */ package org.hibernate.ejb.test.mapping; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Ignore; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + /** * @author Emmanuel Bernard */ diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java index e78e465961..6cb35e37d4 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java @@ -23,6 +23,7 @@ */ package org.hibernate.ejb.test.metadata; +import java.util.Set; import javax.persistence.EntityManagerFactory; import javax.persistence.metamodel.Attribute; import javax.persistence.metamodel.Bindable; @@ -36,15 +37,14 @@ import javax.persistence.metamodel.PluralAttribute; import javax.persistence.metamodel.SetAttribute; import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.Type; -import java.util.Set; + +import org.junit.Test; import org.hibernate.cfg.Configuration; import org.hibernate.ejb.metamodel.MetamodelImpl; import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SecondMetadataTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SecondMetadataTest.java index 51a195e900..f2973cdf4a 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SecondMetadataTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/SecondMetadataTest.java @@ -25,10 +25,10 @@ package org.hibernate.ejb.test.metadata; import javax.persistence.EntityManagerFactory; -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; - import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertNotNull; /** diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java index 4a6261d67c..8dd55cc709 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metadata/StaticMetadataTest.java @@ -23,17 +23,17 @@ */ package org.hibernate.ejb.test.metadata; +import java.util.Set; import javax.persistence.metamodel.Attribute; import javax.persistence.metamodel.Bindable; import javax.persistence.metamodel.EmbeddableType; import javax.persistence.metamodel.PluralAttribute; import javax.persistence.metamodel.Type; -import java.util.Set; - -import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; import org.junit.Test; +import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java index 173cad8d37..ed74ada251 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/attribute/MappedSuperclassWithAttributesTest.java @@ -23,10 +23,9 @@ */ package org.hibernate.ejb.test.metagen.mappedsuperclass.attribute; -import org.hibernate.ejb.Ejb3Configuration; - import org.junit.Test; +import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java index 97165bfd1e..ba2ef51fa1 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embedded/MappedSuperclassWithEmbeddedTest.java @@ -23,11 +23,9 @@ */ package org.hibernate.ejb.test.metagen.mappedsuperclass.embedded; -import org.hibernate.ejb.Ejb3Configuration; - import org.junit.Test; -import org.hibernate.testing.FailureExpected; +import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/AbstractProduct.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/AbstractProduct.java index 85008f3185..b4d3a9f8b6 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/AbstractProduct.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/AbstractProduct.java @@ -23,9 +23,9 @@ */ package org.hibernate.ejb.test.metagen.mappedsuperclass.embeddedid; +import java.io.Serializable; import javax.persistence.EmbeddedId; import javax.persistence.MappedSuperclass; -import java.io.Serializable; /** * @author Justin Wesley diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java index d129c95119..a01d65463a 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/MappedSuperclassWithEmbeddedIdTest.java @@ -23,11 +23,9 @@ */ package org.hibernate.ejb.test.metagen.mappedsuperclass.embeddedid; -import org.hibernate.ejb.Ejb3Configuration; - import org.junit.Test; -import org.hibernate.testing.FailureExpected; +import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/ProductId.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/ProductId.java index d11a698ebd..cafdb745ed 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/ProductId.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/embeddedid/ProductId.java @@ -23,9 +23,9 @@ */ package org.hibernate.ejb.test.metagen.mappedsuperclass.embeddedid; +import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Embeddable; -import java.io.Serializable; /** * @author Justin Wesley diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/AbstractAttribute.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/AbstractAttribute.java index c804043672..f4fbdd7a4f 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/AbstractAttribute.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/AbstractAttribute.java @@ -24,7 +24,6 @@ package org.hibernate.ejb.test.metagen.mappedsuperclass.idclass; import java.io.Serializable; - import javax.persistence.Column; import javax.persistence.MappedSuperclass; import javax.persistence.Transient; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/AbstractAttributeId.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/AbstractAttributeId.java index 50bd0f6eb4..52e7df7030 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/AbstractAttributeId.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/AbstractAttributeId.java @@ -24,7 +24,6 @@ package org.hibernate.ejb.test.metagen.mappedsuperclass.idclass; import java.io.Serializable; - import javax.persistence.MappedSuperclass; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java index 176fbc8011..d787899e90 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/MappedSuperclassWithEntityWithIdClassTest.java @@ -23,15 +23,14 @@ */ package org.hibernate.ejb.test.metagen.mappedsuperclass.idclass; -import static org.junit.Assert.assertNotNull; - -import org.hibernate.ejb.Ejb3Configuration; - import org.junit.Test; +import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseUnitTestCase; +import static org.junit.Assert.assertNotNull; + /** * @author Alexis Bataille * @author Steve Ebersole diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/ProductAttribute.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/ProductAttribute.java index 4225f24945..2e4c859bae 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/ProductAttribute.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/metagen/mappedsuperclass/idclass/ProductAttribute.java @@ -24,7 +24,6 @@ package org.hibernate.ejb.test.metagen.mappedsuperclass.idclass; import java.io.Serializable; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/CustomScanner.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/CustomScanner.java index 48524d505e..2a3202742a 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/CustomScanner.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/CustomScanner.java @@ -1,7 +1,9 @@ package org.hibernate.ejb.test.packaging; + import java.lang.annotation.Annotation; import java.net.URL; import java.util.Set; + import org.hibernate.ejb.packaging.NamedInputStream; import org.hibernate.ejb.packaging.NativeScanner; import org.hibernate.ejb.packaging.Scanner; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java index 0c24a4dcd9..dee8db399e 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java @@ -23,11 +23,6 @@ */ package org.hibernate.ejb.test.packaging; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.io.IOException; import java.net.URL; @@ -35,11 +30,12 @@ import java.net.URLConnection; import java.net.URLStreamHandler; import java.net.URLStreamHandlerFactory; import java.util.Set; - import javax.persistence.Embeddable; import javax.persistence.Entity; import javax.persistence.MappedSuperclass; +import org.junit.Test; + import org.hibernate.ejb.packaging.ClassFilter; import org.hibernate.ejb.packaging.Entry; import org.hibernate.ejb.packaging.ExplodedJarVisitor; @@ -54,7 +50,11 @@ import org.hibernate.ejb.packaging.PackageFilter; import org.hibernate.ejb.test.pack.defaultpar.ApplicationServer; import org.hibernate.ejb.test.pack.explodedpar.Carpet; import org.hibernate.testing.TestForIssue; -import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** * @author Emmanuel Bernard diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java index f7821f21c7..a81c668720 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java @@ -23,14 +23,16 @@ */ package org.hibernate.ejb.test.packaging; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.PersistenceException; import java.io.File; import java.util.HashMap; import java.util.HashSet; import java.util.Properties; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; +import javax.persistence.PersistenceException; + +import org.junit.Test; import org.hibernate.ejb.AvailableSettings; import org.hibernate.ejb.HibernateEntityManagerFactory; @@ -56,13 +58,11 @@ import org.hibernate.ejb.test.pack.spacepar.Bug; import org.hibernate.ejb.test.pack.various.Airplane; import org.hibernate.ejb.test.pack.various.Seat; import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; import org.hibernate.internal.util.ConfigHelper; -import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.stat.Statistics; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagingTestCase.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagingTestCase.java index a106128218..dc033f3e62 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagingTestCase.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagingTestCase.java @@ -38,6 +38,8 @@ import org.jboss.shrinkwrap.api.exporter.ExplodedExporter; import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.After; +import org.junit.Before; import org.hibernate.ejb.test.Cat; import org.hibernate.ejb.test.Distributor; @@ -64,10 +66,6 @@ import org.hibernate.ejb.test.pack.externaljar.Scooter; import org.hibernate.ejb.test.pack.spacepar.Bug; import org.hibernate.ejb.test.pack.various.Airplane; import org.hibernate.ejb.test.pack.various.Seat; - -import org.junit.After; -import org.junit.Before; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.fail; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/ScannerTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/ScannerTest.java index 0d7ff884bb..04fefc62f7 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/ScannerTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/packaging/ScannerTest.java @@ -23,16 +23,18 @@ */ package org.hibernate.ejb.test.packaging; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.EntityManagerFactory; -import javax.persistence.MappedSuperclass; -import javax.persistence.Persistence; import java.io.File; import java.lang.annotation.Annotation; import java.util.HashMap; import java.util.HashSet; import java.util.Set; +import javax.persistence.Embeddable; +import javax.persistence.Entity; +import javax.persistence.EntityManagerFactory; +import javax.persistence.MappedSuperclass; +import javax.persistence.Persistence; + +import org.junit.Test; import org.hibernate.ejb.AvailableSettings; import org.hibernate.ejb.packaging.NamedInputStream; @@ -40,8 +42,6 @@ import org.hibernate.ejb.packaging.NativeScanner; import org.hibernate.ejb.packaging.Scanner; import org.hibernate.ejb.test.pack.defaultpar.ApplicationServer; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/JpaEntityNameTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/JpaEntityNameTest.java index 5c35f47fce..925c28596b 100644 --- a/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/JpaEntityNameTest.java +++ b/hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/xml/JpaEntityNameTest.java @@ -1,6 +1,5 @@ package org.hibernate.ejb.test.xml; -import java.util.List; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java index d4b36f49e2..dd2889cd62 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java @@ -22,10 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.envers.entities.mapper; + import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractOneToOneMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractOneToOneMapper.java index 157eb9d374..2a96959f09 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractOneToOneMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractOneToOneMapper.java @@ -1,5 +1,9 @@ package org.hibernate.envers.entities.mapper.relation; +import java.io.Serializable; +import java.util.Map; +import javax.persistence.NoResultException; + import org.hibernate.NonUniqueResultException; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.configuration.AuditConfiguration; @@ -7,10 +11,6 @@ import org.hibernate.envers.entities.PropertyData; import org.hibernate.envers.exception.AuditException; import org.hibernate.envers.reader.AuditReaderImplementor; -import javax.persistence.NoResultException; -import java.io.Serializable; -import java.util.Map; - /** * Template class for property mappers that manage one-to-one relation. * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractToOneMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractToOneMapper.java index cfe049ec9e..f038ecd1c9 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractToOneMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractToOneMapper.java @@ -1,5 +1,9 @@ package org.hibernate.envers.entities.mapper.relation; +import java.io.Serializable; +import java.util.List; +import java.util.Map; + import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.configuration.AuditConfiguration; @@ -11,10 +15,6 @@ import org.hibernate.envers.reader.AuditReaderImplementor; import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.property.Setter; -import java.io.Serializable; -import java.util.List; -import java.util.Map; - /** * Base class for property mappers that manage to-one relation. * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java index 20b9505e16..2eeb2ff2ef 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java @@ -23,13 +23,13 @@ */ package org.hibernate.envers.entities.mapper.relation; +import java.io.Serializable; +import javax.persistence.OneToOne; + import org.hibernate.envers.entities.PropertyData; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.reader.AuditReaderImplementor; -import javax.persistence.OneToOne; -import java.io.Serializable; - /** * Property mapper for not owning side of {@link OneToOne} relation. * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java index fbc5794c27..acbe0f6606 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java @@ -1,15 +1,15 @@ package org.hibernate.envers.entities.mapper.relation; +import java.io.Serializable; +import javax.persistence.OneToOne; +import javax.persistence.PrimaryKeyJoinColumn; + import org.hibernate.envers.Audited; import org.hibernate.envers.entities.PropertyData; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.reader.AuditReaderImplementor; import org.hibernate.persister.entity.EntityPersister; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; -import java.io.Serializable; - /** * Property mapper for {@link OneToOne} with {@link PrimaryKeyJoinColumn} relation. * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java index b061f1998e..9d92fcbe8a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java @@ -23,8 +23,8 @@ */ package org.hibernate.envers.entities.mapper.relation.query; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.*; import java.util.Collections; + import org.hibernate.Query; import org.hibernate.envers.RevisionType; import org.hibernate.envers.configuration.AuditEntitiesConfiguration; @@ -36,6 +36,11 @@ import org.hibernate.envers.strategy.AuditStrategy; import org.hibernate.envers.tools.query.Parameters; import org.hibernate.envers.tools.query.QueryBuilder; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; + /** * Selects data from an audit entity. * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneEntityQueryGenerator.java index 492eb27183..cda7105467 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneEntityQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneEntityQueryGenerator.java @@ -23,8 +23,8 @@ */ package org.hibernate.envers.entities.mapper.relation.query; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.*; import java.util.Collections; + import org.hibernate.Query; import org.hibernate.envers.RevisionType; import org.hibernate.envers.configuration.AuditEntitiesConfiguration; @@ -36,6 +36,10 @@ import org.hibernate.envers.strategy.AuditStrategy; import org.hibernate.envers.tools.query.Parameters; import org.hibernate.envers.tools.query.QueryBuilder; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; + /** * Selects data from a relation middle-table only. * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/ThreeEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/ThreeEntityQueryGenerator.java index 078b31fff4..0a13260127 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/ThreeEntityQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/ThreeEntityQueryGenerator.java @@ -23,8 +23,8 @@ */ package org.hibernate.envers.entities.mapper.relation.query; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.*; import java.util.Collections; + import org.hibernate.Query; import org.hibernate.envers.RevisionType; import org.hibernate.envers.configuration.AuditEntitiesConfiguration; @@ -37,6 +37,14 @@ import org.hibernate.envers.strategy.AuditStrategy; import org.hibernate.envers.tools.query.Parameters; import org.hibernate.envers.tools.query.QueryBuilder; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.INDEX_ENTITY_ALIAS; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.INDEX_ENTITY_ALIAS_DEF_AUD_STR; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; + /** * Selects data from a relation middle-table and a two related versions entity. * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java index 3fa0c029ff..13ddb92247 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java @@ -23,8 +23,8 @@ */ package org.hibernate.envers.entities.mapper.relation.query; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.*; import java.util.Collections; + import org.hibernate.Query; import org.hibernate.envers.RevisionType; import org.hibernate.envers.configuration.AuditEntitiesConfiguration; @@ -36,6 +36,11 @@ import org.hibernate.envers.strategy.AuditStrategy; import org.hibernate.envers.tools.query.Parameters; import org.hibernate.envers.tools.query.QueryBuilder; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; + /** * Selects data from a relation middle-table and a related non-audited entity. * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityQueryGenerator.java index aaeb75809e..aa5f5292f9 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityQueryGenerator.java @@ -23,8 +23,8 @@ */ package org.hibernate.envers.entities.mapper.relation.query; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.*; import java.util.Collections; + import org.hibernate.Query; import org.hibernate.envers.RevisionType; import org.hibernate.envers.configuration.AuditEntitiesConfiguration; @@ -37,6 +37,12 @@ import org.hibernate.envers.strategy.AuditStrategy; import org.hibernate.envers.tools.query.Parameters; import org.hibernate.envers.tools.query.QueryBuilder; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; + /** * Selects data from a relation middle-table and a related versions entity. * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/AbstractAuditQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/AbstractAuditQuery.java index cef9a04851..bcc8a6a7c0 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/AbstractAuditQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/AbstractAuditQuery.java @@ -23,11 +23,11 @@ */ package org.hibernate.envers.query.impl; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.*; import java.util.ArrayList; import java.util.List; import javax.persistence.NoResultException; import javax.persistence.NonUniqueResultException; + import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.LockMode; @@ -45,6 +45,8 @@ import org.hibernate.envers.tools.Pair; import org.hibernate.envers.tools.Triple; import org.hibernate.envers.tools.query.QueryBuilder; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; + /** * @author Adam Warski (adam at warski dot org) * @author HernŠæїŠ…n Chanfreau diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java index 0a02701fea..b40e3579d9 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java @@ -23,10 +23,10 @@ */ package org.hibernate.envers.query.impl; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import org.hibernate.Query; import org.hibernate.envers.RevisionType; import org.hibernate.envers.configuration.AuditConfiguration; @@ -35,6 +35,10 @@ import org.hibernate.envers.entities.mapper.relation.MiddleIdData; import org.hibernate.envers.query.criteria.AuditCriterion; import org.hibernate.envers.reader.AuditReaderImplementor; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; + /** * @author Adam Warski (adam at warski dot org) * @author HernŠæїŠ…n Chanfreau diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java index 09ce8852ca..12693229ef 100755 --- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java @@ -1,7 +1,7 @@ package org.hibernate.envers.strategy; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.*; import java.io.Serializable; + import org.hibernate.Session; import org.hibernate.envers.configuration.AuditConfiguration; import org.hibernate.envers.configuration.GlobalConfiguration; @@ -12,6 +12,9 @@ import org.hibernate.envers.synchronization.SessionCacheCleaner; import org.hibernate.envers.tools.query.Parameters; import org.hibernate.envers.tools.query.QueryBuilder; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS_DEF_AUD_STR; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; + /** * Default strategy is to simply persist the audit data. * diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java index 38e55ec31b..bbe6b5139e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java @@ -1,10 +1,10 @@ package org.hibernate.envers.strategy; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.*; import java.io.Serializable; import java.util.Date; import java.util.List; import java.util.Map; + import org.hibernate.LockOptions; import org.hibernate.Session; import org.hibernate.envers.RevisionType; @@ -20,6 +20,9 @@ import org.hibernate.envers.tools.query.Parameters; import org.hibernate.envers.tools.query.QueryBuilder; import org.hibernate.property.Getter; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; +import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; + /** * Audit strategy which persists and retrieves audit information using a validity algorithm, based on the * start-revision and end-revision of a row in the audit tables. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java index 4b474b3a6f..f28270f74b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java @@ -22,15 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.envers.synchronization.work; + import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.hibernate.Hibernate; + import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.tools.Tools; -import org.hibernate.proxy.HibernateProxy; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/tool/EnversSchemaGenerator.java b/hibernate-envers/src/main/java/org/hibernate/tool/EnversSchemaGenerator.java index 42e51460c8..c5701cb244 100644 --- a/hibernate-envers/src/main/java/org/hibernate/tool/EnversSchemaGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/tool/EnversSchemaGenerator.java @@ -1,14 +1,14 @@ package org.hibernate.tool; +import java.sql.Connection; +import java.util.Properties; + import org.hibernate.HibernateException; import org.hibernate.cfg.Configuration; import org.hibernate.envers.configuration.AuditConfiguration; import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; -import java.sql.Connection; -import java.util.Properties; - /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/matrix/java/ee/estonia/entities/Child.java b/hibernate-envers/src/matrix/java/ee/estonia/entities/Child.java index 5f7677a0bc..97b7e8aa69 100644 --- a/hibernate-envers/src/matrix/java/ee/estonia/entities/Child.java +++ b/hibernate-envers/src/matrix/java/ee/estonia/entities/Child.java @@ -1,11 +1,11 @@ package ee.estonia.entities; -import org.hibernate.envers.Audited; - +import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import java.io.Serializable; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/ee/estonia/entities/Parent.java b/hibernate-envers/src/matrix/java/ee/estonia/entities/Parent.java index 3c15f29d77..c449dc2cd4 100644 --- a/hibernate-envers/src/matrix/java/ee/estonia/entities/Parent.java +++ b/hibernate-envers/src/matrix/java/ee/estonia/entities/Parent.java @@ -1,14 +1,14 @@ package ee.estonia.entities; -import org.hibernate.envers.Audited; - +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToMany; -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractEntityTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractEntityTest.java index d67a4ddfdd..055fd1d1ed 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractEntityTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractEntityTest.java @@ -27,10 +27,10 @@ import java.io.IOException; import java.util.Properties; import javax.persistence.EntityManager; -import org.hibernate.dialect.Dialect; import org.junit.Before; import org.hibernate.cfg.Environment; +import org.hibernate.dialect.Dialect; import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.EntityManagerFactoryImpl; import org.hibernate.envers.AuditReader; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractSessionTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractSessionTest.java index 1a8d649e98..e05ed2a95c 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractSessionTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/AbstractSessionTest.java @@ -1,8 +1,6 @@ package org.hibernate.envers.test; -import java.io.File; import java.net.URISyntaxException; -import java.net.URL; import org.junit.Before; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java index fa9e19108c..aef8c1a111 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ColumnScalePrecisionTest.java @@ -1,16 +1,17 @@ package org.hibernate.envers.test.integration.basic; +import java.util.Arrays; +import javax.persistence.EntityManager; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.Arrays; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/NoneAudited.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/NoneAudited.java index 99b202ef3b..1f27051331 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/NoneAudited.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/NoneAudited.java @@ -23,20 +23,17 @@ */ package org.hibernate.envers.test.integration.basic; -import org.hibernate.ejb.Ejb3Configuration; -import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.AbstractEntityTest; -import org.hibernate.envers.test.Priority; -import org.hibernate.mapping.PersistentClass; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.junit.Assert; +import org.junit.Test; + +import org.hibernate.ejb.Ejb3Configuration; +import org.hibernate.envers.test.AbstractEntityTest; +import org.hibernate.mapping.PersistentClass; + /** * @author Adam Warski (adam at warski dot org) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ScalePrecisionEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ScalePrecisionEntity.java index 5e5c3fe61f..4b71ba6812 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ScalePrecisionEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/basic/ScalePrecisionEntity.java @@ -1,12 +1,12 @@ package org.hibernate.envers.test.integration.basic; -import org.hibernate.envers.Audited; - +import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import java.io.Serializable; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java index cd4f922384..18c92afa0b 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java @@ -23,7 +23,6 @@ */ package org.hibernate.envers.test.integration.components; -import java.math.BigInteger; import java.util.Arrays; import javax.persistence.EntityManager; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java index 2f4175a44b..fb61d2436a 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/ParentReferencingChildTest.java @@ -1,15 +1,16 @@ package org.hibernate.envers.test.integration.inheritance.joined.relation; +import java.util.Arrays; +import javax.persistence.EntityManager; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.tools.TestTools; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.Arrays; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Person.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Person.java index 2417efbdae..eac7475862 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Person.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Person.java @@ -1,9 +1,8 @@ package org.hibernate.envers.test.integration.inheritance.joined.relation; -import org.hibernate.envers.Audited; - import javax.persistence.Entity; -import javax.persistence.Table; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/RightsSubject.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/RightsSubject.java index c185c16c26..2ca029daa4 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/RightsSubject.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/RightsSubject.java @@ -1,10 +1,16 @@ package org.hibernate.envers.test.integration.inheritance.joined.relation; -import org.hibernate.envers.Audited; - -import javax.persistence.*; import java.util.HashSet; import java.util.Set; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.ManyToMany; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Role.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Role.java index 37233ba056..ee29971c50 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Role.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/inheritance/joined/relation/Role.java @@ -1,12 +1,12 @@ package org.hibernate.envers.test.integration.inheritance.joined.relation; -import org.hibernate.envers.Audited; - +import java.util.HashSet; +import java.util.Set; import javax.persistence.Entity; import javax.persistence.ManyToMany; import javax.persistence.Table; -import java.util.HashSet; -import java.util.Set; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java index 950e4791f6..e8d33f32ef 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ImplicitMappedByTest.java @@ -1,17 +1,18 @@ package org.hibernate.envers.test.integration.manytoone.bidirectional; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import javax.persistence.EntityManager; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.tools.TestTools; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ManyToOneOwning.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ManyToOneOwning.java index a593e21406..36cc49aeb9 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ManyToOneOwning.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/ManyToOneOwning.java @@ -1,9 +1,14 @@ package org.hibernate.envers.test.integration.manytoone.bidirectional; -import org.hibernate.envers.Audited; - -import javax.persistence.*; import java.io.Serializable; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToOne; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/OneToManyOwned.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/OneToManyOwned.java index 0048e70568..b91a373ec4 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/OneToManyOwned.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/manytoone/bidirectional/OneToManyOwned.java @@ -1,14 +1,14 @@ package org.hibernate.envers.test.integration.manytoone.bidirectional; -import org.hibernate.envers.Audited; - +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToMany; -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/AddDelTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/AddDelTest.java index 9212f4ee8e..9625bdfb8a 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/AddDelTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/AddDelTest.java @@ -1,13 +1,14 @@ package org.hibernate.envers.test.integration.merge; +import java.util.Arrays; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.envers.test.AbstractSessionTest; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import java.util.Arrays; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/GivenIdStrEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/GivenIdStrEntity.java index eec1cecbff..9981928b2d 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/GivenIdStrEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/merge/GivenIdStrEntity.java @@ -1,11 +1,11 @@ package org.hibernate.envers.test.integration.merge; -import org.hibernate.envers.AuditTable; -import org.hibernate.envers.Audited; - import javax.persistence.Entity; import javax.persistence.Id; +import org.hibernate.envers.AuditTable; +import org.hibernate.envers.Audited; + /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java index 43f72c37d5..3001fcbbab 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java @@ -23,14 +23,14 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import java.util.Properties; + import org.hibernate.envers.configuration.GlobalConfiguration; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQuery; import org.hibernate.envers.test.AbstractEntityTest; -import java.util.List; -import java.util.Properties; - /** * Base test for modified flags feature * diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java index 14a31edafb..3f23922e32 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAPITest.java @@ -23,15 +23,16 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.integration.auditReader.AuditedTestEntity; import org.hibernate.envers.test.integration.auditReader.NotAuditedTestEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java index 4bbd818079..6cbda2db5a 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedAuditedManyToManyTest.java @@ -1,18 +1,19 @@ package org.hibernate.envers.test.integration.modifiedflags; -import org.hibernate.MappingException; -import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.test.Priority; -import org.hibernate.envers.test.integration.entityNames.manyToManyAudited.Car; -import org.hibernate.envers.test.integration.entityNames.manyToManyAudited.Person; -import org.junit.Test; - import java.io.File; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.List; +import org.junit.Test; + +import org.hibernate.MappingException; +import org.hibernate.envers.query.AuditEntity; +import org.hibernate.envers.test.Priority; +import org.hibernate.envers.test.integration.entityNames.manyToManyAudited.Car; +import org.hibernate.envers.test.integration.entityNames.manyToManyAudited.Person; + import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; import static org.hibernate.envers.test.tools.TestTools.makeList; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java index c5afe42b1f..06b36cb720 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedBidirectional2.java @@ -23,14 +23,15 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefEdEntity; import org.hibernate.envers.test.integration.onetoone.bidirectional.BiRefIngEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java index 92a46c8dd5..2b4346af97 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildAuditing.java @@ -24,14 +24,15 @@ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.integration.inheritance.joined.ChildEntity; import org.hibernate.envers.test.integration.inheritance.joined.ParentEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java index e3f94a4d3f..6502b506a5 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedChildReferencing.java @@ -24,15 +24,16 @@ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.integration.inheritance.joined.childrelation.ChildIngEntity; import org.hibernate.envers.test.integration.inheritance.joined.childrelation.ParentNotIngEntity; import org.hibernate.envers.test.integration.inheritance.joined.childrelation.ReferencedEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java index 6f2c7a507e..47a645f8ff 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentMapKey.java @@ -23,16 +23,17 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.components.Component1; import org.hibernate.envers.test.entities.components.Component2; import org.hibernate.envers.test.entities.components.ComponentTestEntity; import org.hibernate.envers.test.integration.collection.mapkey.ComponentMapKeyEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java index 101e4680eb..2bf04bc3c2 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponents.java @@ -23,6 +23,11 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.QueryException; import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; @@ -30,10 +35,6 @@ import org.hibernate.envers.test.entities.components.Component1; import org.hibernate.envers.test.entities.components.Component2; import org.hibernate.envers.test.entities.components.ComponentTestEntity; import org.hibernate.envers.test.tools.TestTools; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedCompositeCustom.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedCompositeCustom.java index 9df414ccf8..153bc4b786 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedCompositeCustom.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedCompositeCustom.java @@ -23,14 +23,15 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.customtype.Component; import org.hibernate.envers.test.entities.customtype.CompositeCustomTypeEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java index 84340e372d..5083aba781 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDoubleJoinColumnBidirectionalList.java @@ -23,15 +23,16 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefEdEntity1; import org.hibernate.envers.test.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefEdEntity2; import org.hibernate.envers.test.entities.onetomany.detached.DoubleListJoinColumnBidirectionalRefIngEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java index ee7f890c3c..3a279f1bb1 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedEnumSet.java @@ -23,15 +23,16 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.collection.EnumSetEntity; import org.hibernate.envers.test.entities.collection.EnumSetEntity.E1; import org.hibernate.envers.test.entities.collection.EnumSetEntity.E2; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java index fbcb0da08b..55e4598a5b 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedForDefaultNotUsing.java @@ -23,6 +23,12 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.Arrays; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.QueryException; import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; @@ -31,11 +37,6 @@ import org.hibernate.envers.test.entities.components.Component1; import org.hibernate.envers.test.entities.components.Component2; import org.hibernate.envers.test.integration.modifiedflags.entities.PartialModifiedFlagsEntity; import org.hibernate.envers.test.integration.modifiedflags.entities.WithModifiedFlagReferencingEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.Arrays; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java index 3c59f98e17..dacd2a36bf 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedIdMapKey.java @@ -23,14 +23,15 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.integration.collection.mapkey.IdMapKeyEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java index 2a0f45836d..40f3adde28 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedManyToOneInComponent.java @@ -23,15 +23,16 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.components.relations.ManyToOneComponent; import org.hibernate.envers.test.entities.components.relations.ManyToOneComponentTestEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java index ce51cca292..5ee45c9986 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNotOwnedBidirectional.java @@ -24,15 +24,16 @@ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.integration.inheritance.joined.notownedrelation.Address; import org.hibernate.envers.test.integration.inheritance.joined.notownedrelation.Contact; import org.hibernate.envers.test.integration.inheritance.joined.notownedrelation.PersonalContact; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java index b4f876a805..12ca2fa344 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedNullProperties.java @@ -23,14 +23,15 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.integration.basic.BasicTestEntity1; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java index 251ad35974..9310ebde8e 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedOneToManyInComponent.java @@ -23,15 +23,16 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.components.relations.OneToManyComponent; import org.hibernate.envers.test.entities.components.relations.OneToManyComponentTestEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java index 5cf994885a..ae7def3363 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringMap.java @@ -23,13 +23,14 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.collection.StringMapEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java index 5dd81e219d..405aae2334 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedStringSet.java @@ -23,13 +23,14 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.collection.StringSetEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java index f23dea6dcc..da370236ae 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedUnversionedProperties.java @@ -23,14 +23,15 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.QueryException; import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.integration.basic.BasicTestEntity2; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java index 4e1d329fd3..6f3a1ab325 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java @@ -23,17 +23,18 @@ */ package org.hibernate.envers.test.integration.modifiedflags; +import java.util.List; +import java.util.Properties; +import javax.persistence.EntityManager; + +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.configuration.GlobalConfiguration; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.integration.basic.BasicTestEntity1; import org.hibernate.envers.test.tools.TestTools; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.List; -import java.util.Properties; import static junit.framework.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java index 2d0ef050ab..88c7f282a1 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/PartialModifiedFlagsEntity.java @@ -23,16 +23,23 @@ */ package org.hibernate.envers.test.integration.modifiedflags.entities; -import org.hibernate.envers.Audited; -import org.hibernate.envers.test.entities.StrTestEntity; -import org.hibernate.envers.test.entities.components.Component1; -import org.hibernate.envers.test.entities.components.Component2; - -import javax.persistence.*; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import javax.persistence.CollectionTable; +import javax.persistence.ElementCollection; +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToMany; +import javax.persistence.MapKeyColumn; +import javax.persistence.OneToOne; + +import org.hibernate.envers.Audited; +import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.test.entities.components.Component1; +import org.hibernate.envers.test.entities.components.Component2; /** * @author Michal Skowronek (mskowr at o2 dot pl) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java index 03bba8b15b..33682cff0e 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/modifiedflags/entities/WithModifiedFlagReferencingEntity.java @@ -23,12 +23,12 @@ */ package org.hibernate.envers.test.integration.modifiedflags.entities; -import org.hibernate.envers.Audited; - import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.OneToOne; +import org.hibernate.envers.Audited; + /** * @author Adam Warski (adam at warski dot org) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Address.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Address.java index dc09fabadf..4517995d41 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Address.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Address.java @@ -1,11 +1,17 @@ package org.hibernate.envers.test.integration.multiplerelations; -import org.hibernate.envers.Audited; - -import javax.persistence.*; import java.io.Serializable; import java.util.HashSet; import java.util.Set; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/MultipleAssociationsTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/MultipleAssociationsTest.java index 949f233f1b..009c0b84b0 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/MultipleAssociationsTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/MultipleAssociationsTest.java @@ -1,15 +1,16 @@ package org.hibernate.envers.test.integration.multiplerelations; +import java.util.Arrays; +import javax.persistence.EntityManager; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.tools.TestTools; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.Arrays; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Person.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Person.java index 3e3cf449f0..4a44c5a452 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Person.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/multiplerelations/Person.java @@ -1,11 +1,18 @@ package org.hibernate.envers.test.integration.multiplerelations; -import org.hibernate.envers.Audited; - -import javax.persistence.*; import java.io.Serializable; import java.util.HashSet; import java.util.Set; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.OneToMany; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/EstonianTableAlias.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/EstonianTableAlias.java index 83d30a119c..f99273b464 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/EstonianTableAlias.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/naming/EstonianTableAlias.java @@ -1,16 +1,17 @@ package org.hibernate.envers.test.integration.naming; +import javax.persistence.EntityManager; + import ee.estonia.entities.Child; import ee.estonia.entities.Parent; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.tools.TestTools; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java index f1ad1476d2..80e3b8c098 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/HierarchyTest.java @@ -1,15 +1,16 @@ package org.hibernate.envers.test.integration.onetomany.hierarchy; +import java.util.Arrays; +import javax.persistence.EntityManager; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.tools.TestTools; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.Arrays; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/Node.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/Node.java index a3bbf25e15..c8265cb50c 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/Node.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetomany/hierarchy/Node.java @@ -1,12 +1,20 @@ package org.hibernate.envers.test.integration.onetomany.hierarchy; -import org.hibernate.envers.AuditJoinTable; -import org.hibernate.envers.Audited; - -import javax.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.Table; + +import org.hibernate.envers.AuditJoinTable; +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java index 2dd777e5d1..9ad7d17b6e 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Account.java @@ -1,11 +1,13 @@ package org.hibernate.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; -import org.hibernate.annotations.Proxy; -import org.hibernate.envers.Audited; -import org.hibernate.envers.RelationTargetAuditMode; - -import javax.persistence.*; import java.io.Serializable; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.OneToOne; +import javax.persistence.PrimaryKeyJoinColumn; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java index 46620871e9..db90d7b127 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/AccountNotAuditedOwners.java @@ -1,11 +1,15 @@ package org.hibernate.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; +import java.io.Serializable; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.OneToOne; + import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import java.io.Serializable; - /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java index bf8e299414..1eae29d5b0 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedNoProxyPerson.java @@ -1,9 +1,13 @@ package org.hibernate.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; -import org.hibernate.annotations.Proxy; - -import javax.persistence.*; import java.io.Serializable; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.OneToOne; +import javax.persistence.PrimaryKeyJoinColumn; + +import org.hibernate.annotations.Proxy; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java index 0c824e21ef..e1fb2b7616 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/NotAuditedProxyPerson.java @@ -1,9 +1,14 @@ package org.hibernate.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; -import org.hibernate.annotations.Proxy; - -import javax.persistence.*; import java.io.Serializable; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.OneToOne; +import javax.persistence.PrimaryKeyJoinColumn; + +import org.hibernate.annotations.Proxy; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java index 507b300168..ffd0077395 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/OneToOneWithPrimaryKeyJoinTest.java @@ -1,5 +1,11 @@ package org.hibernate.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; +import java.util.Arrays; +import javax.persistence.EntityManager; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.RevisionType; import org.hibernate.envers.query.AuditEntity; @@ -7,11 +13,6 @@ import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.Priority; import org.hibernate.proxy.HibernateProxy; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.Arrays; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java index d642180bf8..fc16f8b3e4 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/onetoone/bidirectional/primarykeyjoincolumn/Person.java @@ -1,13 +1,12 @@ package org.hibernate.envers.test.integration.onetoone.bidirectional.primarykeyjoincolumn; -import org.hibernate.annotations.Proxy; -import org.hibernate.envers.Audited; - +import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToOne; -import java.io.Serializable; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java index fe2a8807ba..5c46dce456 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/query/ids/MulIdOneToManyQuery.java @@ -29,7 +29,7 @@ import java.util.Set; import javax.persistence.EntityManager; import org.junit.Test; -import static org.junit.Assert.*; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.test.AbstractEntityTest; @@ -39,6 +39,8 @@ import org.hibernate.envers.test.entities.onetomany.ids.SetRefEdMulIdEntity; import org.hibernate.envers.test.entities.onetomany.ids.SetRefIngMulIdEntity; import org.hibernate.envers.test.tools.TestTools; +import static org.junit.Assert.assertEquals; + /** * @author Adam Warski (adam at warski dot org) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java index aa3dfadd0e..836bcd61a3 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java @@ -4,16 +4,16 @@ import java.util.Arrays; import java.util.Properties; import javax.persistence.EntityManager; -import org.hibernate.dialect.H2Dialect; -import org.hibernate.testing.RequiresDialect; import org.junit.Test; import org.hibernate.cfg.Environment; +import org.hibernate.dialect.H2Dialect; import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.mapping.Table; +import org.hibernate.testing.RequiresDialect; /** * Tests simple auditing process (read and write operations) when REVINFO and audit tables diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java index 20dc205d9f..1717b16469 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java @@ -32,10 +32,10 @@ import java.util.Set; import javax.persistence.EntityManager; import javax.persistence.Query; -import org.hibernate.dialect.SQLServerDialect; import org.junit.Test; import org.hibernate.Session; +import org.hibernate.dialect.SQLServerDialect; import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.strategy.ValidityAuditStrategy; import org.hibernate.envers.test.AbstractEntityTest; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java index d10c4be345..8005545ccc 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java @@ -32,11 +32,11 @@ import java.util.Set; import javax.persistence.EntityManager; import javax.persistence.Query; -import org.hibernate.dialect.MySQL5Dialect; -import org.hibernate.dialect.SQLServerDialect; import org.junit.Test; import org.hibernate.Session; +import org.hibernate.dialect.MySQL5Dialect; +import org.hibernate.dialect.SQLServerDialect; import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.DefaultRevisionEntity; import org.hibernate.envers.strategy.ValidityAuditStrategy; diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditClassOverrideTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditClassOverrideTest.java index 962fe1b873..197ecf9868 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditClassOverrideTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditClassOverrideTest.java @@ -1,15 +1,16 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; +import javax.persistence.EntityManager; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditPropertyOverrideTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditPropertyOverrideTest.java index 014477bf86..21d9280682 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditPropertyOverrideTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditPropertyOverrideTest.java @@ -1,15 +1,16 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; +import javax.persistence.EntityManager; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedBaseEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedBaseEntity.java index 0ae8ff9fe5..08c4bb9464 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedBaseEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedBaseEntity.java @@ -1,11 +1,11 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; -import org.hibernate.envers.Audited; - +import java.io.Serializable; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.MappedSuperclass; -import java.io.Serializable; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedSpecialEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedSpecialEntity.java index aac603fce0..16461b72d4 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedSpecialEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/AuditedSpecialEntity.java @@ -1,11 +1,11 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; +import javax.persistence.Entity; + import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; import org.hibernate.envers.Audited; -import javax.persistence.Entity; - /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/BaseEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/BaseEntity.java index 143b0ee00b..59599cee64 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/BaseEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/BaseEntity.java @@ -1,12 +1,12 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; -import org.hibernate.envers.Audited; -import org.hibernate.envers.NotAudited; - +import java.io.Serializable; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.MappedSuperclass; -import java.io.Serializable; + +import org.hibernate.envers.Audited; +import org.hibernate.envers.NotAudited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java index 8c0702e053..9581b6212f 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideAuditedEntity.java @@ -1,11 +1,11 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; +import javax.persistence.Entity; + import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; import org.hibernate.envers.Audited; -import javax.persistence.Entity; - /** * @author Lukasz Antoniak (lukasz.antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java index 0c4bdd2f67..628aae6b07 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ClassOverrideNotAuditedEntity.java @@ -1,11 +1,11 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; +import javax.persistence.Entity; + import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; import org.hibernate.envers.Audited; -import javax.persistence.Entity; - /** * @author Lukasz Antoniak (lukasz.antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ExtendedBaseEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ExtendedBaseEntity.java index d4137d8a70..7be515cb33 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ExtendedBaseEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/ExtendedBaseEntity.java @@ -1,12 +1,12 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; +import javax.persistence.MappedSuperclass; + import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; -import javax.persistence.MappedSuperclass; - /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideEntity.java index 0feb9f1d89..415bcf34f1 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideEntity.java @@ -1,11 +1,11 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; +import javax.persistence.Entity; + import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; import org.hibernate.envers.Audited; -import javax.persistence.Entity; - /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideTest.java index f7114b33e4..6729d0b1c2 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/MixedOverrideTest.java @@ -1,15 +1,16 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; +import javax.persistence.EntityManager; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.envers.test.AbstractEntityTest; import org.hibernate.envers.test.Priority; import org.hibernate.mapping.Column; import org.hibernate.mapping.Table; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/NotAuditedBaseEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/NotAuditedBaseEntity.java index f83655bdff..e9fefa4cb8 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/NotAuditedBaseEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/NotAuditedBaseEntity.java @@ -1,9 +1,9 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; +import java.io.Serializable; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.MappedSuperclass; -import java.io.Serializable; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/PropertyOverrideEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/PropertyOverrideEntity.java index 783d1e4ad8..1ad72ced95 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/PropertyOverrideEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/PropertyOverrideEntity.java @@ -1,11 +1,11 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; +import javax.persistence.Entity; + import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; import org.hibernate.envers.Audited; -import javax.persistence.Entity; - /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/TransitiveOverrideEntity.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/TransitiveOverrideEntity.java index 72dc9069df..9675ee8608 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/TransitiveOverrideEntity.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/superclass/auditoverride/TransitiveOverrideEntity.java @@ -1,11 +1,11 @@ package org.hibernate.envers.test.integration.superclass.auditoverride; +import javax.persistence.Entity; + import org.hibernate.envers.AuditOverride; import org.hibernate.envers.AuditOverrides; import org.hibernate.envers.Audited; -import javax.persistence.Entity; - /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java index 797153aac9..1422ac9d92 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java @@ -1,5 +1,11 @@ package org.hibernate.envers.test.integration.tools; +import java.net.URISyntaxException; +import java.util.Arrays; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.MappingException; import org.hibernate.Session; import org.hibernate.cfg.Environment; @@ -8,11 +14,6 @@ import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.testing.TestForIssue; import org.hibernate.tool.EnversSchemaGenerator; -import org.junit.Assert; -import org.junit.Test; - -import java.net.URISyntaxException; -import java.util.Arrays; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/tools/TestTools.java b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/tools/TestTools.java index 69a09ef8bf..6aafaad6e9 100644 --- a/hibernate-envers/src/matrix/java/org/hibernate/envers/test/tools/TestTools.java +++ b/hibernate-envers/src/matrix/java/org/hibernate/envers/test/tools/TestTools.java @@ -22,10 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.envers.test.tools; -import org.hibernate.envers.DefaultRevisionEntity; -import org.hibernate.envers.configuration.GlobalConfiguration; -import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.Property; import java.util.ArrayList; import java.util.Arrays; @@ -36,6 +32,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.hibernate.envers.DefaultRevisionEntity; +import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.mapping.PersistentClass; +import org.hibernate.mapping.Property; + /** * @author Adam Warski (adam at warski dot org) */ diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java index 524a32dbc4..43c7318824 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java @@ -10,28 +10,6 @@ import java.util.Properties; import java.util.Set; import javax.transaction.TransactionManager; -import org.hibernate.cache.infinispan.impl.BaseRegion; -import org.hibernate.cache.infinispan.util.CacheCommandFactory; -import org.hibernate.cache.spi.CacheDataDescription; -import org.hibernate.cache.CacheException; -import org.hibernate.cache.spi.CollectionRegion; -import org.hibernate.cache.spi.EntityRegion; -import org.hibernate.cache.spi.NaturalIdRegion; -import org.hibernate.cache.spi.QueryResultsRegion; -import org.hibernate.cache.spi.RegionFactory; -import org.hibernate.cache.spi.TimestampsRegion; -import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.cache.infinispan.collection.CollectionRegionImpl; -import org.hibernate.cache.infinispan.entity.EntityRegionImpl; -import org.hibernate.cache.infinispan.impl.ClassLoaderAwareCache; -import org.hibernate.cache.infinispan.query.QueryResultsRegionImpl; -import org.hibernate.cache.infinispan.timestamp.TimestampTypeOverrides; -import org.hibernate.cache.infinispan.timestamp.TimestampsRegionImpl; -import org.hibernate.cache.infinispan.tm.HibernateTransactionManagerLookup; -import org.hibernate.cache.infinispan.util.CacheAdapter; -import org.hibernate.cache.infinispan.util.CacheAdapterImpl; -import org.hibernate.cfg.Settings; -import org.hibernate.internal.util.config.ConfigurationHelper; import org.infinispan.AdvancedCache; import org.infinispan.commands.module.ModuleCommandFactory; import org.infinispan.config.Configuration; @@ -41,6 +19,29 @@ import org.infinispan.manager.EmbeddedCacheManager; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.collection.CollectionRegionImpl; +import org.hibernate.cache.infinispan.entity.EntityRegionImpl; +import org.hibernate.cache.infinispan.impl.BaseRegion; +import org.hibernate.cache.infinispan.impl.ClassLoaderAwareCache; +import org.hibernate.cache.infinispan.query.QueryResultsRegionImpl; +import org.hibernate.cache.infinispan.timestamp.TimestampTypeOverrides; +import org.hibernate.cache.infinispan.timestamp.TimestampsRegionImpl; +import org.hibernate.cache.infinispan.tm.HibernateTransactionManagerLookup; +import org.hibernate.cache.infinispan.util.CacheAdapter; +import org.hibernate.cache.infinispan.util.CacheAdapterImpl; +import org.hibernate.cache.infinispan.util.CacheCommandFactory; +import org.hibernate.cache.spi.CacheDataDescription; +import org.hibernate.cache.spi.CollectionRegion; +import org.hibernate.cache.spi.EntityRegion; +import org.hibernate.cache.spi.NaturalIdRegion; +import org.hibernate.cache.spi.QueryResultsRegion; +import org.hibernate.cache.spi.RegionFactory; +import org.hibernate.cache.spi.TimestampsRegion; +import org.hibernate.cache.spi.access.AccessType; +import org.hibernate.cfg.Settings; +import org.hibernate.internal.util.config.ConfigurationHelper; + /** * A {@link RegionFactory} for Infinispan-backed cache * regions. diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java index aa8bced817..5d66f21402 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java @@ -20,17 +20,20 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.hibernate.cache.infinispan; + import java.util.Properties; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.hibernate.cache.CacheException; -import org.hibernate.internal.util.config.ConfigurationHelper; -import org.hibernate.internal.util.jndi.JndiHelper; + import org.infinispan.manager.EmbeddedCacheManager; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; +import org.hibernate.cache.CacheException; +import org.hibernate.internal.util.config.ConfigurationHelper; +import org.hibernate.internal.util.jndi.JndiHelper; + /** * A {@link org.hibernate.cache.spi.RegionFactory} for Infinispan-backed cache * regions that finds its cache manager in JNDI rather than creating one itself. diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/TypeOverrides.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/TypeOverrides.java index e8a39387e9..d6fcbbb6d4 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/TypeOverrides.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/TypeOverrides.java @@ -20,13 +20,16 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.hibernate.cache.infinispan; + import java.util.HashSet; import java.util.Locale; import java.util.Set; -import org.hibernate.cache.CacheException; + import org.infinispan.config.Configuration; import org.infinispan.eviction.EvictionStrategy; +import org.hibernate.cache.CacheException; + /** * This class represents Infinispan cache parameters that can be configured via hibernate configuration properties * for either general entity/collection/query/timestamp data type caches and overrides for individual entity or diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java index ee6c556c97..2140a37689 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cache.infinispan.access; + import java.lang.ref.WeakReference; import java.util.HashMap; import java.util.LinkedList; @@ -35,6 +36,7 @@ import java.util.concurrent.locks.ReentrantLock; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; + import org.hibernate.cache.CacheException; /** diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java index 2c8d384540..02f5511135 100755 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java @@ -24,15 +24,17 @@ package org.hibernate.cache.infinispan.access; import javax.transaction.Transaction; + +import org.infinispan.util.logging.Log; +import org.infinispan.util.logging.LogFactory; + import org.hibernate.cache.CacheException; -import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy; -import org.hibernate.cache.spi.access.EntityRegionAccessStrategy; -import org.hibernate.cache.spi.access.SoftLock; import org.hibernate.cache.infinispan.impl.BaseRegion; import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.cache.infinispan.util.FlagAdapter; -import org.infinispan.util.logging.Log; -import org.infinispan.util.logging.LogFactory; +import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy; +import org.hibernate.cache.spi.access.EntityRegionAccessStrategy; +import org.hibernate.cache.spi.access.SoftLock; /** * Defines the strategy for transactional access to entity or collection data in a Infinispan instance. diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java index 1065e126bf..82ce84e0ab 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java @@ -1,15 +1,18 @@ package org.hibernate.cache.infinispan.collection; + import javax.transaction.TransactionManager; -import org.hibernate.cache.spi.CacheDataDescription; + +import org.infinispan.notifications.Listener; + import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.access.PutFromLoadValidator; +import org.hibernate.cache.infinispan.impl.BaseTransactionalDataRegion; +import org.hibernate.cache.infinispan.util.CacheAdapter; +import org.hibernate.cache.spi.CacheDataDescription; import org.hibernate.cache.spi.CollectionRegion; import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy; -import org.hibernate.cache.infinispan.access.PutFromLoadValidator; -import org.hibernate.cache.infinispan.impl.BaseTransactionalDataRegion; -import org.hibernate.cache.infinispan.util.CacheAdapter; -import org.infinispan.notifications.Listener; /** * @author Chris Bredesen diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/ReadOnlyAccess.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/ReadOnlyAccess.java index 7958513e23..77b05fdb0b 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/ReadOnlyAccess.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/ReadOnlyAccess.java @@ -1,9 +1,11 @@ package org.hibernate.cache.infinispan.collection; -import org.hibernate.cache.CacheException; -import org.hibernate.cache.spi.access.SoftLock; + import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.spi.access.SoftLock; + /** * This defines the strategy for transactional access to collection data in a * Infinispan instance. diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java index 108f1548de..ae344c6406 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java @@ -1,9 +1,10 @@ package org.hibernate.cache.infinispan.collection; + import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.access.TransactionalAccessDelegate; import org.hibernate.cache.spi.CollectionRegion; import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy; import org.hibernate.cache.spi.access.SoftLock; -import org.hibernate.cache.infinispan.access.TransactionalAccessDelegate; /** * Transactional collection region access for Infinispan. diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java index 94b89f3a47..391a8ada57 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java @@ -1,15 +1,18 @@ package org.hibernate.cache.infinispan.entity; + import javax.transaction.TransactionManager; -import org.hibernate.cache.spi.CacheDataDescription; + +import org.infinispan.notifications.Listener; + import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.access.PutFromLoadValidator; +import org.hibernate.cache.infinispan.impl.BaseTransactionalDataRegion; +import org.hibernate.cache.infinispan.util.CacheAdapter; +import org.hibernate.cache.spi.CacheDataDescription; import org.hibernate.cache.spi.EntityRegion; import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cache.spi.access.EntityRegionAccessStrategy; -import org.hibernate.cache.infinispan.access.PutFromLoadValidator; -import org.hibernate.cache.infinispan.impl.BaseTransactionalDataRegion; -import org.hibernate.cache.infinispan.util.CacheAdapter; -import org.infinispan.notifications.Listener; /** * @author Chris Bredesen diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/ReadOnlyAccess.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/ReadOnlyAccess.java index 213e066aa4..8062a7406a 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/ReadOnlyAccess.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/ReadOnlyAccess.java @@ -1,9 +1,11 @@ package org.hibernate.cache.infinispan.entity; -import org.hibernate.cache.CacheException; -import org.hibernate.cache.spi.access.SoftLock; + import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.spi.access.SoftLock; + /** * A specialization of {@link TransactionalAccess} that ensures we never update data. Infinispan * access is always transactional. diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java index 3ca63b8146..de0dd89fea 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java @@ -1,9 +1,10 @@ package org.hibernate.cache.infinispan.entity; + import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.access.TransactionalAccessDelegate; import org.hibernate.cache.spi.EntityRegion; import org.hibernate.cache.spi.access.EntityRegionAccessStrategy; import org.hibernate.cache.spi.access.SoftLock; -import org.hibernate.cache.infinispan.access.TransactionalAccessDelegate; /** * Transactional entity region access for Infinispan. diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java index 79e54e8cc7..bfc582bb9c 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java @@ -1,9 +1,11 @@ package org.hibernate.cache.infinispan.impl; + import javax.transaction.TransactionManager; + import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.cache.spi.GeneralDataRegion; import org.hibernate.cache.spi.RegionFactory; -import org.hibernate.cache.infinispan.util.CacheAdapter; /** * Support for Infinispan {@link GeneralDataRegion} implementors. diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java index e0c98e8019..7019c0008f 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java @@ -7,16 +7,17 @@ import java.util.concurrent.atomic.AtomicReference; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import org.hibernate.cache.CacheException; -import org.hibernate.cache.spi.Region; -import org.hibernate.cache.spi.RegionFactory; -import org.hibernate.cache.infinispan.util.AddressAdapter; -import org.hibernate.cache.infinispan.util.CacheAdapter; -import org.hibernate.cache.infinispan.util.FlagAdapter; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.util.AddressAdapter; +import org.hibernate.cache.infinispan.util.CacheAdapter; +import org.hibernate.cache.infinispan.util.FlagAdapter; +import org.hibernate.cache.spi.Region; +import org.hibernate.cache.spi.RegionFactory; + /** * Support for Infinispan {@link Region}s. Handles common "utility" methods for an underlying named * Cache. In other words, this implementation doesn't actually read or write data. Subclasses are diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java index 284482f539..1151e956e1 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java @@ -1,10 +1,11 @@ package org.hibernate.cache.infinispan.impl; import javax.transaction.TransactionManager; + +import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.cache.spi.CacheDataDescription; import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.spi.TransactionalDataRegion; -import org.hibernate.cache.infinispan.util.CacheAdapter; /** * Support for Inifinispan {@link org.hibernate.cache.spi.TransactionalDataRegion} implementors. diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/ClassLoaderAwareCache.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/ClassLoaderAwareCache.java index e080a2bc09..d80cd2d691 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/ClassLoaderAwareCache.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/ClassLoaderAwareCache.java @@ -1,4 +1,5 @@ package org.hibernate.cache.infinispan.impl; + import java.lang.annotation.Annotation; import java.lang.ref.WeakReference; import java.lang.reflect.InvocationTargetException; @@ -10,6 +11,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; + import org.infinispan.AbstractDelegatingAdvancedCache; import org.infinispan.AdvancedCache; import org.infinispan.commands.VisitableCommand; diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java index 8ec6e00c00..3b0d2b2c84 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java @@ -1,15 +1,17 @@ package org.hibernate.cache.infinispan.query; + import java.util.Properties; import javax.transaction.Transaction; import javax.transaction.TransactionManager; + +import org.infinispan.notifications.Listener; + import org.hibernate.cache.CacheException; -import org.hibernate.cache.spi.QueryResultsRegion; -import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.infinispan.impl.BaseTransactionalDataRegion; import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.cache.infinispan.util.FlagAdapter; - -import org.infinispan.notifications.Listener; +import org.hibernate.cache.spi.QueryResultsRegion; +import org.hibernate.cache.spi.RegionFactory; /** * @author Chris Bredesen diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampTypeOverrides.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampTypeOverrides.java index 13507a6c28..5b7db8dca4 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampTypeOverrides.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampTypeOverrides.java @@ -20,12 +20,14 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.hibernate.cache.infinispan.timestamp; -import org.hibernate.cache.CacheException; -import org.hibernate.cache.infinispan.TypeOverrides; + import org.infinispan.config.Configuration; import org.infinispan.config.Configuration.CacheMode; import org.infinispan.eviction.EvictionStrategy; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.TypeOverrides; + /** * TimestampTypeOverrides. * diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java index 147d9c0190..35c61d759d 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java @@ -5,18 +5,20 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import javax.transaction.Transaction; import javax.transaction.TransactionManager; -import org.hibernate.cache.CacheException; -import org.hibernate.cache.spi.RegionFactory; -import org.hibernate.cache.spi.TimestampsRegion; -import org.hibernate.cache.infinispan.impl.BaseGeneralDataRegion; -import org.hibernate.cache.infinispan.util.CacheAdapter; -import org.hibernate.cache.infinispan.util.FlagAdapter; + import org.infinispan.notifications.Listener; import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified; import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved; import org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent; import org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.impl.BaseGeneralDataRegion; +import org.hibernate.cache.infinispan.util.CacheAdapter; +import org.hibernate.cache.infinispan.util.FlagAdapter; +import org.hibernate.cache.spi.RegionFactory; +import org.hibernate.cache.spi.TimestampsRegion; + /** * Defines the behavior of the timestamps cache region for Infinispan. * diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java index 2728f70993..e852e20e88 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java @@ -23,6 +23,7 @@ package org.hibernate.cache.infinispan.tm; import java.util.Properties; import javax.transaction.TransactionManager; + import org.hibernate.cfg.Settings; import org.hibernate.service.jta.platform.spi.JtaPlatform; diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapterImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapterImpl.java index e46e25c0a3..03a36393c0 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapterImpl.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapterImpl.java @@ -21,12 +21,14 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.hibernate.cache.infinispan.util; + import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.ArrayList; import java.util.List; + import org.infinispan.remoting.transport.Address; /** diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapter.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapter.java index cdf208a799..3d9b0f2203 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapter.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapter.java @@ -21,16 +21,18 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.hibernate.cache.infinispan.util; + import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; -import org.hibernate.cache.CacheException; import org.infinispan.Cache; import org.infinispan.config.Configuration; import org.infinispan.util.concurrent.TimeoutException; +import org.hibernate.cache.CacheException; + /** * Infinispan cache abstraction. * diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapterImpl.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapterImpl.java index 7577ccce74..3bf08abae0 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapterImpl.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapterImpl.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; -import org.hibernate.cache.CacheException; import org.infinispan.AdvancedCache; import org.infinispan.Cache; import org.infinispan.config.Configuration; @@ -37,6 +36,8 @@ import org.infinispan.util.concurrent.TimeoutException; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; +import org.hibernate.cache.CacheException; + /** * CacheAdapterImpl. * diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandFactory.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandFactory.java index f40cf1cf7e..2eb0dfc6e1 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandFactory.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandFactory.java @@ -1,16 +1,16 @@ package org.hibernate.cache.infinispan.util; -import org.hibernate.cache.infinispan.InfinispanRegionFactory; -import org.hibernate.cache.infinispan.impl.BaseRegion; -import org.infinispan.commands.ReplicableCommand; -import org.infinispan.commands.module.ExtendedModuleCommandFactory; -import org.infinispan.commands.remote.CacheRpcCommand; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.infinispan.commands.ReplicableCommand; +import org.infinispan.commands.module.ExtendedModuleCommandFactory; +import org.infinispan.commands.remote.CacheRpcCommand; + +import org.hibernate.cache.infinispan.impl.BaseRegion; + /** * Command factory * diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java index d6fd0b2112..ff1f6bd80e 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cache.infinispan.util; -import java.util.concurrent.Callable; +import java.util.concurrent.Callable; import javax.transaction.Status; import javax.transaction.TransactionManager; diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/EvictAllCommand.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/EvictAllCommand.java index a45a5515f9..98bb888e8f 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/EvictAllCommand.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/EvictAllCommand.java @@ -1,9 +1,10 @@ package org.hibernate.cache.infinispan.util; -import org.hibernate.cache.infinispan.impl.BaseRegion; import org.infinispan.commands.remote.BaseRpcCommand; import org.infinispan.context.InvocationContext; +import org.hibernate.cache.infinispan.impl.BaseRegion; + /** * Evict all command * diff --git a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java index a839c0d869..77325dfc0d 100644 --- a/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java +++ b/hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java @@ -21,9 +21,11 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.hibernate.cache.infinispan.util; -import org.hibernate.cache.CacheException; + import org.infinispan.context.Flag; +import org.hibernate.cache.CacheException; + /** * FlagAdapter. * diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java index de59f80f92..6ee5e505d4 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractEntityCollectionRegionTestCase.java @@ -25,21 +25,18 @@ package org.hibernate.test.cache.infinispan; import java.util.Properties; +import org.junit.Test; + +import org.hibernate.cache.infinispan.InfinispanRegionFactory; import org.hibernate.cache.spi.CacheDataDescription; import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.spi.TransactionalDataRegion; import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.cache.infinispan.InfinispanRegionFactory; -import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; - -import org.junit.Test; - -import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.test.cache.infinispan.util.CacheTestUtil; +import org.hibernate.testing.ServiceRegistryBuilder; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java index 8af8d6f5e3..babe5f8e48 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java @@ -27,17 +27,15 @@ import java.util.Set; import org.infinispan.transaction.tm.BatchModeTransactionManager; import org.jboss.logging.Logger; +import org.junit.Test; +import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.cache.spi.GeneralDataRegion; import org.hibernate.cache.spi.QueryResultsRegion; import org.hibernate.cache.spi.Region; -import org.hibernate.cache.infinispan.InfinispanRegionFactory; -import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.cfg.Configuration; import org.hibernate.service.ServiceRegistryBuilder; - -import org.junit.Test; - import org.hibernate.test.cache.infinispan.util.CacheTestUtil; import static org.junit.Assert.assertEquals; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java index 9a4ffa85e4..2fadaa1e9b 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java @@ -27,12 +27,10 @@ import java.util.Set; import org.infinispan.Cache; import org.jboss.logging.Logger; - -import org.hibernate.cache.spi.RegionFactory; - import org.junit.After; import org.junit.Before; +import org.hibernate.cache.spi.RegionFactory; import org.hibernate.test.cache.infinispan.util.CacheTestSupport; /** diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionImplTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionImplTestCase.java index d7202c2ac2..27e4e393ea 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionImplTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractRegionImplTestCase.java @@ -22,13 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan; + import java.util.Properties; +import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.cache.internal.CacheDataDescriptionImpl; import org.hibernate.cache.spi.CacheDataDescription; import org.hibernate.cache.spi.Region; -import org.hibernate.cache.infinispan.InfinispanRegionFactory; -import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.internal.util.compare.ComparableComparator; /** diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java index 7c8c858933..f43be510b0 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/InfinispanRegionFactoryTestCase.java @@ -20,8 +20,17 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.hibernate.test.cache.infinispan; + import java.util.Properties; -import static org.junit.Assert.*; +import javax.transaction.TransactionManager; + +import org.infinispan.config.Configuration; +import org.infinispan.config.Configuration.CacheMode; +import org.infinispan.eviction.EvictionStrategy; +import org.infinispan.manager.DefaultCacheManager; +import org.infinispan.manager.EmbeddedCacheManager; +import org.junit.Test; + import org.hibernate.cache.CacheException; import org.hibernate.cache.infinispan.InfinispanRegionFactory; import org.hibernate.cache.infinispan.collection.CollectionRegionImpl; @@ -34,14 +43,13 @@ import org.hibernate.cfg.Settings; import org.hibernate.service.jta.platform.internal.AbstractJtaPlatform; import org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform; import org.hibernate.testing.ServiceRegistryBuilder; -import org.infinispan.config.Configuration; -import org.infinispan.config.Configuration.CacheMode; -import org.infinispan.eviction.EvictionStrategy; -import org.infinispan.manager.DefaultCacheManager; -import org.infinispan.manager.EmbeddedCacheManager; -import org.junit.Test; -import javax.transaction.TransactionManager; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * InfinispanRegionFactoryTestCase. diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/JndiInfinispanRegionFactoryTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/JndiInfinispanRegionFactoryTestCase.java index 89cbd8af19..92a9be421b 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/JndiInfinispanRegionFactoryTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/JndiInfinispanRegionFactoryTestCase.java @@ -1,5 +1,7 @@ package org.hibernate.test.cache.infinispan; + import java.util.Properties; + import org.junit.Test; import org.hibernate.cfg.SettingsFactory; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java index ec20d692ca..abeea66625 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/NodeEnvironment.java @@ -27,15 +27,14 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.Callable; -import org.hibernate.cache.spi.CacheDataDescription; import org.hibernate.cache.infinispan.InfinispanRegionFactory; import org.hibernate.cache.infinispan.collection.CollectionRegionImpl; import org.hibernate.cache.infinispan.entity.EntityRegionImpl; import org.hibernate.cache.infinispan.util.FlagAdapter; +import org.hibernate.cache.spi.CacheDataDescription; import org.hibernate.cfg.Configuration; import org.hibernate.service.ServiceRegistryBuilder; import org.hibernate.service.internal.StandardServiceRegistryImpl; - import org.hibernate.test.cache.infinispan.util.CacheTestUtil; import static org.hibernate.cache.infinispan.util.CacheHelper.withinTx; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/access/PutFromLoadValidatorUnitTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/access/PutFromLoadValidatorUnitTestCase.java index c0f243cd31..ccc83ab0ff 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/access/PutFromLoadValidatorUnitTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/access/PutFromLoadValidatorUnitTestCase.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan.access; + import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -39,10 +40,15 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.*; import org.hibernate.cache.infinispan.access.PutFromLoadValidator; import org.hibernate.test.cache.infinispan.functional.cluster.DualNodeJtaTransactionManagerImpl; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Tests of {@link PutFromLoadValidator}. * diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java index 70802b12f2..0cb00ede98 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java @@ -23,34 +23,32 @@ */ package org.hibernate.test.cache.infinispan.collection; -import javax.transaction.TransactionManager; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import javax.transaction.TransactionManager; -import org.hibernate.cache.infinispan.util.CacheHelper; +import junit.framework.AssertionFailedError; import org.infinispan.transaction.tm.BatchModeTransactionManager; import org.jboss.logging.Logger; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import org.hibernate.cache.internal.CacheDataDescriptionImpl; -import org.hibernate.cache.spi.CacheDataDescription; -import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy; import org.hibernate.cache.infinispan.InfinispanRegionFactory; import org.hibernate.cache.infinispan.access.PutFromLoadValidator; import org.hibernate.cache.infinispan.access.TransactionalAccessDelegate; import org.hibernate.cache.infinispan.collection.CollectionRegionImpl; +import org.hibernate.cache.infinispan.util.CacheHelper; +import org.hibernate.cache.internal.CacheDataDescriptionImpl; +import org.hibernate.cache.spi.CacheDataDescription; +import org.hibernate.cache.spi.access.AccessType; +import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy; import org.hibernate.cfg.Configuration; import org.hibernate.internal.util.compare.ComparableComparator; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import junit.framework.AssertionFailedError; - import org.hibernate.test.cache.infinispan.AbstractNonFunctionalTestCase; import org.hibernate.test.cache.infinispan.NodeEnvironment; import org.hibernate.test.cache.infinispan.util.CacheTestUtil; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/CollectionRegionImplTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/CollectionRegionImplTestCase.java index cb6b9b7e11..b47691d2ae 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/CollectionRegionImplTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/CollectionRegionImplTestCase.java @@ -22,18 +22,19 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan.collection; + import java.util.Properties; -import org.hibernate.cache.spi.CacheDataDescription; + import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.infinispan.util.CacheAdapter; +import org.hibernate.cache.infinispan.util.CacheAdapterImpl; +import org.hibernate.cache.spi.CacheDataDescription; import org.hibernate.cache.spi.CollectionRegion; import org.hibernate.cache.spi.Region; import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy; -import org.hibernate.cache.infinispan.InfinispanRegionFactory; -import org.hibernate.cache.infinispan.util.CacheAdapter; -import org.hibernate.cache.infinispan.util.CacheAdapterImpl; - import org.hibernate.test.cache.infinispan.AbstractEntityCollectionRegionTestCase; import static org.junit.Assert.assertNull; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/ReadOnlyExtraAPITestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/ReadOnlyExtraAPITestCase.java index a49057f88e..cf7d75b04f 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/ReadOnlyExtraAPITestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/ReadOnlyExtraAPITestCase.java @@ -20,10 +20,11 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.hibernate.test.cache.infinispan.collection; -import org.hibernate.cache.spi.access.AccessType; import org.junit.Test; +import org.hibernate.cache.spi.access.AccessType; + import static org.junit.Assert.fail; /** * ReadOnlyExtraAPITestCase. diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/TransactionalExtraAPITestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/TransactionalExtraAPITestCase.java index 47bb6c6612..ac9f2cbad5 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/TransactionalExtraAPITestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/TransactionalExtraAPITestCase.java @@ -21,16 +21,15 @@ */ package org.hibernate.test.cache.infinispan.collection; -import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy; -import org.hibernate.cache.spi.access.SoftLock; -import org.hibernate.cache.infinispan.InfinispanRegionFactory; -import org.hibernate.cfg.Configuration; - import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.spi.access.AccessType; +import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy; +import org.hibernate.cache.spi.access.SoftLock; +import org.hibernate.cfg.Configuration; import org.hibernate.test.cache.infinispan.AbstractNonFunctionalTestCase; import org.hibernate.test.cache.infinispan.NodeEnvironment; import org.hibernate.test.cache.infinispan.util.CacheTestUtil; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java index 73cdb78b98..1ea00949e5 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java @@ -23,33 +23,29 @@ */ package org.hibernate.test.cache.infinispan.entity; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hibernate.cache.infinispan.util.CacheHelper; +import junit.framework.AssertionFailedError; import org.infinispan.Cache; import org.infinispan.test.TestingUtil; import org.infinispan.transaction.tm.BatchModeTransactionManager; import org.jboss.logging.Logger; - -import org.hibernate.cache.spi.CacheDataDescription; -import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.cache.spi.access.EntityRegionAccessStrategy; -import org.hibernate.cache.internal.CacheDataDescriptionImpl; -import org.hibernate.cache.infinispan.InfinispanRegionFactory; -import org.hibernate.cache.infinispan.entity.EntityRegionImpl; -import org.hibernate.cfg.Configuration; -import org.hibernate.internal.util.compare.ComparableComparator; - import org.junit.After; import org.junit.Before; import org.junit.Test; -import junit.framework.AssertionFailedError; +import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.infinispan.entity.EntityRegionImpl; +import org.hibernate.cache.infinispan.util.CacheHelper; +import org.hibernate.cache.internal.CacheDataDescriptionImpl; +import org.hibernate.cache.spi.CacheDataDescription; +import org.hibernate.cache.spi.access.AccessType; +import org.hibernate.cache.spi.access.EntityRegionAccessStrategy; +import org.hibernate.cfg.Configuration; +import org.hibernate.internal.util.compare.ComparableComparator; import org.hibernate.test.cache.infinispan.AbstractNonFunctionalTestCase; import org.hibernate.test.cache.infinispan.NodeEnvironment; import org.hibernate.test.cache.infinispan.util.CacheTestUtil; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractReadOnlyAccessTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractReadOnlyAccessTestCase.java index 79e27895e1..25690bda4c 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractReadOnlyAccessTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractReadOnlyAccessTestCase.java @@ -24,11 +24,10 @@ package org.hibernate.test.cache.infinispan.entity; import org.infinispan.transaction.tm.BatchModeTransactionManager; +import org.junit.Test; import org.hibernate.cache.spi.access.AccessType; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractTransactionalAccessTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractTransactionalAccessTestCase.java index b53000b6bb..74b02a9ef5 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractTransactionalAccessTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractTransactionalAccessTestCase.java @@ -26,13 +26,12 @@ package org.hibernate.test.cache.infinispan.entity; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import junit.framework.AssertionFailedError; import org.infinispan.transaction.tm.BatchModeTransactionManager; import org.jboss.logging.Logger; import org.hibernate.cache.spi.access.AccessType; -import junit.framework.AssertionFailedError; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionImplTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionImplTestCase.java index 23bfbd1681..6df486c3de 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionImplTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/EntityRegionImplTestCase.java @@ -22,17 +22,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan.entity; + import java.util.Properties; -import org.hibernate.cache.spi.CacheDataDescription; + import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.infinispan.util.CacheAdapter; +import org.hibernate.cache.infinispan.util.CacheAdapterImpl; +import org.hibernate.cache.spi.CacheDataDescription; import org.hibernate.cache.spi.EntityRegion; import org.hibernate.cache.spi.Region; import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.cache.infinispan.InfinispanRegionFactory; -import org.hibernate.cache.infinispan.util.CacheAdapter; -import org.hibernate.cache.infinispan.util.CacheAdapterImpl; - import org.hibernate.test.cache.infinispan.AbstractEntityCollectionRegionTestCase; import static org.junit.Assert.assertNull; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/TransactionalExtraAPITestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/TransactionalExtraAPITestCase.java index 8e74868915..07fc66d27d 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/TransactionalExtraAPITestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/TransactionalExtraAPITestCase.java @@ -21,16 +21,15 @@ */ package org.hibernate.test.cache.infinispan.entity; -import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.cache.spi.access.EntityRegionAccessStrategy; -import org.hibernate.cache.spi.access.SoftLock; -import org.hibernate.cache.infinispan.InfinispanRegionFactory; -import org.hibernate.cfg.Configuration; - import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.spi.access.AccessType; +import org.hibernate.cache.spi.access.EntityRegionAccessStrategy; +import org.hibernate.cache.spi.access.SoftLock; +import org.hibernate.cfg.Configuration; import org.hibernate.test.cache.infinispan.AbstractNonFunctionalTestCase; import org.hibernate.test.cache.infinispan.NodeEnvironment; import org.hibernate.test.cache.infinispan.util.CacheTestUtil; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicReadOnlyTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicReadOnlyTestCase.java index abd4b0af88..fc48442163 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicReadOnlyTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicReadOnlyTestCase.java @@ -25,11 +25,11 @@ package org.hibernate.test.cache.infinispan.functional; import java.util.Map; +import org.junit.Test; + import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.stat.Statistics; -import org.junit.Test; - import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java index e4f6b60ae9..6ea0baf61c 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/BasicTransactionalTestCase.java @@ -28,6 +28,7 @@ import java.util.Map; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; +import org.junit.Test; import org.hibernate.Session; import org.hibernate.Transaction; @@ -36,8 +37,6 @@ import org.hibernate.cfg.Configuration; import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.stat.Statistics; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java index d4a1ed4190..2c92b77d6d 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/ConcurrentWriteTest.java @@ -23,7 +23,6 @@ */ package org.hibernate.test.cache.infinispan.functional; -import javax.transaction.TransactionManager; import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; @@ -37,21 +36,20 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import javax.transaction.TransactionManager; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; +import org.junit.Test; import org.hibernate.FlushMode; import org.hibernate.Session; -import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.jta.platform.spi.JtaPlatform; import org.hibernate.stat.SecondLevelCacheStatistics; - -import org.junit.Test; - import org.hibernate.test.cache.infinispan.functional.cluster.DualNodeConnectionProviderImpl; import org.hibernate.test.cache.infinispan.functional.cluster.DualNodeJtaPlatformImpl; import org.hibernate.test.cache.infinispan.functional.cluster.DualNodeJtaTransactionManagerImpl; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/JndiRegionFactoryTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/JndiRegionFactoryTestCase.java index ccf1eff8ba..a084fcf85d 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/JndiRegionFactoryTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/JndiRegionFactoryTestCase.java @@ -23,13 +23,13 @@ */ package org.hibernate.test.cache.infinispan.functional; +import java.util.Properties; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.Name; import javax.naming.NameNotFoundException; import javax.naming.Reference; import javax.naming.StringRefAddr; -import java.util.Properties; import org.infinispan.Cache; import org.infinispan.lifecycle.ComponentStatus; @@ -40,11 +40,12 @@ import org.infinispan.util.logging.LogFactory; import org.jboss.util.naming.NonSerializableFactory; import org.jnp.server.Main; import org.jnp.server.SingletonNamingServer; +import org.junit.Test; import org.hibernate.Session; -import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.infinispan.InfinispanRegionFactory; import org.hibernate.cache.infinispan.JndiInfinispanRegionFactory; +import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.cfg.Mappings; @@ -52,8 +53,6 @@ import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.stat.Statistics; -import org.junit.Test; - import static org.junit.Assert.assertEquals; /** diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java index f848d940c0..287f6d887f 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/SingleNodeTestCase.java @@ -28,9 +28,10 @@ import javax.transaction.TransactionManager; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; +import org.junit.Before; -import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; @@ -38,11 +39,8 @@ import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory; import org.hibernate.engine.transaction.spi.TransactionFactory; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.jta.platform.spi.JtaPlatform; - -import org.junit.Before; - -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.test.cache.infinispan.tm.JtaPlatformImpl; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; /** * @author Galder ZamarreƱo diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java index b9a87c7668..2a92e251a2 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/bulk/BulkOperationsTestCase.java @@ -21,16 +21,18 @@ */ package org.hibernate.test.cache.infinispan.functional.bulk; -import javax.transaction.Status; -import javax.transaction.TransactionManager; import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.transaction.Status; +import javax.transaction.TransactionManager; + +import org.junit.Test; import org.hibernate.FlushMode; import org.hibernate.Session; -import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; @@ -39,13 +41,10 @@ import org.hibernate.engine.transaction.spi.TransactionFactory; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.jta.platform.spi.JtaPlatform; import org.hibernate.stat.SecondLevelCacheStatistics; - -import org.junit.Test; - -import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.test.cache.infinispan.functional.Contact; import org.hibernate.test.cache.infinispan.functional.Customer; import org.hibernate.test.cache.infinispan.tm.JtaPlatformImpl; +import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/ClassLoaderTestDAO.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/ClassLoaderTestDAO.java index 587a34246d..1c125aad55 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/ClassLoaderTestDAO.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/ClassLoaderTestDAO.java @@ -19,16 +19,19 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.hibernate.test.cache.infinispan.functional.classloader; +package org.hibernate.test.cache.infinispan.functional.classloader; + import java.lang.reflect.Method; import java.util.Iterator; import java.util.List; import javax.transaction.TransactionManager; + +import org.infinispan.util.logging.Log; +import org.infinispan.util.logging.LogFactory; + import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.infinispan.util.logging.Log; -import org.infinispan.util.logging.LogFactory; /** * Comment diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedCacheTestSetup.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedCacheTestSetup.java index adac302a66..5ab50b0845 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedCacheTestSetup.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedCacheTestSetup.java @@ -15,7 +15,9 @@ */ package org.hibernate.test.cache.infinispan.functional.classloader; + import junit.framework.Test; + import org.hibernate.test.cache.infinispan.functional.cluster.ClusterAwareRegionFactory; import org.hibernate.test.cache.infinispan.functional.cluster.DualNodeJtaTransactionManagerImpl; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java index 9ab641790a..bc626ad2f9 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java @@ -29,24 +29,22 @@ import org.infinispan.Cache; import org.infinispan.manager.CacheContainer; import org.infinispan.manager.EmbeddedCacheManager; import org.jboss.logging.Logger; - -import org.hibernate.SessionFactory; -import org.hibernate.cache.internal.StandardQueryCache; -import org.hibernate.cache.infinispan.InfinispanRegionFactory; -import org.hibernate.cfg.Configuration; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.hibernate.SessionFactory; +import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.internal.StandardQueryCache; +import org.hibernate.cfg.Configuration; import org.hibernate.test.cache.infinispan.functional.cluster.ClusterAwareRegionFactory; import org.hibernate.test.cache.infinispan.functional.cluster.DualNodeJtaTransactionManagerImpl; import org.hibernate.test.cache.infinispan.functional.cluster.DualNodeTestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * Tests entity and query caching when class of objects being cached are not visible to Infinispan's classloader. Also serves as a * general integration test. diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java index d6842295a7..4d59a1f4a6 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/ClusterAwareRegionFactory.java @@ -20,10 +20,17 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.hibernate.test.cache.infinispan.functional.cluster; + import java.util.Hashtable; import java.util.Properties; -import org.hibernate.cache.spi.CacheDataDescription; + +import org.infinispan.manager.EmbeddedCacheManager; +import org.infinispan.util.logging.Log; +import org.infinispan.util.logging.LogFactory; + import org.hibernate.cache.CacheException; +import org.hibernate.cache.infinispan.InfinispanRegionFactory; +import org.hibernate.cache.spi.CacheDataDescription; import org.hibernate.cache.spi.CollectionRegion; import org.hibernate.cache.spi.EntityRegion; import org.hibernate.cache.spi.NaturalIdRegion; @@ -31,11 +38,7 @@ import org.hibernate.cache.spi.QueryResultsRegion; import org.hibernate.cache.spi.RegionFactory; import org.hibernate.cache.spi.TimestampsRegion; import org.hibernate.cache.spi.access.AccessType; -import org.hibernate.cache.infinispan.InfinispanRegionFactory; import org.hibernate.cfg.Settings; -import org.infinispan.manager.EmbeddedCacheManager; -import org.infinispan.util.logging.Log; -import org.infinispan.util.logging.LogFactory; /** * ClusterAwareRegionFactory. diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java index 182c1913b0..53afc9aa93 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeConnectionProviderImpl.java @@ -22,16 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan.functional.cluster; + import java.sql.Connection; import java.sql.SQLException; import java.util.Map; import org.hibernate.HibernateException; +import org.hibernate.service.UnknownUnwrapTypeException; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.Configurable; import org.hibernate.service.spi.Stoppable; -import org.hibernate.service.UnknownUnwrapTypeException; - import org.hibernate.testing.env.ConnectionProviderBuilder; /** diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaPlatformImpl.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaPlatformImpl.java index b376ef8148..80fe23837e 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaPlatformImpl.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaPlatformImpl.java @@ -23,18 +23,18 @@ */ package org.hibernate.test.cache.infinispan.functional.cluster; -import org.hibernate.HibernateException; -import org.hibernate.TransactionException; -import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; -import org.hibernate.service.jta.platform.spi.JtaPlatform; -import org.hibernate.service.spi.Configurable; - +import java.util.Map; import javax.transaction.Synchronization; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; -import java.util.Map; + +import org.hibernate.HibernateException; +import org.hibernate.TransactionException; +import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; +import org.hibernate.service.jta.platform.spi.JtaPlatform; +import org.hibernate.service.spi.Configurable; /** * @author Steve Ebersole diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionImpl.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionImpl.java index 8476107948..c02101263a 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionImpl.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionImpl.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan.functional.cluster; + import java.sql.Connection; import java.sql.SQLException; import java.util.ArrayList; @@ -39,6 +40,7 @@ import javax.transaction.Transaction; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; + import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionManagerImpl.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionManagerImpl.java index 475307289b..f6a7e9b7a7 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionManagerImpl.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeJtaTransactionManagerImpl.java @@ -33,6 +33,7 @@ import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; + import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java index e7e302681a..4735d0693a 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTestCase.java @@ -25,6 +25,8 @@ package org.hibernate.test.cache.infinispan.functional.cluster; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; +import org.junit.After; +import org.junit.Before; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; @@ -32,10 +34,6 @@ import org.hibernate.cfg.Environment; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.transaction.internal.jta.CMTTransactionFactory; import org.hibernate.service.internal.StandardServiceRegistryImpl; - -import org.junit.After; -import org.junit.Before; - import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; /** diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTransactionManagerLookup.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTransactionManagerLookup.java index d755132ecb..6a8ed79294 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTransactionManagerLookup.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/DualNodeTransactionManagerLookup.java @@ -22,9 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan.functional.cluster; + import java.util.Properties; import javax.transaction.Transaction; import javax.transaction.TransactionManager; + import org.hibernate.HibernateException; import org.hibernate.transaction.TransactionManagerLookup; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java index 12f6b339a8..d99cce34f0 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/EntityCollectionInvalidationTestCase.java @@ -23,10 +23,10 @@ */ package org.hibernate.test.cache.infinispan.functional.cluster; -import javax.transaction.TransactionManager; import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import javax.transaction.TransactionManager; import org.infinispan.Cache; import org.infinispan.manager.CacheContainer; @@ -36,13 +36,11 @@ import org.infinispan.notifications.cachelistener.event.CacheEntryVisitedEvent; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; import org.jboss.util.collection.ConcurrentSet; +import org.junit.Test; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cache.spi.CacheKey; - -import org.junit.Test; - import org.hibernate.test.cache.infinispan.functional.Contact; import org.hibernate.test.cache.infinispan.functional.Customer; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/SessionRefreshTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/SessionRefreshTestCase.java index bec9d927ae..a6f7be8759 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/SessionRefreshTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/SessionRefreshTestCase.java @@ -29,14 +29,12 @@ import org.infinispan.Cache; import org.infinispan.manager.CacheContainer; import org.infinispan.test.TestingUtil; import org.jboss.logging.Logger; +import org.junit.Test; import org.hibernate.SessionFactory; import org.hibernate.cache.infinispan.InfinispanRegionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; - -import org.junit.Test; - import org.hibernate.test.cache.infinispan.functional.classloader.Account; import org.hibernate.test.cache.infinispan.functional.classloader.ClassLoaderTestDAO; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java index 15150e5ab5..7d52f2df21 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java @@ -28,8 +28,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hibernate.cache.infinispan.util.CacheHelper; -import org.hibernate.cache.spi.GeneralDataRegion; +import junit.framework.AssertionFailedError; import org.infinispan.notifications.Listener; import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited; import org.infinispan.notifications.cachelistener.event.CacheEntryVisitedEvent; @@ -37,18 +36,17 @@ import org.infinispan.transaction.tm.BatchModeTransactionManager; import org.infinispan.util.concurrent.IsolationLevel; import org.jboss.logging.Logger; -import org.hibernate.cache.spi.CacheDataDescription; -import org.hibernate.cache.spi.QueryResultsRegion; -import org.hibernate.cache.spi.Region; -import org.hibernate.cache.internal.StandardQueryCache; import org.hibernate.cache.infinispan.InfinispanRegionFactory; import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.cache.infinispan.util.CacheAdapterImpl; +import org.hibernate.cache.infinispan.util.CacheHelper; +import org.hibernate.cache.internal.StandardQueryCache; +import org.hibernate.cache.spi.CacheDataDescription; +import org.hibernate.cache.spi.GeneralDataRegion; +import org.hibernate.cache.spi.QueryResultsRegion; +import org.hibernate.cache.spi.Region; import org.hibernate.cfg.Configuration; import org.hibernate.service.ServiceRegistryBuilder; - -import junit.framework.AssertionFailedError; - import org.hibernate.test.cache.infinispan.AbstractGeneralDataRegionTestCase; import org.hibernate.test.cache.infinispan.util.CacheTestUtil; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java index 149d40e66d..b0dffd9576 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/timestamp/TimestampsRegionImplTestCase.java @@ -38,18 +38,17 @@ import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved; import org.infinispan.notifications.cachelistener.annotation.CacheEntryVisited; import org.infinispan.notifications.cachelistener.event.Event; -import org.hibernate.cache.spi.CacheDataDescription; -import org.hibernate.cache.spi.Region; -import org.hibernate.cache.spi.UpdateTimestampsCache; import org.hibernate.cache.infinispan.InfinispanRegionFactory; import org.hibernate.cache.infinispan.impl.ClassLoaderAwareCache; import org.hibernate.cache.infinispan.timestamp.TimestampsRegionImpl; import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.cache.infinispan.util.CacheAdapterImpl; import org.hibernate.cache.infinispan.util.FlagAdapter; +import org.hibernate.cache.spi.CacheDataDescription; +import org.hibernate.cache.spi.Region; +import org.hibernate.cache.spi.UpdateTimestampsCache; import org.hibernate.cfg.Configuration; import org.hibernate.service.ServiceRegistryBuilder; - import org.hibernate.test.cache.infinispan.AbstractGeneralDataRegionTestCase; import org.hibernate.test.cache.infinispan.functional.classloader.Account; import org.hibernate.test.cache.infinispan.functional.classloader.AccountHolder; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java index f1b3ed503c..bc6b699a1e 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java @@ -36,8 +36,19 @@ import javax.naming.StringRefAddr; import javax.transaction.Status; import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; -import static org.junit.Assert.*; + import org.enhydra.jdbc.standard.StandardXADataSource; +import org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup; +import org.infinispan.util.logging.Log; +import org.infinispan.util.logging.LogFactory; +import org.jboss.util.naming.NonSerializableFactory; +import org.jnp.interfaces.NamingContext; +import org.jnp.server.Main; +import org.jnp.server.NamingServer; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; @@ -50,16 +61,9 @@ import org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform; import org.hibernate.stat.Statistics; import org.hibernate.test.cache.infinispan.functional.Item; import org.hibernate.testing.ServiceRegistryBuilder; -import org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup; -import org.infinispan.util.logging.Log; -import org.infinispan.util.logging.LogFactory; -import org.jboss.util.naming.NonSerializableFactory; -import org.jnp.interfaces.NamingContext; -import org.jnp.server.Main; -import org.jnp.server.NamingServer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; /** * This is an example test based on http://community.jboss.org/docs/DOC-14617 that shows how to interact with diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JtaPlatformImpl.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JtaPlatformImpl.java index 58f31fbb00..95db052882 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JtaPlatformImpl.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JtaPlatformImpl.java @@ -28,6 +28,7 @@ import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; + import org.hibernate.TransactionException; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.service.jta.platform.spi.JtaPlatform; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java index 0e4e008ad9..e0ec86a820 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaConnectionProvider.java @@ -20,14 +20,15 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.hibernate.test.cache.infinispan.tm; + import java.sql.Connection; import java.sql.SQLException; import java.util.Properties; + import org.hibernate.HibernateException; import org.hibernate.service.UnknownUnwrapTypeException; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.Stoppable; - import org.hibernate.testing.env.ConnectionProviderBuilder; /** diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionImpl.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionImpl.java index b098f6e0c1..595911076b 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionImpl.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/XaTransactionImpl.java @@ -20,6 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.hibernate.test.cache.infinispan.tm; + import java.sql.Connection; import java.sql.SQLException; import java.util.ArrayList; @@ -37,6 +38,7 @@ import javax.transaction.Transaction; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; + import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeJtaPlatform.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeJtaPlatform.java index a5daab66c8..6d6f75d17d 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeJtaPlatform.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeJtaPlatform.java @@ -23,6 +23,12 @@ */ package org.hibernate.test.cache.infinispan.util; +import javax.transaction.Synchronization; +import javax.transaction.SystemException; +import javax.transaction.Transaction; +import javax.transaction.TransactionManager; +import javax.transaction.UserTransaction; + import org.infinispan.transaction.tm.BatchModeTransactionManager; import org.hibernate.HibernateException; @@ -30,12 +36,6 @@ import org.hibernate.TransactionException; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.service.jta.platform.spi.JtaPlatform; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; - /** * @author Steve Ebersole */ diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionManagerLookup.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionManagerLookup.java index ec36d3a4d2..bf2f29625a 100755 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionManagerLookup.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/BatchModeTransactionManagerLookup.java @@ -22,12 +22,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan.util; + import java.util.Properties; import javax.transaction.Transaction; import javax.transaction.TransactionManager; + +import org.infinispan.transaction.tm.BatchModeTransactionManager; + import org.hibernate.HibernateException; import org.hibernate.transaction.TransactionManagerLookup; -import org.infinispan.transaction.tm.BatchModeTransactionManager; /** * Uses the JBoss Cache BatchModeTransactionManager. Should not be used in diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java index f6095c623b..5a3673dbee 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestUtil.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan.util; + import java.util.Enumeration; import java.util.HashSet; import java.util.Properties; @@ -30,13 +31,13 @@ import java.util.Set; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; + import org.hibernate.cache.infinispan.InfinispanRegionFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.cfg.Settings; import org.hibernate.service.ServiceRegistry; -import org.hibernate.service.classloading.internal.ClassLoaderServiceImpl; /** * Utilities for cache testing. diff --git a/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java b/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java index 68ba259e96..116116b5fc 100644 --- a/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java +++ b/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java @@ -27,19 +27,21 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.util.Properties; -import org.hibernate.HibernateException; -import org.hibernate.cfg.Environment; -import org.hibernate.internal.util.ConfigHelper; -import org.hibernate.internal.util.StringHelper; -import org.hibernate.internal.util.config.ConfigurationHelper; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.service.UnknownUnwrapTypeException; + import org.jboss.logging.Logger; import org.logicalcobwebs.proxool.ProxoolException; import org.logicalcobwebs.proxool.ProxoolFacade; import org.logicalcobwebs.proxool.configuration.JAXPConfigurator; import org.logicalcobwebs.proxool.configuration.PropertyConfigurator; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Environment; +import org.hibernate.internal.util.ConfigHelper; +import org.hibernate.internal.util.StringHelper; +import org.hibernate.internal.util.config.ConfigurationHelper; +import org.hibernate.service.UnknownUnwrapTypeException; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; + /** * A connection provider that uses a Proxool connection pool. Hibernate will use this by * default if the hibernate.proxool.* properties are set. diff --git a/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolMessageLogger.java b/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolMessageLogger.java index 561e8dbe70..2ff08badb7 100644 --- a/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolMessageLogger.java +++ b/hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolMessageLogger.java @@ -23,14 +23,14 @@ */ package org.hibernate.service.jdbc.connections.internal; -import static org.jboss.logging.Logger.Level.INFO; - -import org.hibernate.internal.CoreMessageLogger; - import org.jboss.logging.LogMessage; import org.jboss.logging.Message; import org.jboss.logging.MessageLogger; +import org.hibernate.internal.CoreMessageLogger; + +import static org.jboss.logging.Logger.Level.INFO; + /** * The jboss-logging {@link MessageLogger} for the hibernate-proxool module. It reserves message ids ranging from * 30001 to 35000 inclusively. diff --git a/hibernate-proxool/src/test/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProviderTest.java b/hibernate-proxool/src/test/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProviderTest.java index 6d7ab8db78..7eaf2a57c3 100644 --- a/hibernate-proxool/src/test/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProviderTest.java +++ b/hibernate-proxool/src/test/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProviderTest.java @@ -27,12 +27,10 @@ import java.util.Arrays; import java.util.List; import java.util.Properties; +import org.junit.Test; import org.logicalcobwebs.proxool.ProxoolFacade; import org.hibernate.cfg.Environment; - -import org.junit.Test; - import org.hibernate.testing.junit4.BaseUnitTestCase; import static org.junit.Assert.assertEquals; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java index 760d30f475..3371491ee9 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java @@ -27,6 +27,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import org.hibernate.dialect.Dialect; /** diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseEntityRegionAccessStrategy.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseEntityRegionAccessStrategy.java index 80d47c7f9d..78834f9c3d 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseEntityRegionAccessStrategy.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseEntityRegionAccessStrategy.java @@ -27,7 +27,6 @@ import org.jboss.logging.Logger; import org.hibernate.cache.CacheException; import org.hibernate.cache.spi.EntityRegion; -import org.hibernate.cache.spi.GeneralDataRegion; import org.hibernate.cache.spi.access.EntityRegionAccessStrategy; import org.hibernate.cache.spi.access.SoftLock; import org.hibernate.internal.CoreMessageLogger; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseGeneralDataRegion.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseGeneralDataRegion.java index 8b611dca8a..da4bf4f310 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseGeneralDataRegion.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseGeneralDataRegion.java @@ -23,9 +23,6 @@ */ package org.hibernate.testing.cache; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - import org.jboss.logging.Logger; import org.hibernate.cache.CacheException; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseRegionAccessStrategy.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseRegionAccessStrategy.java index 9888944f74..ee3f007819 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseRegionAccessStrategy.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseRegionAccessStrategy.java @@ -26,7 +26,6 @@ package org.hibernate.testing.cache; import org.jboss.logging.Logger; import org.hibernate.cache.CacheException; -import org.hibernate.cache.spi.GeneralDataRegion; import org.hibernate.cache.spi.access.RegionAccessStrategy; import org.hibernate.cache.spi.access.SoftLock; import org.hibernate.internal.CoreMessageLogger; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/NaturalIdRegionImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/NaturalIdRegionImpl.java index 570f83a0c4..403b16bb20 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/NaturalIdRegionImpl.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/NaturalIdRegionImpl.java @@ -23,6 +23,8 @@ */ package org.hibernate.testing.cache; +import org.jboss.logging.Logger; + import org.hibernate.cache.CacheException; import org.hibernate.cache.spi.CacheDataDescription; import org.hibernate.cache.spi.NaturalIdRegion; @@ -30,7 +32,6 @@ import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy; import org.hibernate.cfg.Settings; import org.hibernate.internal.CoreMessageLogger; -import org.jboss.logging.Logger; /** * @author Eric Dalquist diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteCollectionRegionAccessStrategy.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteCollectionRegionAccessStrategy.java index 8f74b6ba59..bcafce7f34 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteCollectionRegionAccessStrategy.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteCollectionRegionAccessStrategy.java @@ -23,11 +23,8 @@ */ package org.hibernate.testing.cache; -import org.jboss.logging.Logger; - import org.hibernate.cache.CacheException; import org.hibernate.cache.spi.access.SoftLock; -import org.hibernate.internal.CoreMessageLogger; /** * @author Strong Liu diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteEntityRegionAccessStrategy.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteEntityRegionAccessStrategy.java index 1238a8a1dd..f54c7f7104 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteEntityRegionAccessStrategy.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteEntityRegionAccessStrategy.java @@ -23,11 +23,8 @@ */ package org.hibernate.testing.cache; -import org.jboss.logging.Logger; - import org.hibernate.cache.CacheException; import org.hibernate.cache.spi.access.SoftLock; -import org.hibernate.internal.CoreMessageLogger; /** * @author Strong Liu diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/TransactionalCollectionRegionAccessStrategy.java b/hibernate-testing/src/main/java/org/hibernate/testing/cache/TransactionalCollectionRegionAccessStrategy.java index 2493adc132..31c4b538d0 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/TransactionalCollectionRegionAccessStrategy.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/cache/TransactionalCollectionRegionAccessStrategy.java @@ -1,8 +1,6 @@ package org.hibernate.testing.cache; import org.hibernate.cache.CacheException; -import org.hibernate.cache.spi.CollectionRegion; -import org.hibernate.cache.spi.access.SoftLock; /** * @author Strong Liu diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaBootstrap.java b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaBootstrap.java index bf6f69fa90..143bef2c98 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaBootstrap.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaBootstrap.java @@ -23,12 +23,12 @@ */ package org.hibernate.testing.jta; -import javax.sql.DataSource; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; import java.sql.SQLException; import java.util.Map; import java.util.Properties; +import javax.sql.DataSource; +import javax.transaction.TransactionManager; +import javax.transaction.UserTransaction; import com.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean; import com.arjuna.ats.internal.arjuna.objectstore.VolatileStore; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java index ac2de4b2d6..51a6e5b155 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java @@ -23,27 +23,23 @@ */ package org.hibernate.testing.junit4; -import static org.junit.Assert.fail; - import java.io.InputStream; import java.sql.Blob; import java.sql.Clob; import java.sql.Connection; import java.sql.SQLException; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.Set; -import org.hibernate.Criteria; +import org.junit.After; +import org.junit.Before; + import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.Session; -import org.hibernate.Transaction; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; @@ -51,7 +47,6 @@ import org.hibernate.cfg.Mappings; import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.exception.ConstraintViolationException; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.jdbc.AbstractReturningWork; import org.hibernate.jdbc.Work; @@ -59,7 +54,6 @@ import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.SimpleValue; -import org.hibernate.metadata.ClassMetadata; import org.hibernate.metamodel.MetadataSources; import org.hibernate.metamodel.source.MetadataImplementor; import org.hibernate.service.BootstrapServiceRegistry; @@ -74,8 +68,8 @@ import org.hibernate.testing.OnExpectedFailure; import org.hibernate.testing.OnFailure; import org.hibernate.testing.SkipLog; import org.hibernate.testing.cache.CachingRegionFactory; -import org.junit.After; -import org.junit.Before; + +import static org.junit.Assert.fail; /** * Applies functional testing logic for core Hibernate testing on top of {@link BaseUnitTestCase} diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java index 1f4dc27fc1..38c5d1edb2 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java @@ -25,13 +25,11 @@ package org.hibernate.testing.junit4; import javax.transaction.SystemException; -import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; - +import org.jboss.logging.Logger; import org.junit.After; import org.junit.runner.RunWith; -import org.jboss.logging.Logger; - +import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.testing.jta.TestingJtaBootstrap; /** diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java index 8eabcbdd81..201247b49c 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java @@ -30,6 +30,12 @@ import java.util.Comparator; import java.util.List; import org.jboss.logging.Logger; +import org.junit.Ignore; +import org.junit.runner.manipulation.NoTestsRemainException; +import org.junit.runners.BlockJUnit4ClassRunner; +import org.junit.runners.model.FrameworkMethod; +import org.junit.runners.model.InitializationError; +import org.junit.runners.model.Statement; import org.hibernate.dialect.Dialect; import org.hibernate.internal.util.StringHelper; @@ -40,12 +46,6 @@ import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.RequiresDialectFeature; import org.hibernate.testing.Skip; import org.hibernate.testing.SkipForDialect; -import org.junit.Ignore; -import org.junit.runner.manipulation.NoTestsRemainException; -import org.junit.runners.BlockJUnit4ClassRunner; -import org.junit.runners.model.FrameworkMethod; -import org.junit.runners.model.InitializationError; -import org.junit.runners.model.Statement; /** * The Hibernate-specific {@link org.junit.runner.Runner} implementation which layers {@link ExtendedFrameworkMethod} diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/FailureExpectedHandler.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/FailureExpectedHandler.java index 9e59221e0e..6dbb878e48 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/FailureExpectedHandler.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/FailureExpectedHandler.java @@ -24,7 +24,6 @@ package org.hibernate.testing.junit4; import org.jboss.logging.Logger; - import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.Statement; diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/Helper.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/Helper.java index bcd0975166..151adff618 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/Helper.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/Helper.java @@ -23,14 +23,14 @@ */ package org.hibernate.testing.junit4; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; + import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.TestClass; import org.hibernate.testing.FailureExpected; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; - /** * Centralized utility functionality * diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/TestClassMetadata.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/TestClassMetadata.java index a03d9b586f..b93ce3f1aa 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/TestClassMetadata.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/TestClassMetadata.java @@ -23,17 +23,17 @@ */ package org.hibernate.testing.junit4; -import org.hibernate.testing.AfterClassOnce; -import org.hibernate.testing.BeforeClassOnce; -import org.hibernate.testing.OnExpectedFailure; -import org.hibernate.testing.OnFailure; - import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedHashSet; import java.util.List; +import org.hibernate.testing.AfterClassOnce; +import org.hibernate.testing.BeforeClassOnce; +import org.hibernate.testing.OnExpectedFailure; +import org.hibernate.testing.OnFailure; + /** * Metadata about various types of callback methods on a given test class. *