diff --git a/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java b/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java index 54123debc2..a8db252d51 100644 --- a/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java +++ b/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java @@ -9,8 +9,6 @@ package org.hibernate; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; -import org.jboss.logging.Logger; - /** * Indicates failure of an assertion: a possible bug in Hibernate. * diff --git a/hibernate-core/src/main/java/org/hibernate/Interceptor.java b/hibernate-core/src/main/java/org/hibernate/Interceptor.java index 0ed8cba5d0..7f623a60a7 100644 --- a/hibernate-core/src/main/java/org/hibernate/Interceptor.java +++ b/hibernate-core/src/main/java/org/hibernate/Interceptor.java @@ -9,7 +9,6 @@ package org.hibernate; import java.io.Serializable; import java.util.Iterator; -import org.hibernate.metamodel.RepresentationMode; import org.hibernate.metamodel.spi.EntityRepresentationStrategy; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java b/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java index e021396d64..22d133d6d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java +++ b/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java @@ -7,7 +7,6 @@ package org.hibernate; import org.hibernate.boot.jaxb.Origin; -import org.hibernate.internal.util.xml.XmlDocument; /** * Thrown when a mapping is found to be invalid. diff --git a/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java b/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java index 21fc107209..a10dcf69eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java +++ b/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java @@ -6,8 +6,6 @@ */ package org.hibernate; -import java.io.Serializable; - import org.hibernate.pretty.MessageHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java b/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java index 0c2e134257..3157249351 100644 --- a/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java +++ b/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java @@ -6,8 +6,6 @@ */ package org.hibernate; -import java.io.Serializable; - import org.hibernate.pretty.MessageHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/WrongClassException.java b/hibernate-core/src/main/java/org/hibernate/WrongClassException.java index b175df0260..f67effe20b 100644 --- a/hibernate-core/src/main/java/org/hibernate/WrongClassException.java +++ b/hibernate-core/src/main/java/org/hibernate/WrongClassException.java @@ -6,8 +6,6 @@ */ package org.hibernate; -import java.io.Serializable; - /** * Thrown when loading an entity (by identifier) results in a value that cannot be treated as the subclass * type requested by the caller. diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java index 568904bd84..bbbea047f8 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java @@ -6,8 +6,6 @@ */ package org.hibernate.action.internal; -import java.io.Serializable; - import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.cache.CacheException; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java index bee72f212b..943cdebeda 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ListIndexBase.java @@ -7,7 +7,6 @@ package org.hibernate.annotations; import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java b/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java index f48fe30592..c84e41ce33 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/QueryHints.java @@ -6,7 +6,6 @@ */ package org.hibernate.annotations; -import org.hibernate.FlushMode; import org.hibernate.graph.GraphSemantic; /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java b/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java index 953b10a5a3..6803f79401 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/SchemaAutoTooling.java @@ -8,7 +8,6 @@ package org.hibernate.boot; import org.hibernate.HibernateException; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.internal.util.StringHelper; /** * Defines the possible values for "hbm2ddl_auto" diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedHqlQueryDefinitionImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedHqlQueryDefinitionImpl.java index 3f28a6a873..e2a8983697 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedHqlQueryDefinitionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/NamedHqlQueryDefinitionImpl.java @@ -6,7 +6,6 @@ */ package org.hibernate.boot.internal; -import java.util.HashMap; import java.util.Map; import org.hibernate.CacheMode; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java index cd0c3e8d82..8bb5d7c7c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java @@ -7,7 +7,6 @@ package org.hibernate.boot.jaxb.internal.stax; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexColumnNameSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexColumnNameSource.java index 7a1d17352f..7b0bc4b476 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexColumnNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitIndexColumnNameSource.java @@ -7,7 +7,6 @@ package org.hibernate.boot.model.naming; import org.hibernate.boot.model.source.spi.AttributePath; -import org.hibernate.boot.spi.MetadataBuildingContext; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java index e934164d5e..0cd24dc819 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyLegacyJpaImpl.java @@ -6,8 +6,6 @@ */ package org.hibernate.boot.model.naming; -import org.hibernate.dialect.Dialect; - /** * Implementation of the ImplicitNamingStrategy contract which conforms to the * naming rules initially implemented by Hibernate for JPA 1.0, prior to many diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingHelper.java index 4b83b2c6ba..29b27b2075 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/naming/NamingHelper.java @@ -8,7 +8,6 @@ package org.hibernate.boot.model.naming; import java.io.UnsupportedEncodingException; import java.math.BigInteger; -import java.nio.charset.Charset; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/ManagedResources.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/ManagedResources.java index 4f96636d91..e942858691 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/ManagedResources.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/ManagedResources.java @@ -8,12 +8,9 @@ package org.hibernate.boot.model.process.spi; import java.util.Collection; import java.util.Map; -import java.util.Set; -import org.hibernate.boot.AttributeConverterInfo; import org.hibernate.boot.jaxb.spi.Binding; import org.hibernate.boot.model.convert.spi.ConverterDescriptor; -import org.hibernate.cfg.AttributeConverterDefinition; /** * Represents the result of the first step of the process of building {@link org.hibernate.boot.MetadataSources} diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CommaSeparatedStringHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CommaSeparatedStringHelper.java index 77887dc262..708f35f7f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CommaSeparatedStringHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/CommaSeparatedStringHelper.java @@ -6,7 +6,6 @@ */ package org.hibernate.boot.model.source.internal.hbm; -import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntitySource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntitySource.java index e14c031ee7..ef696415d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntitySource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/EntitySource.java @@ -6,7 +6,6 @@ */ package org.hibernate.boot.model.source.spi; -import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java index 454cca4e2b..5d7d069e11 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractNamedQueryDefinition.java @@ -7,9 +7,7 @@ package org.hibernate.boot.spi; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java index 08b7c33cc2..ccc400bfce 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/MetadataBuildingContext.java @@ -6,7 +6,6 @@ */ package org.hibernate.boot.spi; -import org.hibernate.boot.model.TypeDefinition; import org.hibernate.boot.model.TypeDefinitionRegistry; import org.hibernate.boot.model.naming.ObjectNameNormalizer; import org.hibernate.internal.util.config.ConfigurationHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java b/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java index 7b312d1111..d4a365da92 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java @@ -9,8 +9,6 @@ package org.hibernate.boot.xsd; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.Arrays; -import java.util.List; import javax.xml.XMLConstants; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java index 082e73adc4..91d5454ac7 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/ByteBuddyEnhancementContext.java @@ -6,16 +6,12 @@ */ package org.hibernate.bytecode.enhance.internal.bytebuddy; -import static net.bytebuddy.matcher.ElementMatchers.isGetter; - -import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.stream.Collectors; -import org.hibernate.MappingException; import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl.AnnotatedFieldDescription; import org.hibernate.bytecode.enhance.spi.EnhancementContext; @@ -25,6 +21,8 @@ import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.dynamic.scaffold.MethodGraph; import net.bytebuddy.matcher.ElementMatcher; +import static net.bytebuddy.matcher.ElementMatchers.isGetter; + class ByteBuddyEnhancementContext { private static final ElementMatcher.Junction IS_GETTER = isGetter(); diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/javassist/MappedSuperclassEnhancer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/javassist/MappedSuperclassEnhancer.java index fd77951792..4aadcbf5c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/javassist/MappedSuperclassEnhancer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/javassist/MappedSuperclassEnhancer.java @@ -10,7 +10,6 @@ import javassist.CtClass; import javassist.CtField; import javassist.CtMethod; -import org.hibernate.bytecode.enhance.spi.EnhancementContext; import org.hibernate.bytecode.enhance.spi.EnhancerConstants; import org.hibernate.engine.spi.ManagedMappedSuperclass; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/javassist/PersistentAttributesHelper.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/javassist/PersistentAttributesHelper.java index 26e113c0f1..2608196867 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/javassist/PersistentAttributesHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/javassist/PersistentAttributesHelper.java @@ -25,7 +25,6 @@ import javassist.NotFoundException; import javassist.bytecode.BadBytecode; import javassist.bytecode.SignatureAttribute; -import org.hibernate.bytecode.enhance.spi.EnhancementContext; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/NoopCollectionTracker.java b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/NoopCollectionTracker.java index 2d7394e498..517fb124fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/NoopCollectionTracker.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/tracker/NoopCollectionTracker.java @@ -8,8 +8,6 @@ package org.hibernate.bytecode.enhance.internal.tracker; import org.hibernate.bytecode.enhance.spi.CollectionTracker; -import java.util.Arrays; - /** * small low memory class to keep track of the number of elements in a collection * diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java index a4f9c02f46..23e21eca99 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/EntityDataCachingConfigImpl.java @@ -6,10 +6,8 @@ */ package org.hibernate.cache.cfg.internal; -import java.util.ArrayList; import java.util.Comparator; import java.util.HashSet; -import java.util.List; import java.util.Set; import java.util.function.Supplier; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java index 5d7347f133..46fa7f2288 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/cfg/spi/EntityDataCachingConfig.java @@ -7,7 +7,6 @@ package org.hibernate.cache.cfg.spi; import java.util.Comparator; -import java.util.List; import java.util.Set; import java.util.function.Supplier; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsCache.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsCache.java index e62a229590..c8c19e4b7b 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsCache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/QueryResultsCache.java @@ -6,7 +6,6 @@ */ package org.hibernate.cache.spi; -import java.io.Serializable; import java.util.List; import java.util.Set; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java index ad8d355e5e..d49c54cf1c 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/SecondLevelCacheLogger.java @@ -6,7 +6,6 @@ */ package org.hibernate.cache.spi; -import org.hibernate.cache.spi.access.AccessType; import org.hibernate.metamodel.model.domain.NavigableRole; import org.jboss.logging.BasicLogger; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/CannotForceNonNullableException.java b/hibernate-core/src/main/java/org/hibernate/cfg/CannotForceNonNullableException.java index b4776caf12..aaaeca095b 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/CannotForceNonNullableException.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/CannotForceNonNullableException.java @@ -7,7 +7,6 @@ package org.hibernate.cfg; import org.hibernate.AnnotationException; -import org.hibernate.HibernateException; /** * Indicates an internal attempt to mark a column as non-nullable (because its part diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java index ec6facbd12..906d1827b0 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java @@ -14,7 +14,6 @@ import org.hibernate.MappingException; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.cfg.annotations.TableBinder; import org.hibernate.internal.util.StringHelper; -import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; import org.hibernate.mapping.KeyValue; import org.hibernate.mapping.ManyToOne; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapBinder.java index da180091f5..19517a6a1b 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapBinder.java @@ -49,7 +49,6 @@ import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; import org.hibernate.mapping.DependantValue; import org.hibernate.mapping.Formula; -import org.hibernate.mapping.Join; import org.hibernate.mapping.ManyToOne; import org.hibernate.mapping.OneToMany; import org.hibernate.mapping.PersistentClass; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentSet.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentSet.java index 3310ffbee5..8e4b916518 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentSet.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/PersistentSet.java @@ -19,8 +19,6 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.persister.collection.CollectionPersister; -import org.hibernate.sql.results.graph.DomainResultAssembler; -import org.hibernate.sql.results.jdbc.spi.RowProcessingState; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardIdentifierBagSemantics.java b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardIdentifierBagSemantics.java index 9003edebe5..1b403ca7a4 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardIdentifierBagSemantics.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/internal/StandardIdentifierBagSemantics.java @@ -7,7 +7,6 @@ package org.hibernate.collection.internal; import java.util.Collection; -import java.util.Iterator; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SharedSessionContractImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java index 253235657f..6f83da7eeb 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java @@ -6,16 +6,25 @@ */ package org.hibernate.dialect; +import java.sql.DatabaseMetaData; +import java.sql.SQLException; +import java.sql.Types; + import org.hibernate.JDBCException; import org.hibernate.LockMode; -import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.StaleObjectStateException; import org.hibernate.boot.TempTableDdlTransactionHandling; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.CommonFunctionFactory; import org.hibernate.dialect.identity.HSQLIdentityColumnSupport; import org.hibernate.dialect.identity.IdentityColumnSupport; -import org.hibernate.dialect.lock.*; +import org.hibernate.dialect.lock.LockingStrategy; +import org.hibernate.dialect.lock.OptimisticForceIncrementLockingStrategy; +import org.hibernate.dialect.lock.OptimisticLockingStrategy; +import org.hibernate.dialect.lock.PessimisticForceIncrementLockingStrategy; +import org.hibernate.dialect.lock.PessimisticReadSelectLockingStrategy; +import org.hibernate.dialect.lock.PessimisticWriteSelectLockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; import org.hibernate.dialect.pagination.LegacyHSQLLimitHandler; import org.hibernate.dialect.pagination.LimitHandler; import org.hibernate.dialect.pagination.LimitOffsetLimitHandler; @@ -44,13 +53,12 @@ import org.hibernate.query.sqm.mutation.internal.idtable.TempIdTableExporter; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorHSQLDBDatabaseImpl; import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; + import org.jboss.logging.Logger; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; -import java.sql.Types; - -import static org.hibernate.query.CastType.*; +import static org.hibernate.query.CastType.BOOLEAN; +import static org.hibernate.query.CastType.INTEGER; +import static org.hibernate.query.CastType.LONG; /** * An SQL dialect compatible with HyperSQL (HSQLDB) version 1.8 and above. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitLimitHandler.java index f12fa2abac..2dfc372e41 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitLimitHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitLimitHandler.java @@ -6,8 +6,6 @@ */ package org.hibernate.dialect.pagination; -import org.hibernate.engine.spi.RowSelection; - import java.util.regex.Pattern; import static java.util.regex.Pattern.CASE_INSENSITIVE; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitOffsetLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitOffsetLimitHandler.java index 92bdddebb0..d83ea51803 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitOffsetLimitHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/LimitOffsetLimitHandler.java @@ -6,8 +6,6 @@ */ package org.hibernate.dialect.pagination; -import org.hibernate.engine.spi.RowSelection; - /** * A {@link LimitHandler} for databases like PostgreSQL, H2, * and HSQL that support the syntax {@code LIMIT n OFFSET m}. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/OffsetFetchLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/OffsetFetchLimitHandler.java index 187c6cad59..0e1329d8d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/OffsetFetchLimitHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/OffsetFetchLimitHandler.java @@ -8,9 +8,6 @@ package org.hibernate.dialect.pagination; import org.hibernate.engine.spi.RowSelection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - /** * A {@link LimitHandler} for databases which support the * ANSI SQL standard syntax {@code FETCH FIRST m ROWS ONLY} diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/unique/MySQLUniqueDelegate.java b/hibernate-core/src/main/java/org/hibernate/dialect/unique/MySQLUniqueDelegate.java index 751b54e122..3c680468d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/unique/MySQLUniqueDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/unique/MySQLUniqueDelegate.java @@ -6,10 +6,7 @@ */ package org.hibernate.dialect.unique; -import org.hibernate.boot.Metadata; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.mapping.UniqueKey; /** * @author Andrea Boriero diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java index 4c8c317fce..0a3b251ae6 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/ImmutableEntityEntry.java @@ -11,7 +11,6 @@ import java.io.ObjectInputStream; import java.io.Serializable; import org.hibernate.AssertionFailure; -import org.hibernate.EntityMode; import org.hibernate.LockMode; import org.hibernate.UnsupportedLockAttemptException; import org.hibernate.engine.spi.EntityEntry; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java index 4c359bea36..0542f10e2e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java @@ -22,7 +22,6 @@ import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider; import org.hibernate.engine.jdbc.dialect.spi.DatabaseMetaDataDialectResolutionInfoAdapter; import org.hibernate.engine.jdbc.dialect.spi.DialectFactory; import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo; -import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfoSource; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.config.ConfigurationHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java index 7410cdbf32..b51e9fac2a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/ExtractedDatabaseMetaData.java @@ -6,7 +6,6 @@ */ package org.hibernate.engine.jdbc.env.spi; -import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java index a404a0ab70..088b2edc76 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/spi/IdentifierHelperBuilder.java @@ -8,7 +8,6 @@ package org.hibernate.engine.jdbc.env.spi; import java.sql.DatabaseMetaData; import java.sql.SQLException; -import java.util.Collections; import java.util.List; import java.util.Set; import java.util.TreeSet; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java index 56a9d95f4a..7494b64e70 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java @@ -13,11 +13,6 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetWrapperImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetWrapperImpl.java index 46eacc8810..f9eb248785 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetWrapperImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetWrapperImpl.java @@ -8,7 +8,6 @@ package org.hibernate.engine.jdbc.internal; import java.sql.ResultSet; -import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.engine.jdbc.ColumnNameCache; import org.hibernate.engine.jdbc.ResultSetWrapperProxy; import org.hibernate.engine.jdbc.spi.ResultSetWrapper; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/AbstractParameterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/AbstractParameterDescriptor.java index 23164c3bb6..310bcf5100 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/AbstractParameterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/AbstractParameterDescriptor.java @@ -9,7 +9,6 @@ package org.hibernate.engine.query.spi; import org.hibernate.Incubating; import org.hibernate.metamodel.model.domain.AllowableParameterType; import org.hibernate.query.QueryParameter; -import org.hibernate.type.Type; /** * NOTE: Consider this contract (and its sub-contracts) as incubating as we transition to 6.0 and SQM diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NamedParameterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NamedParameterDescriptor.java index 2221e19fa0..49eb6f4bab 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NamedParameterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NamedParameterDescriptor.java @@ -9,7 +9,6 @@ package org.hibernate.engine.query.spi; import org.hibernate.Incubating; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.metamodel.model.domain.AllowableParameterType; -import org.hibernate.type.Type; /** * Descriptor regarding a named parameter. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/OrdinalParameterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/OrdinalParameterDescriptor.java index 898cd2283b..c1d125b7e8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/OrdinalParameterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/OrdinalParameterDescriptor.java @@ -9,7 +9,6 @@ package org.hibernate.engine.query.spi; import org.hibernate.Incubating; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.metamodel.model.domain.AllowableParameterType; -import org.hibernate.type.Type; /** * Descriptor regarding an ordinal parameter. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java index e39b0632e7..6690d1b45e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/AbstractDelegatingSharedSessionBuilder.java @@ -13,7 +13,6 @@ import org.hibernate.ConnectionReleaseMode; import org.hibernate.FlushMode; import org.hibernate.Interceptor; import org.hibernate.Session; -import org.hibernate.SessionBuilder; import org.hibernate.SessionEventListener; import org.hibernate.SharedSessionBuilder; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java index 08a0d27ad2..ced4dc5697 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/BatchFetchQueue.java @@ -6,7 +6,6 @@ */ package org.hibernate.engine.spi; -import java.io.Serializable; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; diff --git a/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerGroup.java b/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerGroup.java index 2b0779299f..af1cc38465 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerGroup.java +++ b/hibernate-core/src/main/java/org/hibernate/event/service/spi/EventListenerGroup.java @@ -7,7 +7,6 @@ package org.hibernate.event.service.spi; import java.io.Serializable; -import java.util.Map; import java.util.function.BiConsumer; import java.util.function.Supplier; diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java index b2c1516cf6..3acd9ecaa6 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java @@ -6,8 +6,6 @@ */ package org.hibernate.event.spi; -import java.io.Serializable; - import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.CollectionEntry; import org.hibernate.engine.spi.EntityEntry; diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEvent.java index 1184697217..9789eccc96 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/spi/PreLoadEvent.java @@ -6,8 +6,6 @@ */ package org.hibernate.event.spi; -import java.io.Serializable; - import org.hibernate.persister.entity.EntityPersister; import org.hibernate.secure.spi.PermissionCheckEntityInformation; diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEvent.java index 31e667e6e7..66d280494e 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEvent.java @@ -6,7 +6,6 @@ */ package org.hibernate.event.spi; -import java.io.Serializable; import java.util.Collections; import java.util.Map; diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/Helper.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/Helper.java index c86e8d8011..a1c122f420 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/uuid/Helper.java +++ b/hibernate-core/src/main/java/org/hibernate/id/uuid/Helper.java @@ -7,9 +7,7 @@ package org.hibernate.id.uuid; import java.net.InetAddress; -import java.net.UnknownHostException; -import org.hibernate.internal.build.AllowSysOut; import org.hibernate.internal.util.BytesHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java index ad712d6a67..032fbc7e7b 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java @@ -54,7 +54,6 @@ import org.hibernate.id.uuid.StandardRandomStrategy; import org.hibernate.jdbc.ReturningWork; import org.hibernate.jdbc.Work; import org.hibernate.jdbc.WorkExecutorVisitable; -import org.hibernate.jpa.QueryHints; import org.hibernate.jpa.internal.util.FlushModeTypeHelper; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.procedure.ProcedureCall; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/EmptyScrollableResults.java b/hibernate-core/src/main/java/org/hibernate/internal/EmptyScrollableResults.java index 9ddbca7e76..7339df1726 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/EmptyScrollableResults.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/EmptyScrollableResults.java @@ -6,17 +6,7 @@ */ package org.hibernate.internal; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Blob; -import java.sql.Clob; -import java.util.Calendar; -import java.util.Date; -import java.util.Locale; -import java.util.TimeZone; - import org.hibernate.query.spi.ScrollableResultsImplementor; -import org.hibernate.type.Type; /** * @author Andrea Boriero diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java b/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java index c4306f152d..0367464e9d 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java @@ -6,6 +6,14 @@ */ package org.hibernate.internal; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import javax.persistence.CacheRetrieveMode; +import javax.persistence.CacheStoreMode; +import javax.persistence.PessimisticLockScope; + import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.LockOptions; @@ -16,7 +24,6 @@ import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider; -import org.hibernate.engine.jdbc.spi.ConnectionObserver; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.event.service.spi.EventListenerGroup; import org.hibernate.event.service.spi.EventListenerRegistry; @@ -45,16 +52,6 @@ import org.hibernate.resource.transaction.spi.TransactionCoordinatorBuilder; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -import javax.persistence.CacheRetrieveMode; -import javax.persistence.CacheStoreMode; -import javax.persistence.PessimisticLockScope; - import static org.hibernate.cfg.AvailableSettings.JPA_LOCK_SCOPE; import static org.hibernate.cfg.AvailableSettings.JPA_LOCK_TIMEOUT; import static org.hibernate.cfg.AvailableSettings.JPA_SHARED_CACHE_RETRIEVE_MODE; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java index b2bca89e2e..1588a56634 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/log/LoggingHelper.java @@ -6,8 +6,6 @@ */ package org.hibernate.internal.log; -import java.util.Collection; - import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.CollectionKey; import org.hibernate.engine.spi.EntityKey; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java index 0e46ed4fe1..54a3e84a67 100755 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/collections/CollectionHelper.java @@ -13,7 +13,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XmlDocument.java b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XmlDocument.java index e64b3b61e8..197b4141e0 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XmlDocument.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/xml/XmlDocument.java @@ -8,8 +8,6 @@ package org.hibernate.internal.util.xml; import java.io.Serializable; -import org.dom4j.Document; - /** * Describes a parsed xml document. * diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java index a88d09bc55..3eb47ae6ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/spi/ProviderChecker.java @@ -9,7 +9,6 @@ package org.hibernate.jpa.boot.spi; import java.util.Map; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.internal.EntityManagerMessageLogger; import org.hibernate.internal.HEMLogging; import org.hibernate.jpa.HibernatePersistenceProvider; diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java index 8577a8430f..c77cad2c8b 100644 --- a/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/jpa/internal/util/PersistenceUnitTransactionTypeHelper.java @@ -9,8 +9,6 @@ package org.hibernate.jpa.internal.util; import javax.persistence.PersistenceException; import javax.persistence.spi.PersistenceUnitTransactionType; -import org.hibernate.internal.util.StringHelper; - /** * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderNamedQuery.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderNamedQuery.java index 5b31406f20..e62d6d8c79 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderNamedQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderNamedQuery.java @@ -7,7 +7,6 @@ package org.hibernate.loader.ast.internal; import org.hibernate.collection.spi.PersistentCollection; -import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.loader.ast.spi.CollectionLoader; import org.hibernate.metamodel.mapping.PluralAttributeMapping; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java index 0d43d70c08..c8d0a1ff09 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderSelectBuilder.java @@ -24,7 +24,6 @@ import org.hibernate.engine.spi.SubselectFetch; import org.hibernate.loader.ast.spi.Loadable; import org.hibernate.loader.ast.spi.Loader; import org.hibernate.metamodel.mapping.BasicValuedModelPart; -import org.hibernate.metamodel.mapping.CollectionPart; import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.ModelPart; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Array.java b/hibernate-core/src/main/java/org/hibernate/mapping/Array.java index 76478ce030..4cd5c250e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Array.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Array.java @@ -10,7 +10,6 @@ import org.hibernate.MappingException; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; import org.hibernate.boot.spi.MetadataBuildingContext; -import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.type.ArrayType; import org.hibernate.type.CollectionType; import org.hibernate.type.PrimitiveType; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Map.java b/hibernate-core/src/main/java/org/hibernate/mapping/Map.java index a4c1934502..a51a4e785d 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Map.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Map.java @@ -8,7 +8,6 @@ package org.hibernate.mapping; import org.hibernate.MappingException; import org.hibernate.boot.spi.MetadataBuildingContext; -import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.type.CollectionType; import org.hibernate.type.MapType; import org.hibernate.type.OrderedMapType; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java b/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java index ac08bd3f85..b76bcc99f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java @@ -18,7 +18,6 @@ import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.type.AnyType; import org.hibernate.type.CollectionType; import org.hibernate.type.CustomCollectionType; -import org.hibernate.type.EntityType; import org.hibernate.type.ForeignKeyDirection; import org.hibernate.type.ManyToOneType; import org.hibernate.type.MetaType; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java index dacb7f051f..6c1fdaaaf8 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java @@ -18,7 +18,6 @@ import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementHelper; import org.hibernate.engine.spi.CascadeStyle; import org.hibernate.engine.spi.CascadeStyles; import org.hibernate.engine.spi.Mapping; -import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.property.access.spi.Getter; import org.hibernate.property.access.spi.PropertyAccessStrategy; import org.hibernate.property.access.spi.PropertyAccessStrategyResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java index a3d1fe2656..bec72968f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java @@ -41,7 +41,6 @@ import org.hibernate.id.factory.IdentifierGeneratorFactory; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.ReflectHelper; -import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.metamodel.model.convert.spi.JpaAttributeConverter; import org.hibernate.resource.beans.spi.ManagedBeanRegistry; import org.hibernate.service.ServiceRegistry; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java index f2cdf16174..0333836a8f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/AttributeMetadata.java @@ -10,7 +10,6 @@ import java.lang.reflect.Member; import org.hibernate.mapping.Property; import org.hibernate.metamodel.AttributeClassification; -import org.hibernate.metamodel.CollectionClassification; import org.hibernate.metamodel.model.domain.ManagedDomainType; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadata.java index 9b53ca8215..af9c71dfb4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/PluralAttributeMetadata.java @@ -6,8 +6,6 @@ */ package org.hibernate.metamodel.internal; -import javax.persistence.metamodel.PluralAttribute; - import org.hibernate.metamodel.CollectionClassification; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java index 92162a4ff7..da90797c28 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Bindable.java @@ -9,13 +9,11 @@ package org.hibernate.metamodel.mapping; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.BiConsumer; import java.util.function.Consumer; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.sql.ast.Clause; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; import org.hibernate.type.spi.TypeConfiguration; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java index f6374f4dea..517cddf63f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityIdentifierMapping.java @@ -7,7 +7,6 @@ package org.hibernate.metamodel.mapping; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.property.access.spi.PropertyAccess; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java index 6af3713a41..076eadf661 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ModelPart.java @@ -10,7 +10,6 @@ import java.util.function.BiConsumer; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.metamodel.model.domain.NavigableRole; -import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.NavigablePath; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; import org.hibernate.sql.ast.spi.SqlSelection; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Queryable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Queryable.java index 3bfe992406..a0555c6f78 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Queryable.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Queryable.java @@ -7,7 +7,6 @@ package org.hibernate.metamodel.mapping; import java.util.function.Consumer; -import java.util.function.Supplier; import org.hibernate.boot.spi.SessionFactoryOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java index 316472e4b5..fedf55b9fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelCreationHelper.java @@ -25,7 +25,6 @@ import org.hibernate.engine.FetchStrategy; import org.hibernate.engine.FetchStyle; import org.hibernate.engine.FetchTiming; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.spi.CascadeStyle; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.collections.CollectionHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingularAssociationAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingularAssociationAttributeMapping.java index 945c1dbafd..5c0ddb9031 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingularAssociationAttributeMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SingularAssociationAttributeMapping.java @@ -13,7 +13,6 @@ import java.util.List; import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.NotYetImplementedFor6Exception; -import org.hibernate.boot.model.source.spi.EmbeddedAttributeMapping; import org.hibernate.engine.FetchStrategy; import org.hibernate.engine.FetchTiming; import org.hibernate.mapping.ManyToOne; @@ -48,7 +47,6 @@ import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.Fetch; import org.hibernate.sql.results.graph.FetchParent; import org.hibernate.sql.results.graph.Fetchable; -import org.hibernate.sql.results.graph.embeddable.internal.EmbeddableFetchImpl; import org.hibernate.sql.results.graph.entity.EntityFetch; import org.hibernate.sql.results.graph.entity.EntityResultGraphNode; import org.hibernate.sql.results.graph.entity.EntityValuedFetchable; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragment.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragment.java index 071b56c32a..3c4781ee92 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragment.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragment.java @@ -6,7 +6,6 @@ */ package org.hibernate.metamodel.mapping.ordering; -import org.hibernate.query.NavigablePath; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.select.QuerySpec; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java index df1beca751..fa00dbe35a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/OrderByFragmentTranslator.java @@ -16,7 +16,6 @@ import org.hibernate.metamodel.mapping.ordering.ast.ParseTreeVisitor; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.ast.tree.select.QuerySpec; -import org.hibernate.sql.ast.tree.select.SortSpecification; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java index d44975b159..b35a86b253 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ParseTreeVisitor.java @@ -9,7 +9,6 @@ package org.hibernate.metamodel.mapping.ordering.ast; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.hibernate.SortOrder; import org.hibernate.grammars.ordering.OrderingParser; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java index 00445c5801..bff651b7da 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/AbstractManagedType.java @@ -28,7 +28,6 @@ import org.hibernate.metamodel.RepresentationMode; import org.hibernate.metamodel.model.domain.internal.AttributeContainer; import org.hibernate.metamodel.model.domain.internal.DomainModelHelper; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.spi.TypeConfiguration; /** * Commonality for Hibernate's implementations of the JPA {@link ManagedType} diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java index e9e683d1eb..49a842fea8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappedSuperclassTypeImpl.java @@ -6,22 +6,13 @@ */ package org.hibernate.metamodel.model.domain.internal; -import javax.persistence.metamodel.Bindable; - -import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.cfg.NotYetImplementedException; import org.hibernate.graph.spi.SubGraphImplementor; -import org.hibernate.mapping.Component; import org.hibernate.mapping.MappedSuperclass; -import org.hibernate.mapping.Property; -import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.model.domain.AbstractIdentifiableType; import org.hibernate.metamodel.model.domain.IdentifiableDomainType; import org.hibernate.metamodel.model.domain.JpaMetamodel; import org.hibernate.metamodel.model.domain.MappedSuperclassDomainType; -import org.hibernate.query.sqm.SqmPathSource; -import org.hibernate.type.BasicType; -import org.hibernate.type.Type; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java index 54b868e595..5e1241a009 100755 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java @@ -47,7 +47,6 @@ import org.hibernate.metamodel.internal.JpaStaticMetaModelPopulationSetting; import org.hibernate.metamodel.mapping.MappingModelExpressable; import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess; import org.hibernate.metamodel.model.domain.AllowableParameterType; -import org.hibernate.metamodel.model.domain.BasicDomainType; import org.hibernate.metamodel.model.domain.EmbeddableDomainType; import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.metamodel.model.domain.JpaMetamodel; diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java index 5445f369fe..9cafd54025 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/collection/BasicCollectionPersister.java @@ -15,7 +15,6 @@ import java.util.Set; import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.cache.CacheException; import org.hibernate.cache.spi.access.CollectionDataAccess; import org.hibernate.collection.spi.PersistentCollection; @@ -27,7 +26,6 @@ import org.hibernate.internal.util.collections.ArrayHelper; import org.hibernate.jdbc.Expectation; import org.hibernate.jdbc.Expectations; import org.hibernate.mapping.Collection; -import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.Joinable; import org.hibernate.persister.spi.PersisterCreationContext; import org.hibernate.pretty.MessageHelper; @@ -35,12 +33,6 @@ import org.hibernate.sql.Delete; import org.hibernate.sql.Insert; import org.hibernate.sql.SelectFragment; import org.hibernate.sql.Update; -import org.hibernate.sql.ast.SqlAstJoinType; -import org.hibernate.sql.ast.spi.SqlAliasBase; -import org.hibernate.sql.ast.spi.SqlAstCreationContext; -import org.hibernate.sql.ast.spi.SqlExpressionResolver; -import org.hibernate.sql.ast.tree.from.TableReference; -import org.hibernate.sql.ast.tree.from.TableReferenceJoin; import org.hibernate.type.AssociationType; /** diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java index 3010bafe08..3f047411fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java @@ -141,8 +141,6 @@ import org.hibernate.metamodel.mapping.NaturalIdMapping; import org.hibernate.metamodel.mapping.Queryable; import org.hibernate.metamodel.mapping.SingularAttributeMapping; import org.hibernate.metamodel.mapping.StateArrayContributorMapping; -import org.hibernate.metamodel.mapping.StateArrayContributorMetadata; -import org.hibernate.metamodel.mapping.StateArrayContributorMetadataAccess; import org.hibernate.metamodel.mapping.internal.BasicEntityIdentifierMappingImpl; import org.hibernate.metamodel.mapping.internal.EntityDiscriminatorMappingImpl; import org.hibernate.metamodel.mapping.internal.EntityVersionMappingImpl; @@ -216,7 +214,6 @@ import org.hibernate.type.Type; import org.hibernate.type.TypeHelper; import org.hibernate.type.VersionType; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.descriptor.java.MutabilityPlan; /** * Basic functionality for persisting an entity via JDBC diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/BasicEntityPropertyMapping.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/BasicEntityPropertyMapping.java index 172a2c781e..3446fe4d56 100755 --- a/hibernate-core/src/main/java/org/hibernate/persister/entity/BasicEntityPropertyMapping.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/BasicEntityPropertyMapping.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package org.hibernate.persister.entity; + import org.hibernate.QueryException; -import org.hibernate.type.Type; /** * @author Gavin King diff --git a/hibernate-core/src/main/java/org/hibernate/persister/walking/internal/CompositionSingularSubAttributesHelper.java b/hibernate-core/src/main/java/org/hibernate/persister/walking/internal/CompositionSingularSubAttributesHelper.java index 8cc46ba4e6..4c49b2cc9e 100644 --- a/hibernate-core/src/main/java/org/hibernate/persister/walking/internal/CompositionSingularSubAttributesHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/persister/walking/internal/CompositionSingularSubAttributesHelper.java @@ -7,7 +7,6 @@ package org.hibernate.persister.walking.internal; import java.util.Iterator; -import java.util.function.Consumer; import org.hibernate.FetchMode; import org.hibernate.engine.FetchStrategy; @@ -36,8 +35,6 @@ import org.hibernate.type.AnyType; import org.hibernate.type.AssociationType; import org.hibernate.type.CompositeType; import org.hibernate.type.Type; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.spi.TypeConfiguration; /** * A helper for getting attributes from a composition that is known diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java index dcc042f757..131dc850ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java @@ -7,19 +7,14 @@ package org.hibernate.procedure.internal; -import java.sql.Types; import javax.persistence.ParameterMode; import org.hibernate.NotYetImplementedFor6Exception; -import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.model.domain.AllowableOutputParameterType; import org.hibernate.metamodel.model.domain.AllowableParameterType; import org.hibernate.procedure.spi.FunctionReturnImplementor; import org.hibernate.procedure.spi.NamedCallableQueryMemento; import org.hibernate.procedure.spi.ProcedureCallImplementor; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; -import org.hibernate.type.spi.TypeConfiguration; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java index 233943cc57..22691297e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureCallImpl.java @@ -14,7 +14,6 @@ import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.function.Consumer; import java.util.stream.Stream; import javax.persistence.FlushModeType; import javax.persistence.LockModeType; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java index 1961083ef2..cd0eca4cb1 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParamBindings.java @@ -9,12 +9,10 @@ package org.hibernate.procedure.internal; import java.util.HashMap; import java.util.Map; -import javax.persistence.ParameterMode; - import org.hibernate.NotYetImplementedFor6Exception; -import org.hibernate.query.procedure.ProcedureParameterBinding; import org.hibernate.procedure.spi.ProcedureParameterBindingImplementor; import org.hibernate.procedure.spi.ProcedureParameterImplementor; +import org.hibernate.query.procedure.ProcedureParameterBinding; import org.hibernate.query.spi.QueryParameterBinding; import org.hibernate.query.spi.QueryParameterBindingTypeResolver; import org.hibernate.query.spi.QueryParameterBindings; diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java index fdefbd562c..60dc47011b 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/ProcedureParameterImpl.java @@ -12,17 +12,11 @@ import java.util.Objects; import javax.persistence.ParameterMode; import org.hibernate.NotYetImplementedFor6Exception; -import org.hibernate.engine.jdbc.cursor.spi.RefCursorSupport; import org.hibernate.metamodel.model.domain.AllowableParameterType; -import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; import org.hibernate.procedure.spi.NamedCallableQueryMemento; -import org.hibernate.procedure.spi.ParameterStrategy; import org.hibernate.procedure.spi.ProcedureCallImplementor; -import org.hibernate.query.AbstractQueryParameter; import org.hibernate.procedure.spi.ProcedureParameterImplementor; -import org.hibernate.query.spi.QueryParameterBinding; -import org.hibernate.type.ProcedureParameterExtractionAware; -import org.hibernate.type.ProcedureParameterNamedBinder; +import org.hibernate.query.AbstractQueryParameter; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java b/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java index 9f1a0008f7..091e4cdf53 100644 --- a/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/procedure/internal/StandardCallableStatementSupport.java @@ -19,7 +19,6 @@ import org.hibernate.procedure.spi.ParameterStrategy; import org.hibernate.procedure.spi.ProcedureParameterImplementor; import org.hibernate.query.spi.ParameterMetadataImplementor; import org.hibernate.query.spi.QueryParameterImplementor; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.exec.spi.JdbcCall; /** diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java index 42f1082e29..6c8d84dd21 100644 --- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterFieldImpl.java @@ -6,7 +6,6 @@ */ package org.hibernate.property.access.spi; -import java.io.ObjectStreamException; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java index 8925c654da..c42af3cbb2 100644 --- a/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/property/access/spi/SetterMethodImpl.java @@ -6,7 +6,6 @@ */ package org.hibernate.property.access.spi; -import java.io.ObjectStreamException; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java index b6ad46c374..a091b52b81 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/query/NativeQuery.java @@ -28,7 +28,6 @@ import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.metamodel.model.domain.AllowableParameterType; import org.hibernate.metamodel.model.domain.BasicDomainType; import org.hibernate.transform.ResultTransformer; -import org.hibernate.type.Type; /** * Represents a native (SQL) query. diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryImpl.java index 5c878798a4..8e3207fd16 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryImpl.java @@ -10,13 +10,11 @@ import java.util.Collection; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.query.ParameterMetadata; import org.hibernate.query.Query; import org.hibernate.query.ResultListTransformer; import org.hibernate.query.TupleTransformer; import org.hibernate.query.spi.ParameterMetadataImplementor; import org.hibernate.query.spi.QueryParameterBindings; -import org.hibernate.type.Type; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java index 74fec4e970..d8e9036417 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingsImpl.java @@ -15,7 +15,6 @@ import org.hibernate.QueryException; import org.hibernate.QueryParameterException; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.internal.util.collections.CollectionHelper; -import org.hibernate.internal.util.collections.IdentityMap; import org.hibernate.query.QueryParameter; import org.hibernate.query.spi.ParameterMetadataImplementor; import org.hibernate.query.spi.QueryParameterBinding; diff --git a/hibernate-core/src/main/java/org/hibernate/query/named/NamedQueryMemento.java b/hibernate-core/src/main/java/org/hibernate/query/named/NamedQueryMemento.java index 27226344fb..0ffb478a90 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/named/NamedQueryMemento.java +++ b/hibernate-core/src/main/java/org/hibernate/query/named/NamedQueryMemento.java @@ -12,7 +12,6 @@ import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.query.spi.QueryEngine; -import org.hibernate.query.spi.QueryImplementor; import org.hibernate.query.spi.QueryParameterImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java index f765b1f426..1f55605f2c 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/query/spi/QueryOptions.java @@ -9,14 +9,12 @@ package org.hibernate.query.spi; import java.sql.Statement; import java.util.Collections; import java.util.List; - import javax.persistence.CacheRetrieveMode; import javax.persistence.CacheStoreMode; import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.LockOptions; -import org.hibernate.annotations.Cache; import org.hibernate.graph.spi.AppliedGraph; import org.hibernate.query.Limit; import org.hibernate.query.ResultListTransformer; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java index 1d9397e72e..9a72cb5564 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sql/spi/NamedNativeQueryMemento.java @@ -13,7 +13,6 @@ import org.hibernate.boot.spi.NamedNativeQueryDefinition; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.query.named.AbstractNamedQueryMemento; -import org.hibernate.query.named.NamedQueryMemento; import org.hibernate.query.named.NamedQueryProducer; import org.hibernate.query.sql.internal.NamedNativeQueryMementoImpl; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java index 536cf239d0..d4209b4b9b 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmUtil.java @@ -18,14 +18,13 @@ import java.util.function.Function; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.Bindable; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingModelExpressable; import org.hibernate.metamodel.model.domain.AllowableParameterType; -import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.query.IllegalQueryOperationException; import org.hibernate.query.NavigablePath; -import org.hibernate.query.SemanticException; import org.hibernate.query.spi.QueryParameterBinding; import org.hibernate.query.spi.QueryParameterBindings; import org.hibernate.query.spi.QueryParameterImplementor; @@ -35,9 +34,9 @@ import org.hibernate.query.sqm.tree.SqmStatement; import org.hibernate.query.sqm.tree.expression.SqmParameter; import org.hibernate.query.sqm.tree.select.SqmSelectStatement; import org.hibernate.sql.ast.Clause; +import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl; -import org.hibernate.sql.ast.tree.expression.JdbcParameter; import org.hibernate.sql.exec.spi.JdbcParameterBinding; import org.hibernate.sql.exec.spi.JdbcParameterBindings; import org.hibernate.type.BasicType; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java index e7a66be871..7aba197e8a 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/SqmMutationStrategyHelper.java @@ -8,22 +8,15 @@ package org.hibernate.query.sqm.mutation.internal; import java.util.function.BiFunction; -import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.boot.spi.SessionFactoryOptions; import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.engine.spi.CascadeStyle; -import org.hibernate.engine.spi.CascadingActions; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.mapping.RootClass; -import org.hibernate.metamodel.mapping.AttributeMapping; import org.hibernate.metamodel.mapping.EntityMappingType; -import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; -import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.metamodel.mapping.PluralAttributeMapping; import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess; import org.hibernate.metamodel.spi.RuntimeModelCreationContext; import org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy; -import org.hibernate.query.sqm.tree.delete.SqmDeleteStatement; import org.hibernate.sql.ast.SqlAstDeleteTranslator; import org.hibernate.sql.ast.tree.delete.DeleteStatement; import org.hibernate.sql.ast.tree.from.TableReference; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/idtable/GlobalTemporaryTableStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/idtable/GlobalTemporaryTableStrategy.java index 08618fa4ca..9dd18d5ac5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/idtable/GlobalTemporaryTableStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/idtable/GlobalTemporaryTableStrategy.java @@ -10,8 +10,6 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.function.Supplier; -import org.hibernate.SessionFactory; -import org.hibernate.SessionFactoryObserver; import org.hibernate.boot.TempTableDdlTransactionHandling; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/idtable/PhysicalIdTableExporter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/idtable/PhysicalIdTableExporter.java index 66878c5e21..f19991b4d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/idtable/PhysicalIdTableExporter.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/idtable/PhysicalIdTableExporter.java @@ -8,10 +8,6 @@ package org.hibernate.query.sqm.mutation.internal.idtable; import java.util.function.Function; -import org.hibernate.boot.Metadata; -import org.hibernate.dialect.Dialect; -import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.spi.SharedSessionContractImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java index 52a7a09793..da081439e5 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineUpdateHandler.java @@ -8,7 +8,6 @@ package org.hibernate.query.sqm.mutation.internal.inline; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.query.sqm.internal.DomainParameterXref; import org.hibernate.query.sqm.mutation.internal.UpdateHandler; import org.hibernate.query.sqm.tree.update.SqmUpdateStatement; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategy.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategy.java index eb8bfe9516..a7340edc12 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/spi/SqmMultiTableMutationStrategy.java @@ -6,8 +6,6 @@ */ package org.hibernate.query.sqm.mutation.spi; -import org.hibernate.Metamodel; -import org.hibernate.boot.spi.SessionFactoryOptions; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.metamodel.mapping.internal.MappingModelCreationProcess; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java index 37539a2092..de629833fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EmbeddableValuedPathInterpretation.java @@ -17,9 +17,8 @@ import org.hibernate.query.NavigablePath; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.sql.SqmToSqlAstConverter; import org.hibernate.query.sqm.tree.domain.SqmEmbeddedValuedSimplePath; -import org.hibernate.query.sqm.tree.domain.SqmPath; -import org.hibernate.sql.ast.spi.SqlAstCreationContext; import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.ast.spi.SqlAstCreationContext; import org.hibernate.sql.ast.tree.expression.ColumnReference; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.SqlTuple; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java index 0b7380189f..a047f85419 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java @@ -10,9 +10,8 @@ import org.hibernate.metamodel.mapping.EntityValuedModelPart; import org.hibernate.metamodel.mapping.ModelPart; import org.hibernate.query.NavigablePath; import org.hibernate.query.sqm.tree.domain.SqmEntityValuedSimplePath; -import org.hibernate.query.sqm.tree.domain.SqmPath; -import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.tree.from.TableGroup; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java index fe302f9df6..69470da948 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SqlAstProcessingStateImpl.java @@ -9,15 +9,14 @@ package org.hibernate.query.sqm.sql.internal; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; import org.hibernate.query.sqm.sql.ConversionException; +import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlAstProcessingState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; -import org.hibernate.sql.ast.Clause; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.ast.tree.expression.SqlSelectionExpression; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java index b131dc1e45..c1bd032af4 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/Conversion.java @@ -11,15 +11,11 @@ import org.hibernate.metamodel.mapping.MappingModelExpressable; import org.hibernate.query.TemporalUnit; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; import org.hibernate.sql.ast.SqlAstWalker; -import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.expression.Duration; import org.hibernate.sql.ast.tree.expression.Expression; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.basic.BasicResult; -import org.hibernate.sql.results.internal.SqlSelectionImpl; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.spi.TypeConfiguration; /** * A conversion of a duration to a given temporal unit, diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmByUnit.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmByUnit.java index 1d87aa7cd3..ce94be6b9e 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmByUnit.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmByUnit.java @@ -6,7 +6,6 @@ */ package org.hibernate.query.sqm.tree.expression; -import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmExpressable; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java index a5ec0b49c8..df1dce51d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmParameterizedEntityType.java @@ -6,11 +6,9 @@ */ package org.hibernate.query.sqm.tree.expression; -import org.hibernate.metamodel.model.domain.EntityDomainType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; import org.hibernate.query.sqm.SqmExpressable; -import org.hibernate.query.sqm.tree.domain.SqmPath; import org.hibernate.query.sqm.tree.select.SqmSelectableNode; /** diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java index 2c65cb5c3f..db879b9b65 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmToDuration.java @@ -6,7 +6,6 @@ */ package org.hibernate.query.sqm.tree.expression; -import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.metamodel.model.domain.AllowableFunctionReturnType; import org.hibernate.query.sqm.NodeBuilder; import org.hibernate.query.sqm.SemanticQueryWalker; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectClause.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectClause.java index 2a063aeca3..f68ff76269 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectClause.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectClause.java @@ -17,8 +17,6 @@ import org.hibernate.query.sqm.tree.AbstractSqmNode; import org.hibernate.query.sqm.tree.expression.SqmExpression; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import static java.util.Arrays.asList; - /** * The semantic select clause. Defined as a list of individual selections. * diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalConnectionHandlingMode.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalConnectionHandlingMode.java index 48f08e9da2..5d60cf6336 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalConnectionHandlingMode.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/PhysicalConnectionHandlingMode.java @@ -10,7 +10,6 @@ import java.util.Locale; import org.hibernate.ConnectionAcquisitionMode; import org.hibernate.ConnectionReleaseMode; -import org.hibernate.internal.util.StringHelper; import static org.hibernate.ConnectionAcquisitionMode.AS_NEEDED; import static org.hibernate.ConnectionAcquisitionMode.IMMEDIATELY; diff --git a/hibernate-core/src/main/java/org/hibernate/result/internal/ResultSetOutputImpl.java b/hibernate-core/src/main/java/org/hibernate/result/internal/ResultSetOutputImpl.java index 0917833ef6..af991d49ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/result/internal/ResultSetOutputImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/result/internal/ResultSetOutputImpl.java @@ -6,12 +6,9 @@ */ package org.hibernate.result.internal; -import java.sql.ResultSet; import java.util.List; import java.util.function.Supplier; -import javax.enterprise.inject.spi.Producer; - import org.hibernate.result.ResultSetOutput; /** diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java index 4175ab4dd5..d6086864fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java @@ -7,7 +7,6 @@ package org.hibernate.service.internal; import java.util.List; -import java.util.ListIterator; import org.hibernate.boot.spi.SessionFactoryOptions; import org.hibernate.engine.config.spi.ConfigurationService; diff --git a/hibernate-core/src/main/java/org/hibernate/service/internal/StandardSessionFactoryServiceInitiators.java b/hibernate-core/src/main/java/org/hibernate/service/internal/StandardSessionFactoryServiceInitiators.java index 33154fd879..470d087f04 100644 --- a/hibernate-core/src/main/java/org/hibernate/service/internal/StandardSessionFactoryServiceInitiators.java +++ b/hibernate-core/src/main/java/org/hibernate/service/internal/StandardSessionFactoryServiceInitiators.java @@ -7,7 +7,6 @@ package org.hibernate.service.internal; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.hibernate.engine.query.spi.NativeQueryInterpreterInitiator; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java index bad83827ff..be06895787 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/MutationStatement.java @@ -6,8 +6,6 @@ */ package org.hibernate.sql.ast.tree; -import org.hibernate.sql.ast.tree.predicate.PredicateContainer; - /** * Specialization of Statement for mutation (DML) statements * diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AbstractLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AbstractLiteral.java index 487762939c..4e65340fd9 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AbstractLiteral.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/AbstractLiteral.java @@ -12,19 +12,17 @@ import java.util.function.Consumer; import org.hibernate.metamodel.mapping.BasicValuedMapping; import org.hibernate.metamodel.mapping.JdbcMapping; -import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; import org.hibernate.sql.ast.Clause; +import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.exec.spi.ExecutionContext; import org.hibernate.sql.exec.spi.JdbcParameterBinder; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.results.internal.SqlSelectionImpl; -import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; +import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.type.BasicType; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; import org.hibernate.type.spi.TypeConfiguration; /** diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/BinaryArithmeticExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/BinaryArithmeticExpression.java index ddedaedc6c..79263fd6e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/BinaryArithmeticExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/BinaryArithmeticExpression.java @@ -14,9 +14,6 @@ import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.basic.BasicResult; -import org.hibernate.sql.results.internal.SqlSelectionImpl; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.spi.TypeConfiguration; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSearchedExpression.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSearchedExpression.java index 286fa872d9..5cb7acf9cf 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSearchedExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/CaseSearchedExpression.java @@ -15,13 +15,10 @@ import org.hibernate.query.sqm.sql.internal.DomainResultProducer; import org.hibernate.sql.ast.SqlAstWalker; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.predicate.Predicate; -import org.hibernate.sql.results.internal.SqlSelectionImpl; -import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; +import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.type.BasicType; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.spi.TypeConfiguration; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ColumnReference.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ColumnReference.java index 164333a038..ecb7bd2cf1 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ColumnReference.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ColumnReference.java @@ -18,12 +18,8 @@ import org.hibernate.internal.util.StringHelper; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingModelExpressable; import org.hibernate.sql.ast.SqlAstWalker; -import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.ast.tree.from.TableReference; import org.hibernate.sql.ast.tree.update.Assignable; -import org.hibernate.sql.results.internal.SqlSelectionImpl; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.spi.TypeConfiguration; /** * Models a reference to a Column in a SQL AST diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Duration.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Duration.java index 020da9ad8d..55d071a0b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Duration.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/Duration.java @@ -7,18 +7,12 @@ package org.hibernate.sql.ast.tree.expression; import org.hibernate.metamodel.mapping.BasicValuedMapping; -import org.hibernate.metamodel.mapping.MappingModelExpressable; import org.hibernate.query.TemporalUnit; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; import org.hibernate.sql.ast.SqlAstWalker; -import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.basic.BasicResult; -import org.hibernate.sql.results.internal.SqlSelectionImpl; -import org.hibernate.type.descriptor.java.BasicJavaDescriptor; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; -import org.hibernate.type.spi.TypeConfiguration; /** * A duration expressed in terms of a given temporal unit. diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/DurationUnit.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/DurationUnit.java index 3618cba67b..26da7ec3c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/DurationUnit.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/DurationUnit.java @@ -7,7 +7,6 @@ package org.hibernate.sql.ast.tree.expression; import org.hibernate.metamodel.mapping.BasicValuedMapping; -import org.hibernate.metamodel.mapping.MappingModelExpressable; import org.hibernate.query.TemporalUnit; import org.hibernate.sql.ast.SqlAstWalker; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ExtractUnit.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ExtractUnit.java index b443ed9b0f..d7582ee24d 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ExtractUnit.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/ExtractUnit.java @@ -7,7 +7,6 @@ package org.hibernate.sql.ast.tree.expression; import org.hibernate.metamodel.mapping.BasicValuedMapping; -import org.hibernate.metamodel.mapping.MappingModelExpressable; import org.hibernate.query.TemporalUnit; import org.hibernate.sql.ast.SqlAstWalker; import org.hibernate.sql.ast.tree.SqlAstNode; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java index 881eba22de..4a0c8af9a9 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/JdbcLiteral.java @@ -17,17 +17,15 @@ import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.metamodel.mapping.MappingModelExpressable; import org.hibernate.query.sqm.sql.internal.DomainResultProducer; import org.hibernate.sql.ast.Clause; -import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.SqlAstWalker; +import org.hibernate.sql.ast.spi.SqlAstCreationState; import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.exec.spi.ExecutionContext; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.results.internal.SqlSelectionImpl; -import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; +import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.type.spi.TypeConfiguration; /** diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryLiteral.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryLiteral.java index d3ac670df8..75f5959606 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryLiteral.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryLiteral.java @@ -18,12 +18,10 @@ import org.hibernate.sql.ast.spi.SqlExpressionResolver; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.exec.spi.ExecutionContext; import org.hibernate.sql.exec.spi.JdbcParameterBindings; -import org.hibernate.sql.results.internal.SqlSelectionImpl; -import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.sql.results.graph.DomainResult; import org.hibernate.sql.results.graph.DomainResultCreationState; +import org.hibernate.sql.results.graph.basic.BasicResult; import org.hibernate.type.BasicType; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; import org.hibernate.type.spi.TypeConfiguration; /** diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CompositeTableGroup.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CompositeTableGroup.java index 8a3022c868..3a9cfe6407 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CompositeTableGroup.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CompositeTableGroup.java @@ -15,8 +15,6 @@ import java.util.function.Supplier; import org.hibernate.LockMode; import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart; -import org.hibernate.metamodel.mapping.ModelPart; -import org.hibernate.metamodel.mapping.ModelPartContainer; import org.hibernate.query.NavigablePath; /** diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java index a23f5e627b..0da561a2b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java @@ -14,7 +14,6 @@ import java.util.function.Function; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor; import org.hibernate.sql.exec.spi.ExecutionContext; -import org.hibernate.sql.exec.spi.JdbcDelete; import org.hibernate.sql.exec.spi.JdbcMutation; import org.hibernate.sql.exec.spi.JdbcMutationExecutor; import org.hibernate.sql.exec.spi.JdbcParameterBinder; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCall.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCall.java index be713935e0..527af4f7eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCall.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/JdbcCall.java @@ -6,8 +6,6 @@ */ package org.hibernate.sql.exec.spi; -import java.util.List; - /** * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementCreatorHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementCreatorHelper.java index 4477729a81..13896f7287 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementCreatorHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/spi/StatementCreatorHelper.java @@ -8,9 +8,7 @@ package org.hibernate.sql.exec.spi; import java.sql.PreparedStatement; -import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.resource.jdbc.LogicalConnection; /** * Helper for creating various types of diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AbstractFetchParent.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AbstractFetchParent.java index 3780c1d407..e1e2d85f9f 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AbstractFetchParent.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/AbstractFetchParent.java @@ -9,7 +9,6 @@ package org.hibernate.sql.results.graph; import java.util.Collections; import java.util.List; -import org.hibernate.metamodel.mapping.ManagedMappingType; import org.hibernate.query.NavigablePath; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java index 17863cb326..c0fa9f6dff 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/DomainResultGraphPrinter.java @@ -8,7 +8,6 @@ package org.hibernate.sql.results.graph; import java.util.List; -import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.collections.Stack; import org.hibernate.internal.util.collections.StandardStack; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java index 0f2fb77cfe..ff4c8a0fd2 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/embeddable/AbstractEmbeddableInitializer.java @@ -10,9 +10,6 @@ import java.util.IdentityHashMap; import java.util.Map; import java.util.function.Consumer; -import org.hibernate.cfg.Environment; -import org.hibernate.engine.config.spi.ConfigurationService; -import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.metamodel.mapping.EmbeddableMappingType; import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart; import org.hibernate.metamodel.mapping.SingularAttributeMapping; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java index a177d027ec..377523ed9c 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java @@ -7,7 +7,6 @@ package org.hibernate.sql.results.graph.entity; import org.hibernate.LockMode; -import org.hibernate.engine.FetchTiming; import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping; import org.hibernate.metamodel.mapping.EntityIdentifierMapping; import org.hibernate.metamodel.mapping.EntityMappingType; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractNonLazyEntityFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractNonLazyEntityFetch.java index 4cae2e7b3d..4625f9045e 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractNonLazyEntityFetch.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractNonLazyEntityFetch.java @@ -8,14 +8,12 @@ package org.hibernate.sql.results.graph.entity; import java.util.function.Consumer; -import org.hibernate.LockMode; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.EntityValuedModelPart; import org.hibernate.query.NavigablePath; import org.hibernate.sql.results.graph.AbstractFetchParent; import org.hibernate.sql.results.graph.AssemblerCreationState; import org.hibernate.sql.results.graph.DomainResultAssembler; -import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.FetchParent; import org.hibernate.sql.results.graph.FetchParentAccess; import org.hibernate.sql.results.graph.Fetchable; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractNonJoinedEntityFetch.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractNonJoinedEntityFetch.java index b0c073e1ba..366360e2fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractNonJoinedEntityFetch.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/AbstractNonJoinedEntityFetch.java @@ -10,12 +10,9 @@ import java.util.Collections; import java.util.List; import org.hibernate.metamodel.mapping.EntityMappingType; -import org.hibernate.metamodel.mapping.EntityValuedModelPart; import org.hibernate.query.NavigablePath; import org.hibernate.sql.results.graph.Fetch; import org.hibernate.sql.results.graph.FetchParent; -import org.hibernate.sql.results.graph.Fetchable; -import org.hibernate.sql.results.graph.FetchableContainer; import org.hibernate.sql.results.graph.entity.EntityFetch; import org.hibernate.sql.results.graph.entity.EntityValuedFetchable; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java index c94d00fa57..eefbd579f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityFetchJoinedImpl.java @@ -10,16 +10,15 @@ import java.util.function.Consumer; import org.hibernate.LockMode; import org.hibernate.engine.FetchTiming; -import org.hibernate.metamodel.mapping.EntityValuedModelPart; -import org.hibernate.sql.results.graph.entity.AbstractNonLazyEntityFetch; -import org.hibernate.sql.results.graph.entity.EntityInitializer; -import org.hibernate.sql.results.graph.entity.EntityValuedFetchable; import org.hibernate.query.NavigablePath; import org.hibernate.sql.results.graph.AssemblerCreationState; import org.hibernate.sql.results.graph.DomainResultCreationState; import org.hibernate.sql.results.graph.FetchParent; import org.hibernate.sql.results.graph.FetchParentAccess; import org.hibernate.sql.results.graph.Initializer; +import org.hibernate.sql.results.graph.entity.AbstractNonLazyEntityFetch; +import org.hibernate.sql.results.graph.entity.EntityInitializer; +import org.hibernate.sql.results.graph.entity.EntityValuedFetchable; /** * @author Andrea Boriero diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java index 4b87e8d01e..90915f8187 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java @@ -8,16 +8,15 @@ package org.hibernate.sql.results.graph.entity.internal; import java.util.function.Consumer; -import org.hibernate.metamodel.mapping.ModelPart; -import org.hibernate.sql.results.graph.FetchableContainer; -import org.hibernate.sql.results.graph.entity.AbstractEntityResultGraphNode; -import org.hibernate.sql.results.graph.entity.EntityResult; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.EntityValuedModelPart; import org.hibernate.query.NavigablePath; import org.hibernate.sql.results.graph.AssemblerCreationState; import org.hibernate.sql.results.graph.DomainResultAssembler; import org.hibernate.sql.results.graph.DomainResultCreationState; +import org.hibernate.sql.results.graph.FetchableContainer; +import org.hibernate.sql.results.graph.entity.AbstractEntityResultGraphNode; +import org.hibernate.sql.results.graph.entity.EntityResult; /** * Standard ReturnEntity impl diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/BiDirectionalFetchImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/BiDirectionalFetchImpl.java index 3aa570a61a..59d58501d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/BiDirectionalFetchImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/domain/BiDirectionalFetchImpl.java @@ -18,11 +18,9 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.mapping.Association; import org.hibernate.metamodel.mapping.AttributeMapping; import org.hibernate.metamodel.mapping.EntityMappingType; -import org.hibernate.metamodel.mapping.EntityValuedModelPart; import org.hibernate.metamodel.mapping.ForeignKeyDescriptor; import org.hibernate.metamodel.mapping.MappingType; import org.hibernate.metamodel.mapping.ModelPart; -import org.hibernate.metamodel.mapping.internal.SingularAssociationAttributeMapping; import org.hibernate.metamodel.model.domain.NavigableRole; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.query.NavigablePath; @@ -36,10 +34,7 @@ import org.hibernate.sql.results.graph.FetchParentAccess; import org.hibernate.sql.results.graph.Fetchable; import org.hibernate.sql.results.graph.Initializer; import org.hibernate.sql.results.graph.collection.CollectionInitializer; -import org.hibernate.sql.results.graph.collection.internal.AbstractCollectionInitializer; import org.hibernate.sql.results.graph.entity.EntityInitializer; -import org.hibernate.sql.results.graph.entity.LoadingEntityEntry; -import org.hibernate.sql.results.graph.entity.internal.EntityResultImpl; import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions; import org.hibernate.sql.results.jdbc.spi.RowProcessingState; import org.hibernate.type.descriptor.java.JavaTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/RowProcessingState.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/RowProcessingState.java index 5bb5983aa6..64b56bd50b 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/RowProcessingState.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/RowProcessingState.java @@ -6,12 +6,11 @@ */ package org.hibernate.sql.results.jdbc.spi; -import org.hibernate.sql.results.graph.Initializer; import org.hibernate.query.NavigablePath; import org.hibernate.sql.ast.spi.SqlSelection; import org.hibernate.sql.exec.spi.ExecutionContext; +import org.hibernate.sql.results.graph.Initializer; import org.hibernate.sql.results.graph.entity.EntityFetch; -import org.hibernate.sql.results.graph.entity.EntityInitializer; /** * State pertaining to the processing of a single "row" of a JdbcValuesSource diff --git a/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java b/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java index 217bdb0a3a..1e5d78cfce 100644 --- a/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/stat/internal/NaturalIdStatisticsImpl.java @@ -8,7 +8,6 @@ package org.hibernate.stat.internal; import java.io.Serializable; import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.LongAdder; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java index ba1658c2a0..5fa206bf84 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java @@ -13,7 +13,6 @@ import java.sql.Statement; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.internal.CoreMessageLogger; -import org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java index e61f7fd2f6..fc579b2bbf 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/ManagedProviderConnectionHelper.java @@ -12,12 +12,8 @@ import java.util.Properties; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.Environment; -import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.internal.util.config.ConfigurationHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SingleLineSqlCommandExtractor.java b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SingleLineSqlCommandExtractor.java index 646e5e7e2c..83bede7c16 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SingleLineSqlCommandExtractor.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SingleLineSqlCommandExtractor.java @@ -12,8 +12,6 @@ import java.io.Reader; import java.util.LinkedList; import java.util.List; -import org.hibernate.internal.util.StringHelper; - /** * Class responsible for extracting SQL statements from import script. Treats each line as a complete SQL statement. * Comment lines shall start with {@code --}, {@code //} or {@code /*} character sequence. diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/Action.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/Action.java index cb7ed8d2a5..82e0c77698 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/Action.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/Action.java @@ -6,8 +6,6 @@ */ package org.hibernate.tool.schema; -import org.hibernate.internal.util.StringHelper; - /** * The allowable actions in terms of schema tooling. Covers the unified JPA and HBM2DDL * cases. diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java index 2737b85e7a..e293ba215f 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/JdbcMetadaAccessStrategy.java @@ -9,7 +9,6 @@ package org.hibernate.tool.schema; import java.util.Map; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.config.ConfigurationHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java index 7755edd9a2..b202dd0567 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java @@ -7,7 +7,6 @@ package org.hibernate.tool.schema; import org.hibernate.cfg.AvailableSettings; -import org.hibernate.internal.util.StringHelper; /** * Enumeration of the various types of sources understood by various SchemaManagementTooling diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorCUBRIDDatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorCUBRIDDatabaseImpl.java index ad3c37aa17..a166f25e7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorCUBRIDDatabaseImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorCUBRIDDatabaseImpl.java @@ -6,9 +6,6 @@ */ package org.hibernate.tool.schema.extract.internal; -import java.sql.ResultSet; -import java.sql.SQLException; - /** * @author Vlad Mihalcea */ diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorDB2DatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorDB2DatabaseImpl.java index 40aa2907c2..8ee95b26fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorDB2DatabaseImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorDB2DatabaseImpl.java @@ -6,9 +6,6 @@ */ package org.hibernate.tool.schema.extract.internal; -import java.sql.ResultSet; -import java.sql.SQLException; - /** * @author Vlad Mihalcea */ diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorH2DatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorH2DatabaseImpl.java index 860b47b06d..3ec37306a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorH2DatabaseImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorH2DatabaseImpl.java @@ -6,9 +6,6 @@ */ package org.hibernate.tool.schema.extract.internal; -import java.sql.ResultSet; -import java.sql.SQLException; - /** * @author Steve Ebersole */ diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHANADatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHANADatabaseImpl.java index 943ddc4901..0147f6cfbb 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHANADatabaseImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorHANADatabaseImpl.java @@ -6,9 +6,6 @@ */ package org.hibernate.tool.schema.extract.internal; -import java.sql.ResultSet; -import java.sql.SQLException; - /** * @author Vlad Mihalcea */ diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorInformixDatabaseImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorInformixDatabaseImpl.java index f4d8a1e730..f19ce8c1c2 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorInformixDatabaseImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/SequenceInformationExtractorInformixDatabaseImpl.java @@ -6,9 +6,6 @@ */ package org.hibernate.tool.schema.extract.internal; -import java.sql.ResultSet; -import java.sql.SQLException; - /** * @author Vlad Mihalcea */ diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java index 385bfb89d4..9d031c0a39 100644 --- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java +++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java @@ -14,9 +14,7 @@ import java.sql.SQLException; import java.util.Map; import org.hibernate.boot.model.relational.Namespace; -import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; -import org.hibernate.boot.spi.MetadataImplementor; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.internal.CoreLogging; @@ -24,8 +22,8 @@ import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.resource.transaction.spi.DdlTransactionIsolator; import org.hibernate.service.ServiceRegistry; -import org.hibernate.tool.schema.extract.spi.DatabaseInformation; import org.hibernate.tool.schema.extract.internal.DatabaseInformationImpl; +import org.hibernate.tool.schema.extract.spi.DatabaseInformation; import org.hibernate.tool.schema.internal.exec.ScriptSourceInputFromFile; import org.hibernate.tool.schema.internal.exec.ScriptSourceInputFromReader; import org.hibernate.tool.schema.internal.exec.ScriptSourceInputFromUrl; @@ -35,8 +33,6 @@ import org.hibernate.tool.schema.internal.exec.ScriptTargetOutputToWriter; import org.hibernate.tool.schema.spi.ScriptSourceInput; import org.hibernate.tool.schema.spi.ScriptTargetOutput; -import org.jboss.logging.Logger; - /** * Helper methods. * diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedAssociationAttribute.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedAssociationAttribute.java index c24e022aa2..2365eaef5f 100644 --- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedAssociationAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityBasedAssociationAttribute.java @@ -6,7 +6,6 @@ */ package org.hibernate.tuple.entity; -import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.engine.FetchStrategy; import org.hibernate.engine.FetchStyle; import org.hibernate.engine.internal.JoinHelper; @@ -31,7 +30,6 @@ import org.hibernate.tuple.BaselineAttributeInformation; import org.hibernate.type.AnyType; import org.hibernate.type.AssociationType; import org.hibernate.type.ForeignKeyDirection; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; import static org.hibernate.engine.internal.JoinHelper.getLHSColumnNames; import static org.hibernate.engine.internal.JoinHelper.getLHSTableName; diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java index d6e43bbed8..4b4b8b5395 100644 --- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java +++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java @@ -16,19 +16,15 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.bytecode.enhance.spi.interceptor.EnhancementHelper; import org.hibernate.bytecode.spi.BytecodeEnhancementMetadata; import org.hibernate.cfg.NotYetImplementedException; import org.hibernate.engine.OptimisticLockStyle; -import org.hibernate.engine.jdbc.Size; import org.hibernate.engine.spi.CascadeStyle; import org.hibernate.engine.spi.CascadeStyles; -import org.hibernate.engine.spi.Mapping; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.collections.ArrayHelper; @@ -47,7 +43,6 @@ import org.hibernate.tuple.ValueGenerator; import org.hibernate.type.AssociationType; import org.hibernate.type.CompositeType; import org.hibernate.type.EntityType; -import org.hibernate.type.ForeignKeyDirection; import org.hibernate.type.ManyToOneType; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/VersionProperty.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/VersionProperty.java index 605ad849e8..c86a257f5f 100644 --- a/hibernate-core/src/main/java/org/hibernate/tuple/entity/VersionProperty.java +++ b/hibernate-core/src/main/java/org/hibernate/tuple/entity/VersionProperty.java @@ -12,7 +12,6 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.tuple.AbstractNonIdentifierAttribute; import org.hibernate.tuple.BaselineAttributeInformation; import org.hibernate.type.Type; -import org.hibernate.type.descriptor.java.JavaTypeDescriptor; /** * Represents a version property within the Hibernate runtime-metamodel. diff --git a/hibernate-core/src/main/java/org/hibernate/type/BigIntegerType.java b/hibernate-core/src/main/java/org/hibernate/type/BigIntegerType.java index a6f17a06ea..114a6aa188 100755 --- a/hibernate-core/src/main/java/org/hibernate/type/BigIntegerType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/BigIntegerType.java @@ -10,7 +10,6 @@ import java.math.BigInteger; import org.hibernate.dialect.Dialect; import org.hibernate.type.descriptor.java.BigIntegerTypeDescriptor; -import org.hibernate.type.descriptor.sql.BigIntTypeDescriptor; import org.hibernate.type.descriptor.sql.NumericTypeDescriptor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/type/InstantType.java b/hibernate-core/src/main/java/org/hibernate/type/InstantType.java index 0e3b3b12db..952d2e4853 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/InstantType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/InstantType.java @@ -7,16 +7,12 @@ package org.hibernate.type; import java.time.Instant; -import java.time.ZoneId; -import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.Comparator; import java.util.Locale; - import javax.persistence.TemporalType; import org.hibernate.QueryException; -import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.util.compare.ComparableComparator; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/LocalDateTimeType.java b/hibernate-core/src/main/java/org/hibernate/type/LocalDateTimeType.java index 2462abc4f6..248056f11c 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/LocalDateTimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/LocalDateTimeType.java @@ -7,13 +7,10 @@ package org.hibernate.type; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.Comparator; - import javax.persistence.TemporalType; import org.hibernate.QueryException; -import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.util.compare.ComparableComparator; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; diff --git a/hibernate-core/src/main/java/org/hibernate/type/LocalDateType.java b/hibernate-core/src/main/java/org/hibernate/type/LocalDateType.java index 03f9f44db4..25ffd46075 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/LocalDateType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/LocalDateType.java @@ -7,11 +7,9 @@ package org.hibernate.type; import java.time.LocalDate; -import java.time.format.DateTimeFormatter; import javax.persistence.TemporalType; import org.hibernate.QueryException; -import org.hibernate.dialect.Dialect; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; import org.hibernate.type.descriptor.java.LocalDateJavaDescriptor; import org.hibernate.type.descriptor.sql.DateTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/LocalTimeType.java b/hibernate-core/src/main/java/org/hibernate/type/LocalTimeType.java index 77d65a3513..438ec717e8 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/LocalTimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/LocalTimeType.java @@ -7,11 +7,8 @@ package org.hibernate.type; import java.time.LocalTime; -import java.time.format.DateTimeFormatter; - import javax.persistence.TemporalType; -import org.hibernate.dialect.Dialect; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; import org.hibernate.type.descriptor.java.LocalTimeJavaDescriptor; import org.hibernate.type.descriptor.sql.TimeTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/MetaType.java b/hibernate-core/src/main/java/org/hibernate/type/MetaType.java index 5b2e405998..1aa7a3e558 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/MetaType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/MetaType.java @@ -14,7 +14,6 @@ import java.util.Map; import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.engine.jdbc.Size; import org.hibernate.engine.spi.Mapping; import org.hibernate.engine.spi.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/OffsetTimeType.java b/hibernate-core/src/main/java/org/hibernate/type/OffsetTimeType.java index 860784de6d..9efe94615c 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/OffsetTimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/OffsetTimeType.java @@ -7,12 +7,9 @@ package org.hibernate.type; import java.time.OffsetTime; -import java.time.format.DateTimeFormatter; - import javax.persistence.TemporalType; import org.hibernate.QueryException; -import org.hibernate.dialect.Dialect; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; import org.hibernate.type.descriptor.java.OffsetTimeJavaDescriptor; import org.hibernate.type.descriptor.sql.TimeTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/RowVersionType.java b/hibernate-core/src/main/java/org/hibernate/type/RowVersionType.java index c91ed0e3b3..9415167b35 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/RowVersionType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/RowVersionType.java @@ -9,8 +9,6 @@ package org.hibernate.type; import java.util.Comparator; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.internal.util.compare.RowVersionComparator; -import org.hibernate.type.descriptor.java.PrimitiveByteArrayTypeDescriptor; import org.hibernate.type.descriptor.java.RowVersionTypeDescriptor; import org.hibernate.type.descriptor.sql.VarbinaryTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/TimeType.java b/hibernate-core/src/main/java/org/hibernate/type/TimeType.java index 069a92103b..bff3fd3e38 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/TimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/TimeType.java @@ -8,11 +8,9 @@ package org.hibernate.type; import java.sql.Time; import java.util.Date; - import javax.persistence.TemporalType; import org.hibernate.QueryException; -import org.hibernate.dialect.Dialect; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; import org.hibernate.type.descriptor.java.JdbcTimeTypeDescriptor; import org.hibernate.type.spi.TypeConfiguration; diff --git a/hibernate-core/src/main/java/org/hibernate/type/TimestampType.java b/hibernate-core/src/main/java/org/hibernate/type/TimestampType.java index 6087ea43b5..49764aca15 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/TimestampType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/TimestampType.java @@ -9,12 +9,10 @@ package org.hibernate.type; import java.sql.Timestamp; import java.util.Comparator; import java.util.Date; - import javax.persistence.TemporalType; import org.hibernate.HibernateException; import org.hibernate.QueryException; -import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; import org.hibernate.type.descriptor.java.JdbcTimestampTypeDescriptor; diff --git a/hibernate-core/src/main/java/org/hibernate/type/ZonedDateTimeType.java b/hibernate-core/src/main/java/org/hibernate/type/ZonedDateTimeType.java index 44c883ecf4..6394a7e42a 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/ZonedDateTimeType.java +++ b/hibernate-core/src/main/java/org/hibernate/type/ZonedDateTimeType.java @@ -7,19 +7,14 @@ package org.hibernate.type; import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; import java.util.Comparator; -import java.util.Locale; - import javax.persistence.TemporalType; import org.hibernate.QueryException; -import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.internal.util.ZonedDateTimeComparator; import org.hibernate.metamodel.model.domain.AllowableTemporalParameterType; import org.hibernate.type.descriptor.java.ZonedDateTimeJavaDescriptor; -import org.hibernate.type.descriptor.sql.TimestampTypeDescriptor; import org.hibernate.type.descriptor.sql.TimestampWithTimeZoneDescriptor; import org.hibernate.type.spi.TypeConfiguration; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeTypeDescriptor.java index e9fa1a937d..4a630824ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTimeTypeDescriptor.java @@ -11,7 +11,6 @@ import java.util.Comparator; import java.util.Date; import java.util.GregorianCalendar; -import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.internal.util.compare.CalendarComparator; import org.hibernate.type.descriptor.WrapperOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTypeDescriptor.java index 2a8224cc90..e7adb662ef 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/CalendarTypeDescriptor.java @@ -8,10 +8,8 @@ package org.hibernate.type.descriptor.java; import java.util.Calendar; import java.util.Comparator; -import java.util.Date; import java.util.GregorianCalendar; -import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.internal.util.compare.CalendarComparator; import org.hibernate.type.descriptor.WrapperOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/LobTypeMappings.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/LobTypeMappings.java index c246654c9f..82873ecffe 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/LobTypeMappings.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/LobTypeMappings.java @@ -8,7 +8,6 @@ package org.hibernate.type.descriptor.sql; import java.sql.Types; import java.util.Locale; -import java.util.Map; import org.hibernate.type.descriptor.JdbcTypeNameMapper; diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/NVarcharTypeDescriptor.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/NVarcharTypeDescriptor.java index e588377caf..c039b384da 100644 --- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/NVarcharTypeDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/NVarcharTypeDescriptor.java @@ -20,8 +20,6 @@ import org.hibernate.type.descriptor.java.JavaTypeDescriptor; import org.hibernate.type.descriptor.sql.internal.JdbcLiteralFormatterCharacterData; import org.hibernate.type.spi.TypeConfiguration; -import static org.hibernate.type.descriptor.sql.JdbcLiteralFormatter.NULL; - /** * Descriptor for {@link Types#NVARCHAR NVARCHAR} handling. *