From 8c806d361d63764e8523006944dde52aff70532c Mon Sep 17 00:00:00 2001 From: JPAV Date: Tue, 8 Feb 2011 13:55:27 -0600 Subject: [PATCH] Changes from requests at Hibernate meeting: message codes, use XXXf methods for debug and trace, use @Cause --- build.gradle | 4 +- .../internal/C3P0ConnectionProvider.java | 6 +- .../jdbc/connections/internal/C3P0Logger.java | 32 +- hibernate-core/hibernate-core.gradle | 3 +- hibernate-core/src/main/antlr/hql-sql.g | 18 +- hibernate-core/src/main/antlr/sql-gen.g | 4 - .../org/hibernate/AnnotationException.java | 1 + .../java/org/hibernate/AssertionFailure.java | 3 +- .../src/main/java/org/hibernate/Cache.java | 1 - .../main/java/org/hibernate/CacheMode.java | 1 - .../java/org/hibernate/CallbackException.java | 1 + .../org/hibernate/ConnectionReleaseMode.java | 1 - .../src/main/java/org/hibernate/Criteria.java | 2 - .../hibernate/DuplicateMappingException.java | 1 + .../java/org/hibernate/EmptyInterceptor.java | 2 - .../main/java/org/hibernate/EntityMode.java | 5 +- .../org/hibernate/EntityNameResolver.java | 1 + .../main/java/org/hibernate/FetchMode.java | 1 - .../src/main/java/org/hibernate/Filter.java | 4 +- .../main/java/org/hibernate/FlushMode.java | 1 - .../main/java/org/hibernate/Hibernate.java | 2 - .../org/hibernate/HibernateException.java | 1 + .../org/hibernate/InstantiationException.java | 1 + .../main/java/org/hibernate/Interceptor.java | 2 - .../hibernate/InvalidMappingException.java | 3 +- .../java/org/hibernate/JDBCException.java | 1 - .../LazyInitializationException.java | 10 +- .../main/java/org/hibernate/LobHelper.java | 1 - .../src/main/java/org/hibernate/LockMode.java | 1 - .../main/java/org/hibernate/LockOptions.java | 3 +- .../src/main/java/org/hibernate/Logger.java | 1818 ----------------- .../java/org/hibernate/MappingException.java | 1 + .../hibernate/MappingNotFoundException.java | 3 +- .../hibernate/NonUniqueObjectException.java | 2 - .../hibernate/NonUniqueResultException.java | 1 + .../org/hibernate/ObjectDeletedException.java | 1 - .../hibernate/ObjectNotFoundException.java | 1 - .../hibernate/OptimisticLockException.java | 1 + .../hibernate/PersistentObjectException.java | 1 + .../hibernate/PessimisticLockException.java | 1 - .../hibernate/PropertyAccessException.java | 1 - .../hibernate/PropertyNotFoundException.java | 1 + .../org/hibernate/PropertyValueException.java | 1 - .../src/main/java/org/hibernate/Query.java | 2 - .../java/org/hibernate/QueryException.java | 1 + .../hibernate/QueryParameterException.java | 3 +- .../org/hibernate/QueryTimeoutException.java | 1 - .../java/org/hibernate/ReplicationMode.java | 2 - .../src/main/java/org/hibernate/SQLQuery.java | 1 - .../SQLQueryResultMappingBuilder.java | 1 - .../main/java/org/hibernate/ScrollMode.java | 1 - .../java/org/hibernate/ScrollableResults.java | 2 - .../src/main/java/org/hibernate/Session.java | 2 - .../java/org/hibernate/SessionException.java | 1 + .../java/org/hibernate/SessionFactory.java | 5 +- .../org/hibernate/SessionFactoryObserver.java | 1 - .../hibernate/StaleObjectStateException.java | 2 - .../org/hibernate/StaleStateException.java | 1 + .../java/org/hibernate/StatelessSession.java | 1 - .../main/java/org/hibernate/Transaction.java | 1 - .../org/hibernate/TransactionException.java | 1 + .../hibernate/TransientObjectException.java | 1 + .../main/java/org/hibernate/TypeHelper.java | 2 - .../org/hibernate/TypeMismatchException.java | 3 +- .../hibernate/UnknownProfileException.java | 1 + .../UnresolvableObjectException.java | 2 - .../src/main/java/org/hibernate/Version.java | 1 + .../org/hibernate/WrongClassException.java | 1 - .../AfterTransactionCompletionProcess.java | 1 - .../BeforeTransactionCompletionProcess.java | 1 - .../action/BulkOperationCleanupAction.java | 2 - .../hibernate/action/CollectionAction.java | 10 +- .../action/CollectionRecreateAction.java | 14 +- .../action/CollectionRemoveAction.java | 16 +- .../action/CollectionUpdateAction.java | 14 +- .../action/DelayedPostInsertIdentifier.java | 3 +- .../org/hibernate/action/EntityAction.java | 8 +- .../hibernate/action/EntityDeleteAction.java | 5 +- .../action/EntityIdentityInsertAction.java | 8 +- .../action/EntityIncrementVersionProcess.java | 3 +- .../hibernate/action/EntityInsertAction.java | 4 +- .../hibernate/action/EntityUpdateAction.java | 4 +- .../action/EntityVerifyVersionProcess.java | 1 - .../java/org/hibernate/action/Executable.java | 4 +- .../org/hibernate/annotations/AccessType.java | 6 +- .../java/org/hibernate/annotations/Any.java | 4 +- .../org/hibernate/annotations/AnyMetaDef.java | 3 +- .../hibernate/annotations/AnyMetaDefs.java | 3 +- .../org/hibernate/annotations/BatchSize.java | 7 +- .../java/org/hibernate/annotations/Cache.java | 7 +- .../annotations/CacheConcurrencyStrategy.java | 1 - .../hibernate/annotations/CacheModeType.java | 1 + .../org/hibernate/annotations/Cascade.java | 3 +- .../hibernate/annotations/CascadeType.java | 1 + .../java/org/hibernate/annotations/Check.java | 7 +- .../hibernate/annotations/CollectionId.java | 11 +- .../annotations/CollectionOfElements.java | 4 +- .../annotations/ColumnTransformer.java | 4 +- .../annotations/ColumnTransformers.java | 4 +- .../org/hibernate/annotations/Columns.java | 3 +- .../annotations/DiscriminatorFormula.java | 3 +- .../annotations/DiscriminatorOptions.java | 6 +- .../org/hibernate/annotations/Entity.java | 3 +- .../java/org/hibernate/annotations/Fetch.java | 5 +- .../org/hibernate/annotations/FetchMode.java | 3 +- .../hibernate/annotations/FetchProfile.java | 8 +- .../hibernate/annotations/FetchProfiles.java | 6 +- .../org/hibernate/annotations/Filter.java | 7 +- .../org/hibernate/annotations/FilterDef.java | 3 +- .../org/hibernate/annotations/FilterDefs.java | 3 +- .../annotations/FilterJoinTable.java | 7 +- .../annotations/FilterJoinTables.java | 7 +- .../org/hibernate/annotations/Filters.java | 7 +- .../hibernate/annotations/FlushModeType.java | 1 + .../annotations/ForceDiscriminator.java | 3 +- .../org/hibernate/annotations/ForeignKey.java | 5 +- .../org/hibernate/annotations/Formula.java | 3 +- .../org/hibernate/annotations/Generated.java | 7 +- .../hibernate/annotations/GenerationTime.java | 3 +- .../annotations/GenericGenerator.java | 8 +- .../annotations/GenericGenerators.java | 2 - .../org/hibernate/annotations/Immutable.java | 5 +- .../java/org/hibernate/annotations/Index.java | 3 +- .../hibernate/annotations/IndexColumn.java | 3 +- .../annotations/JoinColumnOrFormula.java | 3 - .../annotations/JoinColumnsOrFormulas.java | 1 - .../hibernate/annotations/JoinFormula.java | 3 +- .../hibernate/annotations/LazyCollection.java | 7 +- .../annotations/LazyCollectionOption.java | 3 +- .../org/hibernate/annotations/LazyToOne.java | 5 +- .../annotations/LazyToOneOption.java | 3 +- .../org/hibernate/annotations/Loader.java | 5 +- .../org/hibernate/annotations/ManyToAny.java | 6 +- .../org/hibernate/annotations/MapKey.java | 11 +- .../annotations/MapKeyManyToMany.java | 3 +- .../org/hibernate/annotations/MapKeyType.java | 4 +- .../org/hibernate/annotations/MetaValue.java | 1 + .../annotations/NamedNativeQueries.java | 3 +- .../annotations/NamedNativeQuery.java | 3 +- .../hibernate/annotations/NamedQueries.java | 3 +- .../org/hibernate/annotations/NamedQuery.java | 3 +- .../org/hibernate/annotations/NaturalId.java | 3 +- .../org/hibernate/annotations/NotFound.java | 3 +- .../hibernate/annotations/NotFoundAction.java | 1 + .../org/hibernate/annotations/OnDelete.java | 7 +- .../hibernate/annotations/OnDeleteAction.java | 1 + .../hibernate/annotations/OptimisticLock.java | 1 - .../annotations/OptimisticLockType.java | 1 + .../org/hibernate/annotations/OrderBy.java | 3 +- .../org/hibernate/annotations/ParamDef.java | 3 +- .../org/hibernate/annotations/Parameter.java | 3 +- .../org/hibernate/annotations/Parent.java | 5 +- .../org/hibernate/annotations/Persister.java | 5 +- .../annotations/PolymorphismType.java | 1 + .../java/org/hibernate/annotations/Proxy.java | 3 +- .../annotations/ResultCheckStyle.java | 1 + .../org/hibernate/annotations/SQLDelete.java | 5 +- .../hibernate/annotations/SQLDeleteAll.java | 4 +- .../org/hibernate/annotations/SQLInsert.java | 5 +- .../org/hibernate/annotations/SQLUpdate.java | 5 +- .../java/org/hibernate/annotations/Sort.java | 3 +- .../org/hibernate/annotations/SortType.java | 1 + .../org/hibernate/annotations/Source.java | 6 +- .../org/hibernate/annotations/SourceType.java | 1 + .../org/hibernate/annotations/Subselect.java | 4 +- .../hibernate/annotations/Synchronize.java | 4 +- .../java/org/hibernate/annotations/Table.java | 3 +- .../org/hibernate/annotations/Tables.java | 3 +- .../org/hibernate/annotations/Target.java | 5 +- .../org/hibernate/annotations/Tuplizer.java | 9 +- .../org/hibernate/annotations/Tuplizers.java | 5 +- .../java/org/hibernate/annotations/Type.java | 3 +- .../org/hibernate/annotations/TypeDef.java | 3 +- .../org/hibernate/annotations/TypeDefs.java | 3 +- .../java/org/hibernate/annotations/Where.java | 7 +- .../hibernate/annotations/WhereJoinTable.java | 7 +- .../AbstractClassTransformerImpl.java | 6 +- .../hibernate/bytecode/BasicProxyFactory.java | 3 +- .../hibernate/bytecode/BytecodeProvider.java | 1 - .../hibernate/bytecode/ClassTransformer.java | 3 +- .../bytecode/InstrumentedClassLoader.java | 6 +- .../bytecode/ProxyFactoryFactory.java | 1 - .../bytecode/ReflectionOptimizer.java | 1 + .../buildtime/AbstractInstrumenter.java | 21 +- .../bytecode/buildtime/CGLIBInstrumenter.java | 19 +- .../buildtime/ExecutionException.java | 1 + .../bytecode/buildtime/Instrumenter.java | 1 - .../buildtime/JavassistInstrumenter.java | 18 +- .../cglib/AccessOptimizerAdapter.java | 14 +- .../bytecode/cglib/BytecodeProviderImpl.java | 20 +- .../bytecode/cglib/CglibClassTransformer.java | 10 +- .../cglib/InstantiationOptimizerAdapter.java | 12 +- .../cglib/ProxyFactoryFactoryImpl.java | 24 +- .../cglib/ReflectionOptimizerImpl.java | 4 +- .../javassist/AccessOptimizerAdapter.java | 6 +- .../bytecode/javassist/BulkAccessor.java | 1 - .../javassist/BulkAccessorException.java | 1 + .../javassist/BulkAccessorFactory.java | 2 - .../javassist/BytecodeProviderImpl.java | 20 +- .../bytecode/javassist/FastClass.java | 3 +- .../bytecode/javassist/FieldFilter.java | 1 + .../bytecode/javassist/FieldHandled.java | 1 + .../bytecode/javassist/FieldHandler.java | 1 + .../bytecode/javassist/FieldTransformer.java | 2 - .../InstantiationOptimizerAdapter.java | 6 +- .../javassist/JavassistClassTransformer.java | 11 +- .../javassist/ProxyFactoryFactoryImpl.java | 20 +- .../javassist/ReflectionOptimizerImpl.java | 4 +- .../javassist/TransformingClassLoader.java | 14 +- .../bytecode/util/BasicClassFilter.java | 5 +- .../bytecode/util/ByteCodeHelper.java | 11 +- .../bytecode/util/ClassDescriptor.java | 3 +- .../hibernate/bytecode/util/ClassFilter.java | 3 +- .../hibernate/bytecode/util/FieldFilter.java | 3 +- .../cache/AbstractJndiBoundCacheProvider.java | 7 +- .../main/java/org/hibernate/cache/Cache.java | 1 - .../cache/CacheConcurrencyStrategy.java | 2 - .../hibernate/cache/CacheDataDescription.java | 3 +- .../org/hibernate/cache/CacheException.java | 1 - .../java/org/hibernate/cache/CacheKey.java | 2 - .../org/hibernate/cache/CacheProvider.java | 1 - .../org/hibernate/cache/CollectionRegion.java | 5 +- .../org/hibernate/cache/EntityRegion.java | 5 +- .../java/org/hibernate/cache/FilterKey.java | 2 - .../hibernate/cache/GeneralDataRegion.java | 3 +- .../org/hibernate/cache/HashtableCache.java | 2 - .../cache/HashtableCacheProvider.java | 1 - .../org/hibernate/cache/NoCacheProvider.java | 1 - .../cache/NoCachingEnabledException.java | 1 - .../cache/NonstrictReadWriteCache.java | 25 +- .../org/hibernate/cache/OptimisticCache.java | 1 + .../cache/OptimisticCacheSource.java | 1 - .../java/org/hibernate/cache/QueryCache.java | 2 - .../hibernate/cache/QueryCacheFactory.java | 4 +- .../java/org/hibernate/cache/QueryKey.java | 9 +- .../hibernate/cache/QueryResultsRegion.java | 3 +- .../org/hibernate/cache/ReadOnlyCache.java | 14 +- .../org/hibernate/cache/ReadWriteCache.java | 34 +- .../main/java/org/hibernate/cache/Region.java | 3 +- .../org/hibernate/cache/RegionFactory.java | 4 +- .../hibernate/cache/StandardQueryCache.java | 20 +- .../cache/StandardQueryCacheFactory.java | 4 +- .../java/org/hibernate/cache/Timestamper.java | 1 + .../org/hibernate/cache/TimestampsRegion.java | 3 +- .../cache/TransactionAwareCache.java | 1 + .../hibernate/cache/TransactionalCache.java | 24 +- .../cache/TransactionalDataRegion.java | 3 +- .../cache/UpdateTimestampsCache.java | 15 +- .../hibernate/cache/access/AccessType.java | 3 +- .../CollectionRegionAccessStrategy.java | 3 +- .../access/EntityRegionAccessStrategy.java | 5 +- .../org/hibernate/cache/access/SoftLock.java | 3 +- .../org/hibernate/cache/entry/CacheEntry.java | 2 - .../cache/entry/CacheEntryStructure.java | 1 - .../cache/entry/CollectionCacheEntry.java | 2 - .../cache/entry/StructuredCacheEntry.java | 2 - .../entry/StructuredCollectionCacheEntry.java | 2 - .../cache/entry/StructuredMapCacheEntry.java | 2 - .../cache/entry/UnstructuredCacheEntry.java | 1 - .../cache/impl/CacheDataDescriptionImpl.java | 6 +- .../cache/impl/NoCachingRegionFactory.java | 18 +- .../bridge/BaseGeneralDataRegionAdapter.java | 5 +- .../cache/impl/bridge/BaseRegionAdapter.java | 6 +- .../BaseTransactionalDataRegionAdapter.java | 5 +- .../CollectionAccessStrategyAdapter.java | 9 +- .../impl/bridge/CollectionRegionAdapter.java | 9 +- .../bridge/EntityAccessStrategyAdapter.java | 5 +- .../impl/bridge/EntityRegionAdapter.java | 8 +- .../bridge/OptimisticCacheSourceAdapter.java | 6 +- .../bridge/QueryResultsRegionAdapter.java | 5 +- .../RegionFactoryCacheProviderBridge.java | 8 +- .../impl/bridge/TimestampsRegionAdapter.java | 5 +- .../hibernate/cfg/AbstractPropertyHolder.java | 2 - .../java/org/hibernate/cfg/AccessType.java | 1 + .../org/hibernate/cfg/AnnotatedClassType.java | 1 + .../org/hibernate/cfg/AnnotationBinder.java | 13 +- .../cfg/AnnotationConfiguration.java | 1 - .../java/org/hibernate/cfg/BinderHelper.java | 7 +- .../hibernate/cfg/ClassPropertyHolder.java | 6 +- .../cfg/CollectionPropertyHolder.java | 2 - .../hibernate/cfg/CollectionSecondPass.java | 11 +- .../org/hibernate/cfg/ColumnsBuilder.java | 2 - .../cfg/ComponentPropertyHolder.java | 2 - .../java/org/hibernate/cfg/Configuration.java | 74 +- .../CopyIdentifierComponentSecondPass.java | 2 - .../hibernate/cfg/CreateKeySecondPass.java | 4 +- .../DefaultComponentSafeNamingStrategy.java | 1 - .../hibernate/cfg/DefaultNamingStrategy.java | 4 +- .../hibernate/cfg/EJB3DTDEntityResolver.java | 9 +- .../org/hibernate/cfg/EJB3NamingStrategy.java | 2 - .../java/org/hibernate/cfg/Ejb3Column.java | 13 +- .../cfg/Ejb3DiscriminatorColumn.java | 2 - .../org/hibernate/cfg/Ejb3JoinColumn.java | 4 +- .../java/org/hibernate/cfg/Environment.java | 7 +- .../org/hibernate/cfg/ExtendedMappings.java | 1 + .../org/hibernate/cfg/ExtendsQueueEntry.java | 2 - .../java/org/hibernate/cfg/FkSecondPass.java | 2 - .../java/org/hibernate/cfg/HbmBinder.java | 25 +- .../hibernate/cfg/ImprovedNamingStrategy.java | 4 +- .../java/org/hibernate/cfg/IndexColumn.java | 3 - .../cfg/IndexOrUniqueKeySecondPass.java | 2 - .../org/hibernate/cfg/InheritanceState.java | 2 - .../cfg/JoinedSubclassFkSecondPass.java | 2 - .../main/java/org/hibernate/cfg/Mappings.java | 14 +- .../org/hibernate/cfg/MetadataSourceType.java | 1 - .../cfg/NamedSQLQuerySecondPass.java | 10 +- .../org/hibernate/cfg/NamingStrategy.java | 1 + .../cfg/NotYetImplementedException.java | 1 - .../hibernate/cfg/ObjectNameNormalizer.java | 1 - .../org/hibernate/cfg/ObjectNameSource.java | 1 + .../org/hibernate/cfg/OneToOneSecondPass.java | 2 - .../PkDrivenByDefaultMapsIdSecondPass.java | 2 - .../org/hibernate/cfg/PropertyContainer.java | 7 +- .../java/org/hibernate/cfg/PropertyData.java | 1 - .../org/hibernate/cfg/PropertyHolder.java | 4 +- .../hibernate/cfg/PropertyHolderBuilder.java | 2 - .../hibernate/cfg/PropertyInferredData.java | 2 - .../hibernate/cfg/PropertyPreloadedData.java | 1 - .../org/hibernate/cfg/QuerySecondPass.java | 1 + .../hibernate/cfg/RecoverableException.java | 1 - .../hibernate/cfg/ResultSetMappingBinder.java | 11 +- .../cfg/ResultSetMappingSecondPass.java | 2 - .../java/org/hibernate/cfg/SecondPass.java | 2 - .../cfg/SecondaryTableSecondPass.java | 2 - .../cfg/SetSimpleValueTypeSecondPass.java | 2 - .../main/java/org/hibernate/cfg/Settings.java | 2 - .../org/hibernate/cfg/SettingsFactory.java | 9 +- .../java/org/hibernate/cfg/ToOneBinder.java | 2 - .../org/hibernate/cfg/ToOneFkSecondPass.java | 6 +- .../hibernate/cfg/UniqueConstraintHolder.java | 1 + ...VerifyFetchProfileReferenceSecondPass.java | 2 - .../hibernate/cfg/WrappedInferredData.java | 3 +- .../cfg/annotations/ArrayBinder.java | 1 - .../hibernate/cfg/annotations/BagBinder.java | 1 - .../cfg/annotations/CollectionBinder.java | 19 +- .../cfg/annotations/CustomizableColumns.java | 2 - .../cfg/annotations/EntityBinder.java | 9 +- .../cfg/annotations/IdBagBinder.java | 4 +- .../hibernate/cfg/annotations/ListBinder.java | 7 +- .../hibernate/cfg/annotations/MapBinder.java | 2 - .../annotations/MapKeyColumnDelegator.java | 1 - .../MapKeyJoinColumnDelegator.java | 3 +- .../cfg/annotations/Nullability.java | 1 + .../cfg/annotations/PrimitiveArrayBinder.java | 1 - .../cfg/annotations/PropertyBinder.java | 11 +- .../cfg/annotations/QueryBinder.java | 30 +- .../ResultsetMappingSecondPass.java | 8 +- .../hibernate/cfg/annotations/SetBinder.java | 7 +- .../cfg/annotations/SimpleValueBinder.java | 11 +- .../cfg/annotations/TableBinder.java | 11 +- .../hibernate/cfg/annotations/Version.java | 3 +- .../reflection/JPAMetadataProvider.java | 3 - .../JPAOverridenAnnotationReader.java | 8 +- .../annotations/reflection/XMLContext.java | 17 +- .../BeanValidationActivator.java | 2 - .../BeanValidationEventListener.java | 8 +- .../beanvalidation/GroupsPerOperation.java | 10 +- .../HibernateTraversableResolver.java | 10 +- .../cfg/beanvalidation/TypeSafeActivator.java | 9 +- .../internal/ServicesRegistryBootstrap.java | 2 - .../HibernateSearchEventListenerRegister.java | 10 +- .../java/org/hibernate/classic/Lifecycle.java | 2 - .../java/org/hibernate/classic/Session.java | 3 - .../org/hibernate/classic/Validatable.java | 1 + .../hibernate/classic/ValidationFailure.java | 1 - .../AbstractPersistentCollection.java | 2 - .../collection/PersistentArrayHolder.java | 7 +- .../hibernate/collection/PersistentBag.java | 2 - .../collection/PersistentCollection.java | 2 - .../collection/PersistentElementHolder.java | 4 +- .../collection/PersistentIdentifierBag.java | 4 +- .../PersistentIndexedElementHolder.java | 4 +- .../hibernate/collection/PersistentList.java | 2 - .../PersistentListElementHolder.java | 2 - .../hibernate/collection/PersistentMap.java | 2 - .../PersistentMapElementHolder.java | 2 - .../hibernate/collection/PersistentSet.java | 2 - .../collection/PersistentSortedMap.java | 3 - .../collection/PersistentSortedSet.java | 2 - .../context/CurrentSessionContext.java | 4 +- .../hibernate/context/JTASessionContext.java | 7 +- .../context/ManagedSessionContext.java | 8 +- .../context/ThreadLocalSessionContext.java | 8 +- .../AbstractEmptinessExpression.java | 1 - .../criterion/AggregateProjection.java | 2 - .../criterion/AliasedProjection.java | 1 - .../hibernate/criterion/AvgProjection.java | 1 + .../criterion/BetweenExpression.java | 2 - .../org/hibernate/criterion/Conjunction.java | 1 + .../hibernate/criterion/CountProjection.java | 4 - .../hibernate/criterion/CriteriaQuery.java | 1 - .../criterion/CriteriaSpecification.java | 1 - .../org/hibernate/criterion/Criterion.java | 2 - .../hibernate/criterion/DetachedCriteria.java | 2 - .../org/hibernate/criterion/Disjunction.java | 1 + .../org/hibernate/criterion/Distinct.java | 1 - .../hibernate/criterion/EmptyExpression.java | 1 + .../criterion/EnhancedProjection.java | 6 - .../java/org/hibernate/criterion/Example.java | 2 - .../criterion/ExistsSubqueryExpression.java | 1 - .../org/hibernate/criterion/Expression.java | 1 - .../criterion/IdentifierEqExpression.java | 2 - .../criterion/IdentifierProjection.java | 1 - .../hibernate/criterion/IlikeExpression.java | 2 - .../org/hibernate/criterion/InExpression.java | 2 - .../org/hibernate/criterion/Junction.java | 2 - .../hibernate/criterion/LikeExpression.java | 3 +- .../criterion/LogicalExpression.java | 2 - .../org/hibernate/criterion/MatchMode.java | 1 - .../criterion/NaturalIdentifier.java | 1 - .../criterion/NotEmptyExpression.java | 1 + .../hibernate/criterion/NotExpression.java | 2 - .../criterion/NotNullExpression.java | 2 - .../hibernate/criterion/NullExpression.java | 2 - .../java/org/hibernate/criterion/Order.java | 2 - .../org/hibernate/criterion/Projection.java | 3 - .../hibernate/criterion/ProjectionList.java | 2 - .../org/hibernate/criterion/Projections.java | 1 - .../org/hibernate/criterion/Property.java | 1 - .../criterion/PropertyExpression.java | 1 - .../criterion/PropertyProjection.java | 1 - .../criterion/PropertySubqueryExpression.java | 1 - .../org/hibernate/criterion/Restrictions.java | 2 - .../criterion/RowCountProjection.java | 2 - .../org/hibernate/criterion/SQLCriterion.java | 1 - .../hibernate/criterion/SQLProjection.java | 2 - .../hibernate/criterion/SimpleExpression.java | 3 - .../hibernate/criterion/SimpleProjection.java | 3 - .../criterion/SimpleSubqueryExpression.java | 1 - .../hibernate/criterion/SizeExpression.java | 1 - .../org/hibernate/criterion/Subqueries.java | 1 + .../criterion/SubqueryExpression.java | 3 +- .../dialect/AbstractTransactSQLDialect.java | 4 +- .../org/hibernate/dialect/Cache71Dialect.java | 19 +- .../org/hibernate/dialect/DB2390Dialect.java | 1 + .../org/hibernate/dialect/DB2400Dialect.java | 1 + .../org/hibernate/dialect/DB2Dialect.java | 4 +- .../dialect/DataDirectOracle9Dialect.java | 1 - .../org/hibernate/dialect/DerbyDialect.java | 7 +- .../java/org/hibernate/dialect/Dialect.java | 6 +- .../hibernate/dialect/FirebirdDialect.java | 1 + .../hibernate/dialect/FrontBaseDialect.java | 15 +- .../java/org/hibernate/dialect/H2Dialect.java | 7 +- .../org/hibernate/dialect/HSQLDialect.java | 7 +- .../hibernate/dialect/InformixDialect.java | 2 - .../hibernate/dialect/Ingres10Dialect.java | 2 - .../org/hibernate/dialect/Ingres9Dialect.java | 2 - .../org/hibernate/dialect/IngresDialect.java | 4 +- .../hibernate/dialect/InterbaseDialect.java | 2 - .../hibernate/dialect/JDataStoreDialect.java | 2 - .../org/hibernate/dialect/MckoiDialect.java | 13 +- .../hibernate/dialect/MimerSQLDialect.java | 2 - .../org/hibernate/dialect/MySQL5Dialect.java | 1 - .../dialect/MySQL5InnoDBDialect.java | 1 + .../org/hibernate/dialect/MySQLDialect.java | 2 - .../hibernate/dialect/MySQLInnoDBDialect.java | 1 + .../hibernate/dialect/MySQLMyISAMDialect.java | 1 + .../hibernate/dialect/Oracle10gDialect.java | 3 +- .../hibernate/dialect/Oracle8iDialect.java | 28 +- .../org/hibernate/dialect/Oracle9Dialect.java | 7 +- .../hibernate/dialect/Oracle9iDialect.java | 4 +- .../org/hibernate/dialect/OracleDialect.java | 7 +- .../hibernate/dialect/PointbaseDialect.java | 15 +- .../hibernate/dialect/PostgreSQLDialect.java | 2 - .../dialect/PostgresPlusDialect.java | 6 +- .../hibernate/dialect/ProgressDialect.java | 1 - .../hibernate/dialect/RDMSOS2200Dialect.java | 7 +- .../ResultColumnReferenceStrategy.java | 7 +- .../org/hibernate/dialect/SAPDBDialect.java | 4 +- .../dialect/SQLServer2005Dialect.java | 2 - .../dialect/SQLServer2008Dialect.java | 2 - .../hibernate/dialect/SQLServerDialect.java | 4 +- .../hibernate/dialect/Sybase11Dialect.java | 1 - .../hibernate/dialect/SybaseASE15Dialect.java | 2 - .../dialect/SybaseAnywhereDialect.java | 1 + .../org/hibernate/dialect/SybaseDialect.java | 1 + .../hibernate/dialect/TeradataDialect.java | 4 +- .../hibernate/dialect/TimesTenDialect.java | 13 +- .../java/org/hibernate/dialect/TypeNames.java | 4 +- .../AbstractAnsiTrimEmulationFunction.java | 6 +- .../function/AnsiTrimEmulationFunction.java | 3 +- .../dialect/function/AnsiTrimFunction.java | 1 - .../function/AvgWithArgumentCastFunction.java | 1 - .../dialect/function/CastFunction.java | 2 - .../dialect/function/CharIndexFunction.java | 2 - .../dialect/function/ClassicAvgFunction.java | 4 +- .../function/ClassicCountFunction.java | 3 +- .../dialect/function/ClassicSumFunction.java | 3 +- .../ConditionalParenthesisFunction.java | 4 +- .../dialect/function/ConvertFunction.java | 4 +- .../dialect/function/DerbyConcatFunction.java | 4 +- .../dialect/function/NoArgSQLFunction.java | 2 - .../dialect/function/NvlFunction.java | 2 - .../function/PositionSubstringFunction.java | 2 - .../dialect/function/SQLFunction.java | 2 - .../dialect/function/SQLFunctionRegistry.java | 4 +- .../dialect/function/SQLFunctionTemplate.java | 4 +- .../StandardAnsiSqlAggregationFunctions.java | 2 - .../function/StandardJDBCEscapeFunction.java | 6 +- .../dialect/function/StandardSQLFunction.java | 2 - .../dialect/function/TemplateRenderer.java | 7 +- .../function/TrimFunctionTemplate.java | 2 - .../dialect/function/VarArgsSQLFunction.java | 2 - .../lock/AbstractSelectLockingStrategy.java | 1 - .../dialect/lock/LockingStrategy.java | 8 +- ...timisticForceIncrementLockingStrategy.java | 2 - .../lock/OptimisticLockingStrategy.java | 1 - ...simisticForceIncrementLockingStrategy.java | 2 - .../PessimisticReadSelectLockingStrategy.java | 22 +- .../PessimisticReadUpdateLockingStrategy.java | 8 +- ...PessimisticWriteSelectLockingStrategy.java | 22 +- ...PessimisticWriteUpdateLockingStrategy.java | 8 +- .../dialect/lock/SelectLockingStrategy.java | 20 +- .../dialect/lock/UpdateLockingStrategy.java | 7 +- .../resolver/BasicSQLExceptionConverter.java | 8 +- .../org/hibernate/engine/ActionQueue.java | 9 +- .../org/hibernate/engine/AssociationKey.java | 1 - .../org/hibernate/engine/BatchFetchQueue.java | 2 - .../java/org/hibernate/engine/Cascade.java | 6 +- .../org/hibernate/engine/CascadeStyle.java | 2 - .../org/hibernate/engine/CascadingAction.java | 7 +- .../org/hibernate/engine/CollectionEntry.java | 13 +- .../org/hibernate/engine/CollectionKey.java | 10 +- .../org/hibernate/engine/Collections.java | 36 +- .../org/hibernate/engine/EntityEntry.java | 6 +- .../java/org/hibernate/engine/EntityKey.java | 6 +- .../org/hibernate/engine/EntityUniqueKey.java | 10 +- .../engine/ExecuteUpdateResultCheckStyle.java | 7 +- .../hibernate/engine/FilterDefinition.java | 6 +- .../org/hibernate/engine/ForeignKeys.java | 2 - .../hibernate/engine/HibernateIterator.java | 4 +- .../org/hibernate/engine/IdentifierValue.java | 7 +- .../java/org/hibernate/engine/JoinHelper.java | 1 - .../org/hibernate/engine/JoinSequence.java | 4 +- .../engine/LoadQueryInfluencers.java | 12 +- .../java/org/hibernate/engine/Mapping.java | 1 - .../engine/NamedQueryDefinition.java | 2 - .../engine/NamedSQLQueryDefinition.java | 4 +- .../hibernate/engine/NonFlushedChanges.java | 8 - .../org/hibernate/engine/Nullability.java | 2 - .../org/hibernate/engine/ParameterBinder.java | 9 +- .../hibernate/engine/PersistenceContext.java | 4 +- .../org/hibernate/engine/QueryParameters.java | 7 +- .../engine/ResultSetMappingDefinition.java | 4 +- .../org/hibernate/engine/RowSelection.java | 1 + .../engine/SessionFactoryImplementor.java | 25 +- .../hibernate/engine/SessionImplementor.java | 4 +- .../engine/StatefulPersistenceContext.java | 12 +- .../java/org/hibernate/engine/Status.java | 5 +- .../org/hibernate/engine/SubselectFetch.java | 2 - .../hibernate/engine/TransactionHelper.java | 3 - .../org/hibernate/engine/TwoPhaseLoad.java | 19 +- .../java/org/hibernate/engine/TypedValue.java | 2 - .../hibernate/engine/UnsavedValueFactory.java | 2 - .../org/hibernate/engine/ValueInclusion.java | 5 +- .../org/hibernate/engine/VersionValue.java | 7 +- .../java/org/hibernate/engine/Versioning.java | 7 +- .../engine/jdbc/AbstractLobCreator.java | 1 - .../engine/jdbc/BlobImplementer.java | 1 + .../org/hibernate/engine/jdbc/BlobProxy.java | 6 +- .../engine/jdbc/ClobImplementer.java | 1 + .../org/hibernate/engine/jdbc/ClobProxy.java | 10 +- .../engine/jdbc/ColumnNameCache.java | 3 +- .../engine/jdbc/ContextualLobCreator.java | 14 +- .../hibernate/engine/jdbc/JdbcSupport.java | 1 - .../engine/jdbc/LobCreationContext.java | 1 - .../org/hibernate/engine/jdbc/LobCreator.java | 5 +- .../engine/jdbc/NClobImplementer.java | 1 + .../org/hibernate/engine/jdbc/NClobProxy.java | 3 +- .../engine/jdbc/NonContextualLobCreator.java | 5 +- .../engine/jdbc/ReaderInputStream.java | 1 - .../engine/jdbc/ResultSetWrapperProxy.java | 13 +- .../engine/jdbc/SerializableBlobProxy.java | 12 +- .../engine/jdbc/SerializableClobProxy.java | 6 +- .../engine/jdbc/SerializableNClobProxy.java | 3 +- .../hibernate/engine/jdbc/StreamUtils.java | 3 +- .../hibernate/engine/jdbc/WrappedBlob.java | 1 - .../hibernate/engine/jdbc/WrappedClob.java | 1 - .../batch/internal/AbstractBatchImpl.java | 9 +- .../jdbc/batch/internal/BatchBuilder.java | 7 +- .../jdbc/batch/internal/BatchingBatch.java | 15 +- .../jdbc/batch/internal/NonBatchingBatch.java | 7 +- .../engine/jdbc/batch/spi/Batch.java | 2 - .../engine/jdbc/batch/spi/BatchObserver.java | 1 + .../jdbc/internal/ConnectionManagerImpl.java | 8 +- .../engine/jdbc/internal/JDBCContextImpl.java | 11 +- .../internal/JdbcResourceRegistryImpl.java | 14 +- .../jdbc/internal/JdbcServicesImpl.java | 7 +- .../jdbc/internal/JdbcServicesInitiator.java | 4 +- .../jdbc/internal/LogicalConnectionImpl.java | 31 +- .../jdbc/internal/StatementPreparer.java | 6 +- .../internal/proxy/AbstractProxyHandler.java | 2 - .../proxy/AbstractResultSetProxyHandler.java | 8 +- .../proxy/AbstractStatementProxyHandler.java | 8 +- .../proxy/BasicStatementProxyHandler.java | 1 - .../proxy/CallableStatementProxyHandler.java | 11 +- .../proxy/ConnectionProxyHandler.java | 8 +- .../proxy/DatabaseMetaDataProxyHandler.java | 1 - .../proxy/ImplicitResultSetProxyHandler.java | 2 - .../proxy/ImplicitStatementProxyHandler.java | 2 - .../proxy/PreparedStatementProxyHandler.java | 8 +- .../jdbc/internal/proxy/ProxyBuilder.java | 5 +- .../internal/proxy/ResultSetProxyHandler.java | 2 - .../engine/jdbc/spi/ConnectionManager.java | 3 - .../engine/jdbc/spi/ConnectionObserver.java | 1 - .../jdbc/spi/ExtractedDatabaseMetaData.java | 2 - .../engine/jdbc/spi/InvalidatableWrapper.java | 1 + .../engine/jdbc/spi/JDBCContext.java | 2 - .../engine/jdbc/spi/JdbcResourceRegistry.java | 1 - .../engine/jdbc/spi/JdbcServices.java | 2 - .../engine/jdbc/spi/JdbcWrapper.java | 1 + .../engine/jdbc/spi/LogicalConnection.java | 2 - .../spi/LogicalConnectionImplementor.java | 1 - .../engine/jdbc/spi/SQLExceptionHelper.java | 24 +- .../engine/jdbc/spi/SQLStatementLogger.java | 9 +- .../engine/jdbc/spi/SchemaNameResolver.java | 1 - .../engine/loading/CollectionLoadContext.java | 25 +- .../engine/loading/EntityLoadContext.java | 9 +- .../engine/loading/LoadContexts.java | 9 +- .../loading/LoadingCollectionEntry.java | 4 +- .../hibernate/engine/profile/Association.java | 1 - .../org/hibernate/engine/profile/Fetch.java | 1 + .../engine/profile/FetchProfile.java | 7 +- .../engine/query/FilterQueryPlan.java | 4 +- .../hibernate/engine/query/HQLQueryPlan.java | 7 +- .../query/NamedParameterDescriptor.java | 4 +- .../engine/query/NativeSQLQueryPlan.java | 13 +- .../query/OrdinalParameterDescriptor.java | 4 +- .../engine/query/ParamLocationRecognizer.java | 8 +- .../engine/query/ParameterMetadata.java | 2 - .../engine/query/ParameterParser.java | 1 - .../hibernate/engine/query/QueryMetadata.java | 4 +- .../engine/query/QueryPlanCache.java | 7 +- .../engine/query/ReturnMetadata.java | 4 +- .../sql/NativeSQLQueryCollectionReturn.java | 4 +- .../query/sql/NativeSQLQueryJoinReturn.java | 4 +- .../sql/NativeSQLQueryNonScalarReturn.java | 4 +- .../query/sql/NativeSQLQueryReturn.java | 3 +- .../query/sql/NativeSQLQueryRootReturn.java | 4 +- .../query/sql/NativeSQLQueryScalarReturn.java | 3 +- .../sql/NativeSQLQuerySpecification.java | 12 +- .../engine/transaction/IsolatedWork.java | 4 +- .../engine/transaction/Isolater.java | 12 +- .../NullSynchronizationException.java | 1 - .../transaction/SynchronizationRegistry.java | 8 +- .../event/AbstractCollectionEvent.java | 2 - .../org/hibernate/event/AbstractEvent.java | 1 - .../AbstractPreDatabaseOperationEvent.java | 2 - .../org/hibernate/event/AutoFlushEvent.java | 1 - .../event/AutoFlushEventListener.java | 4 +- .../java/org/hibernate/event/DeleteEvent.java | 1 + .../hibernate/event/DeleteEventListener.java | 4 +- .../org/hibernate/event/Destructible.java | 1 + .../org/hibernate/event/DirtyCheckEvent.java | 1 + .../event/DirtyCheckEventListener.java | 4 +- .../org/hibernate/event/EventListeners.java | 6 +- .../java/org/hibernate/event/EventSource.java | 2 - .../java/org/hibernate/event/EvictEvent.java | 1 + .../hibernate/event/EvictEventListener.java | 4 +- .../org/hibernate/event/FlushEntityEvent.java | 1 - .../event/FlushEntityEventListener.java | 2 - .../java/org/hibernate/event/FlushEvent.java | 1 + .../hibernate/event/FlushEventListener.java | 4 +- .../org/hibernate/event/Initializable.java | 1 - .../event/InitializeCollectionEvent.java | 1 - .../InitializeCollectionEventListener.java | 4 +- .../java/org/hibernate/event/LoadEvent.java | 2 - .../hibernate/event/LoadEventListener.java | 4 +- .../java/org/hibernate/event/LockEvent.java | 1 - .../hibernate/event/LockEventListener.java | 4 +- .../java/org/hibernate/event/MergeEvent.java | 1 - .../hibernate/event/MergeEventListener.java | 2 - .../org/hibernate/event/PersistEvent.java | 1 + .../hibernate/event/PersistEventListener.java | 2 - .../event/PostCollectionRecreateEvent.java | 1 - .../PostCollectionRecreateEventListener.java | 1 - .../event/PostCollectionRemoveEvent.java | 1 - .../PostCollectionRemoveEventListener.java | 1 - .../event/PostCollectionUpdateEvent.java | 1 - .../PostCollectionUpdateEventListener.java | 1 - .../org/hibernate/event/PostDeleteEvent.java | 2 - .../event/PostDeleteEventListener.java | 1 - .../org/hibernate/event/PostInsertEvent.java | 2 - .../event/PostInsertEventListener.java | 1 - .../org/hibernate/event/PostLoadEvent.java | 2 - .../event/PostLoadEventListener.java | 1 - .../org/hibernate/event/PostUpdateEvent.java | 2 - .../event/PostUpdateEventListener.java | 1 - .../event/PreCollectionRecreateEvent.java | 1 - .../PreCollectionRecreateEventListener.java | 1 - .../event/PreCollectionRemoveEvent.java | 1 - .../PreCollectionRemoveEventListener.java | 1 - .../event/PreCollectionUpdateEvent.java | 1 - .../PreCollectionUpdateEventListener.java | 1 - .../org/hibernate/event/PreDeleteEvent.java | 2 - .../event/PreDeleteEventListener.java | 1 - .../org/hibernate/event/PreInsertEvent.java | 2 - .../event/PreInsertEventListener.java | 1 - .../org/hibernate/event/PreLoadEvent.java | 2 - .../hibernate/event/PreLoadEventListener.java | 1 - .../org/hibernate/event/PreUpdateEvent.java | 2 - .../event/PreUpdateEventListener.java | 1 - .../org/hibernate/event/RefreshEvent.java | 1 - .../hibernate/event/RefreshEventListener.java | 4 +- .../org/hibernate/event/ReplicateEvent.java | 1 - .../event/ReplicateEventListener.java | 4 +- .../hibernate/event/SaveOrUpdateEvent.java | 2 - .../event/SaveOrUpdateEventListener.java | 2 - .../def/AbstractFlushingEventListener.java | 29 +- .../def/AbstractLockUpgradeEventListener.java | 8 +- .../def/AbstractReassociateEventListener.java | 8 +- .../event/def/AbstractSaveEventListener.java | 22 +- .../hibernate/event/def/AbstractVisitor.java | 1 - .../def/DefaultAutoFlushEventListener.java | 8 +- .../event/def/DefaultDeleteEventListener.java | 12 +- .../def/DefaultDirtyCheckEventListener.java | 12 +- .../event/def/DefaultEvictEventListener.java | 8 +- .../def/DefaultFlushEntityEventListener.java | 8 +- .../event/def/DefaultFlushEventListener.java | 1 - ...aultInitializeCollectionEventListener.java | 8 +- .../event/def/DefaultLoadEventListener.java | 12 +- .../event/def/DefaultLockEventListener.java | 4 +- .../event/def/DefaultMergeEventListener.java | 8 +- .../def/DefaultPersistEventListener.java | 10 +- .../DefaultPersistOnFlushEventListener.java | 1 - .../def/DefaultPostLoadEventListener.java | 1 - .../def/DefaultPreLoadEventListener.java | 1 - .../def/DefaultRefreshEventListener.java | 8 +- .../def/DefaultReplicateEventListener.java | 8 +- .../event/def/DefaultSaveEventListener.java | 4 +- .../DefaultSaveOrUpdateCopyEventListener.java | 1 - .../def/DefaultSaveOrUpdateEventListener.java | 13 +- .../event/def/DefaultUpdateEventListener.java | 3 - .../def/DirtyCollectionSearchVisitor.java | 1 - .../org/hibernate/event/def/EventCache.java | 8 +- .../org/hibernate/event/def/EvictVisitor.java | 15 +- .../org/hibernate/event/def/FlushVisitor.java | 1 - .../hibernate/event/def/OnLockVisitor.java | 2 - .../event/def/OnReplicateVisitor.java | 2 - .../hibernate/event/def/OnUpdateVisitor.java | 2 - .../org/hibernate/event/def/ProxyVisitor.java | 2 - .../hibernate/event/def/ReattachVisitor.java | 7 +- .../org/hibernate/event/def/WrapVisitor.java | 7 +- .../exception/CacheSQLStateConverter.java | 6 +- .../org/hibernate/exception/Configurable.java | 4 +- .../ConstraintViolationException.java | 4 +- .../hibernate/exception/DataException.java | 4 +- .../exception/GenericJDBCException.java | 4 +- .../exception/JDBCConnectionException.java | 4 +- .../exception/JDBCExceptionHelper.java | 4 +- .../exception/LockAcquisitionException.java | 4 +- .../exception/SQLExceptionConverter.java | 4 +- .../SQLExceptionConverterFactory.java | 8 +- .../exception/SQLGrammarException.java | 4 +- .../exception/SQLStateConverter.java | 8 +- ...platedViolatedConstraintNameExtracter.java | 1 + .../ViolatedConstraintNameExtracter.java | 1 - .../hibernate/hql/CollectionProperties.java | 4 +- .../hql/CollectionSubqueryFactory.java | 8 +- .../org/hibernate/hql/FilterTranslator.java | 4 +- .../org/hibernate/hql/HolderInstantiator.java | 2 - .../java/org/hibernate/hql/NameGenerator.java | 1 - .../hibernate/hql/ParameterTranslations.java | 3 +- .../hql/QueryExecutionRequestException.java | 3 +- .../java/org/hibernate/hql/QuerySplitter.java | 7 +- .../org/hibernate/hql/QueryTranslator.java | 10 +- .../hibernate/hql/QueryTranslatorFactory.java | 4 +- .../hql/ast/ASTQueryTranslatorFactory.java | 8 +- .../hql/ast/DetailedSemanticException.java | 4 +- .../org/hibernate/hql/ast/ErrorCounter.java | 11 +- .../org/hibernate/hql/ast/ErrorReporter.java | 1 - .../org/hibernate/hql/ast/HqlASTFactory.java | 3 +- .../java/org/hibernate/hql/ast/HqlLexer.java | 4 +- .../java/org/hibernate/hql/ast/HqlParser.java | 13 +- .../org/hibernate/hql/ast/HqlSqlWalker.java | 29 +- .../java/org/hibernate/hql/ast/HqlToken.java | 1 + .../hql/ast/InvalidPathException.java | 1 - .../hql/ast/InvalidWithClauseException.java | 3 +- .../hql/ast/ParameterTranslationsImpl.java | 22 +- .../hibernate/hql/ast/ParseErrorHandler.java | 1 - .../hql/ast/QuerySyntaxException.java | 3 +- .../hql/ast/QueryTranslatorImpl.java | 19 +- .../org/hibernate/hql/ast/SqlASTFactory.java | 32 +- .../org/hibernate/hql/ast/SqlGenerator.java | 7 +- .../hql/ast/TypeDiscriminatorMetadata.java | 1 - .../ast/exec/AbstractStatementExecutor.java | 16 +- .../hibernate/hql/ast/exec/BasicExecutor.java | 1 - .../ast/exec/MultiTableDeleteExecutor.java | 8 +- .../ast/exec/MultiTableUpdateExecutor.java | 8 +- .../hql/ast/exec/StatementExecutor.java | 1 - .../ast/tree/AbstractMapComponentNode.java | 9 +- .../ast/tree/AbstractNullnessCheckNode.java | 8 +- .../tree/AbstractRestrictableStatement.java | 5 +- .../ast/tree/AbstractSelectExpression.java | 2 - .../hql/ast/tree/AbstractStatement.java | 1 - .../hibernate/hql/ast/tree/AggregateNode.java | 7 +- .../ast/tree/AggregatedSelectExpression.java | 2 - .../hql/ast/tree/AssignmentSpecification.java | 7 +- .../hql/ast/tree/BetweenOperatorNode.java | 3 +- .../tree/BinaryArithmeticOperatorNode.java | 4 +- .../hql/ast/tree/BinaryLogicOperatorNode.java | 13 +- .../hql/ast/tree/BinaryOperatorNode.java | 1 + .../hql/ast/tree/BooleanLiteralNode.java | 7 +- .../org/hibernate/hql/ast/tree/Case2Node.java | 2 - .../org/hibernate/hql/ast/tree/CaseNode.java | 2 - .../hql/ast/tree/CollectionFunction.java | 1 - .../hibernate/hql/ast/tree/ComponentJoin.java | 10 +- .../hql/ast/tree/ConstructorNode.java | 9 +- .../org/hibernate/hql/ast/tree/CountNode.java | 2 - .../hql/ast/tree/DeleteStatement.java | 9 +- .../hql/ast/tree/DisplayableNode.java | 1 + .../org/hibernate/hql/ast/tree/DotNode.java | 50 +- .../hql/ast/tree/ExpectedTypeAwareNode.java | 3 +- .../hibernate/hql/ast/tree/FromClause.java | 13 +- .../hibernate/hql/ast/tree/FromElement.java | 9 +- .../hql/ast/tree/FromElementFactory.java | 23 +- .../hql/ast/tree/FromElementType.java | 9 +- .../hql/ast/tree/FromReferenceNode.java | 9 +- .../hibernate/hql/ast/tree/FunctionNode.java | 1 - .../hql/ast/tree/HqlSqlWalkerNode.java | 2 - .../org/hibernate/hql/ast/tree/IdentNode.java | 8 +- .../hql/ast/tree/ImpliedFromElement.java | 1 + .../hql/ast/tree/InLogicOperatorNode.java | 7 +- .../org/hibernate/hql/ast/tree/IndexNode.java | 13 +- .../hql/ast/tree/InitializeableNode.java | 1 + .../hql/ast/tree/InsertStatement.java | 1 - .../hibernate/hql/ast/tree/IntoClause.java | 5 +- .../ast/tree/IsNotNullLogicOperatorNode.java | 1 - .../hql/ast/tree/IsNullLogicOperatorNode.java | 1 - .../hql/ast/tree/JavaConstantNode.java | 14 +- .../hibernate/hql/ast/tree/LiteralNode.java | 2 - .../hibernate/hql/ast/tree/MapEntryNode.java | 15 +- .../hibernate/hql/ast/tree/MapKeyNode.java | 3 +- .../hibernate/hql/ast/tree/MapValueNode.java | 3 +- .../hibernate/hql/ast/tree/MethodNode.java | 11 +- .../java/org/hibernate/hql/ast/tree/Node.java | 7 +- .../hibernate/hql/ast/tree/OperatorNode.java | 1 - .../hibernate/hql/ast/tree/OrderByClause.java | 2 - .../hql/ast/tree/ParameterContainer.java | 1 - .../hibernate/hql/ast/tree/ParameterNode.java | 3 +- .../org/hibernate/hql/ast/tree/PathNode.java | 1 + .../org/hibernate/hql/ast/tree/QueryNode.java | 11 +- .../hql/ast/tree/ResolvableNode.java | 1 - .../hql/ast/tree/RestrictableStatement.java | 1 - .../hql/ast/tree/ResultVariableRefNode.java | 4 +- .../hibernate/hql/ast/tree/SelectClause.java | 6 +- .../hql/ast/tree/SelectExpression.java | 2 - .../hql/ast/tree/SelectExpressionImpl.java | 1 - .../hql/ast/tree/SelectExpressionList.java | 3 - .../hql/ast/tree/SessionFactoryAwareNode.java | 3 +- .../hibernate/hql/ast/tree/SqlFragment.java | 6 +- .../org/hibernate/hql/ast/tree/SqlNode.java | 1 - .../org/hibernate/hql/ast/tree/Statement.java | 1 - .../hql/ast/tree/UnaryArithmeticNode.java | 2 - .../hql/ast/tree/UnaryLogicOperatorNode.java | 3 +- .../hql/ast/tree/UnaryOperatorNode.java | 1 + .../hql/ast/tree/UpdateStatement.java | 9 +- .../hibernate/hql/ast/util/ASTAppender.java | 1 - .../hibernate/hql/ast/util/ASTIterator.java | 2 - .../hql/ast/util/ASTParentsFirstIterator.java | 2 - .../hibernate/hql/ast/util/ASTPrinter.java | 3 - .../org/hibernate/hql/ast/util/ASTUtil.java | 10 +- .../hql/ast/util/AliasGenerator.java | 1 - .../hibernate/hql/ast/util/ColumnHelper.java | 2 - .../hibernate/hql/ast/util/JoinProcessor.java | 9 +- .../hql/ast/util/LiteralProcessor.java | 13 +- .../hibernate/hql/ast/util/NodeTraverser.java | 3 +- .../hibernate/hql/ast/util/PathHelper.java | 9 +- .../hql/ast/util/SessionFactoryHelper.java | 3 - .../hql/ast/util/SyntheticAndFactory.java | 11 +- .../ClassicQueryTranslatorFactory.java | 4 +- .../hibernate/hql/classic/ClauseParser.java | 4 +- .../org/hibernate/hql/classic/FromParser.java | 6 +- .../hql/classic/FromPathExpressionParser.java | 1 - .../hibernate/hql/classic/GroupByParser.java | 1 - .../hibernate/hql/classic/HavingParser.java | 1 + .../hibernate/hql/classic/OrderByParser.java | 1 - .../org/hibernate/hql/classic/Parser.java | 1 - .../hibernate/hql/classic/ParserHelper.java | 4 +- .../hql/classic/PathExpressionParser.java | 3 - .../hql/classic/PreprocessingParser.java | 8 +- .../hql/classic/QueryTranslatorImpl.java | 19 +- .../hibernate/hql/classic/SelectParser.java | 10 +- .../classic/SelectPathExpressionParser.java | 1 - .../hibernate/hql/classic/WhereParser.java | 3 - .../id/AbstractPostInsertGenerator.java | 2 - .../hibernate/id/AbstractUUIDGenerator.java | 1 - .../main/java/org/hibernate/id/Assigned.java | 2 - ...ompositeNestedGeneratedValueGenerator.java | 2 - .../java/org/hibernate/id/Configurable.java | 2 - .../org/hibernate/id/ForeignGenerator.java | 2 - .../java/org/hibernate/id/GUIDGenerator.java | 7 +- .../id/IdentifierGenerationException.java | 1 - .../org/hibernate/id/IdentifierGenerator.java | 4 +- .../id/IdentifierGeneratorAggregator.java | 1 - .../id/IdentifierGeneratorHelper.java | 10 +- .../org/hibernate/id/IdentityGenerator.java | 20 +- .../org/hibernate/id/IncrementGenerator.java | 11 +- .../hibernate/id/IntegralDataTypeHolder.java | 1 - .../id/MultipleHiLoPerTableGenerator.java | 8 +- .../id/PersistentIdentifierGenerator.java | 1 - .../id/PostInsertIdentifierGenerator.java | 1 - .../id/PostInsertIdentityPersister.java | 1 - .../id/ResultSetIdentifierConsumer.java | 3 +- .../org/hibernate/id/SelectGenerator.java | 10 +- .../org/hibernate/id/SequenceGenerator.java | 9 +- .../hibernate/id/SequenceHiLoGenerator.java | 2 - .../id/SequenceIdentityGenerator.java | 10 +- .../java/org/hibernate/id/TableGenerator.java | 7 +- .../org/hibernate/id/TableHiLoGenerator.java | 2 - .../hibernate/id/UUIDGenerationStrategy.java | 2 - .../java/org/hibernate/id/UUIDGenerator.java | 7 +- .../org/hibernate/id/UUIDHexGenerator.java | 7 +- .../hibernate/id/enhanced/AccessCallback.java | 3 +- .../id/enhanced/DatabaseStructure.java | 5 +- .../org/hibernate/id/enhanced/Optimizer.java | 4 +- .../id/enhanced/OptimizerFactory.java | 9 +- .../id/enhanced/SequenceStructure.java | 11 +- .../id/enhanced/SequenceStyleGenerator.java | 8 +- .../hibernate/id/enhanced/TableGenerator.java | 7 +- .../hibernate/id/enhanced/TableStructure.java | 9 +- .../DefaultIdentifierGeneratorFactory.java | 12 +- .../factory/IdentifierGeneratorFactory.java | 5 +- .../id/insert/AbstractReturningDelegate.java | 10 +- .../id/insert/AbstractSelectingDelegate.java | 14 +- .../java/org/hibernate/id/insert/Binder.java | 3 +- .../id/insert/IdentifierGeneratingInsert.java | 5 +- .../InsertGeneratedIdentifierDelegate.java | 6 +- .../id/insert/InsertSelectIdentityInsert.java | 3 +- .../id/uuid/CustomVersionOneStrategy.java | 2 - .../java/org/hibernate/id/uuid/Helper.java | 2 - .../id/uuid/StandardRandomStrategy.java | 2 - .../org/hibernate/impl/AbstractQueryImpl.java | 5 +- .../impl/AbstractScrollableResults.java | 8 +- .../hibernate/impl/AbstractSessionImpl.java | 10 +- .../hibernate/impl/CollectionFilterImpl.java | 2 - .../java/org/hibernate/impl/CriteriaImpl.java | 2 - .../impl/FetchingScrollableResultsImpl.java | 17 +- .../java/org/hibernate/impl/FilterImpl.java | 2 - .../java/org/hibernate/impl/IteratorImpl.java | 23 +- .../hibernate/impl/NonFlushedChangesImpl.java | 13 +- .../java/org/hibernate/impl/QueryImpl.java | 4 +- .../java/org/hibernate/impl/SQLQueryImpl.java | 16 +- .../hibernate/impl/ScrollableResultsImpl.java | 9 +- .../hibernate/impl/SessionFactoryImpl.java | 49 +- .../impl/SessionFactoryObjectFactory.java | 32 +- .../java/org/hibernate/impl/SessionImpl.java | 29 +- .../hibernate/impl/StatelessSessionImpl.java | 7 +- .../org/hibernate/impl/TypeLocatorImpl.java | 2 - .../intercept/AbstractFieldInterceptor.java | 8 +- .../intercept/FieldInterceptionHelper.java | 4 +- .../hibernate/intercept/FieldInterceptor.java | 1 - .../intercept/LazyPropertyInitializer.java | 2 - .../intercept/cglib/CGLIBHelper.java | 8 +- .../intercept/cglib/FieldInterceptorImpl.java | 5 +- .../javassist/FieldInterceptorImpl.java | 4 +- .../intercept/javassist/JavassistHelper.java | 8 +- .../internal/util/beans/BeanInfoHelper.java | 1 - .../beans/BeanIntrospectionException.java | 2 +- .../util/config/ConfigurationException.java | 1 - .../util/config/ConfigurationHelper.java | 4 +- .../internal/util/jdbc/TypeInfo.java | 1 + .../internal/util/jdbc/TypeInfoExtracter.java | 7 +- .../internal/util/jdbc/TypeNullability.java | 1 - .../internal/util/jdbc/TypeSearchability.java | 1 - .../internal/util/jndi/JndiException.java | 1 - .../internal/util/jndi/JndiHelper.java | 13 +- .../internal/util/jta/JtaStatusHelper.java | 2 - .../hibernate/jdbc/BatchFailedException.java | 3 +- .../BatchedTooManyRowsAffectedException.java | 3 +- .../jdbc/BorrowedConnectionProxy.java | 8 +- .../org/hibernate/jdbc/ConnectionWrapper.java | 3 +- .../java/org/hibernate/jdbc/Expectation.java | 8 +- .../java/org/hibernate/jdbc/Expectations.java | 11 +- .../jdbc/TooManyRowsAffectedException.java | 3 +- .../main/java/org/hibernate/jdbc/Work.java | 2 - .../jdbc/util/BasicFormatterImpl.java | 2 - .../hibernate/jdbc/util/DDLFormatterImpl.java | 1 - .../org/hibernate/jdbc/util/FormatStyle.java | 1 + .../org/hibernate/jdbc/util/Formatter.java | 1 + .../jdbc/util/SQLStatementLogger.java | 9 +- .../org/hibernate/jmx/HibernateService.java | 9 +- .../hibernate/jmx/HibernateServiceMBean.java | 1 - .../org/hibernate/jmx/SessionFactoryStub.java | 11 +- .../org/hibernate/jmx/StatisticsService.java | 7 +- .../hibernate/jmx/StatisticsServiceMBean.java | 1 - .../loader/AbstractEntityJoinWalker.java | 10 +- .../org/hibernate/loader/BasicLoader.java | 6 +- .../hibernate/loader/CollectionAliases.java | 1 + .../hibernate/loader/ColumnEntityAliases.java | 3 - .../loader/DefaultEntityAliases.java | 2 - .../org/hibernate/loader/EntityAliases.java | 1 - .../loader/GeneratedCollectionAliases.java | 2 - .../java/org/hibernate/loader/JoinWalker.java | 6 +- .../java/org/hibernate/loader/Loader.java | 63 +- .../loader/MultipleBagFetchException.java | 2 - .../org/hibernate/loader/OuterJoinLoader.java | 7 +- .../loader/OuterJoinableAssociation.java | 2 - .../org/hibernate/loader/PropertyPath.java | 1 - .../collection/BasicCollectionJoinWalker.java | 6 +- .../collection/BasicCollectionLoader.java | 9 +- .../BatchingCollectionInitializer.java | 4 +- .../collection/CollectionInitializer.java | 2 - .../collection/CollectionJoinWalker.java | 3 +- .../loader/collection/CollectionLoader.java | 4 +- .../collection/OneToManyJoinWalker.java | 5 +- .../loader/collection/OneToManyLoader.java | 9 +- .../collection/SubselectCollectionLoader.java | 4 +- .../collection/SubselectOneToManyLoader.java | 4 +- .../loader/criteria/CriteriaJoinWalker.java | 6 +- .../loader/criteria/CriteriaLoader.java | 8 +- .../criteria/CriteriaQueryTranslator.java | 12 +- .../loader/custom/CollectionFetchReturn.java | 5 +- .../loader/custom/CollectionReturn.java | 3 +- .../custom/ColumnCollectionAliases.java | 2 - .../hibernate/loader/custom/CustomLoader.java | 14 +- .../hibernate/loader/custom/CustomQuery.java | 3 +- .../loader/custom/EntityFetchReturn.java | 5 +- .../hibernate/loader/custom/FetchReturn.java | 3 +- .../loader/custom/NonScalarReturn.java | 5 +- .../org/hibernate/loader/custom/Return.java | 3 +- .../hibernate/loader/custom/RootReturn.java | 3 +- .../hibernate/loader/custom/ScalarReturn.java | 3 +- .../loader/custom/sql/SQLCustomQuery.java | 7 +- .../loader/custom/sql/SQLQueryParser.java | 10 +- .../custom/sql/SQLQueryReturnProcessor.java | 10 +- .../loader/entity/AbstractEntityLoader.java | 1 - .../loader/entity/BatchingEntityLoader.java | 7 +- .../entity/CascadeEntityJoinWalker.java | 6 +- .../loader/entity/CascadeEntityLoader.java | 3 +- .../entity/CollectionElementLoader.java | 10 +- .../loader/entity/EntityJoinWalker.java | 2 - .../hibernate/loader/entity/EntityLoader.java | 11 +- .../loader/entity/UniqueEntityLoader.java | 2 - .../org/hibernate/loader/hql/QueryLoader.java | 13 +- .../org/hibernate/lob/ReaderInputStream.java | 1 - .../AbstractAuxiliaryDatabaseObject.java | 2 - .../main/java/org/hibernate/mapping/Any.java | 3 - .../java/org/hibernate/mapping/Array.java | 2 - .../mapping/AuxiliaryDatabaseObject.java | 2 - .../java/org/hibernate/mapping/Backref.java | 1 - .../main/java/org/hibernate/mapping/Bag.java | 1 - .../org/hibernate/mapping/Collection.java | 5 +- .../java/org/hibernate/mapping/Column.java | 2 - .../java/org/hibernate/mapping/Component.java | 4 - .../org/hibernate/mapping/Constraint.java | 2 - .../hibernate/mapping/DenormalizedTable.java | 2 - .../org/hibernate/mapping/DependantValue.java | 1 - .../org/hibernate/mapping/FetchProfile.java | 1 - .../java/org/hibernate/mapping/Fetchable.java | 1 - .../org/hibernate/mapping/Filterable.java | 1 + .../org/hibernate/mapping/ForeignKey.java | 2 - .../java/org/hibernate/mapping/Formula.java | 2 - .../org/hibernate/mapping/IdGenerator.java | 1 - .../org/hibernate/mapping/IdentifierBag.java | 2 - .../mapping/IdentifierCollection.java | 1 - .../java/org/hibernate/mapping/Index.java | 2 - .../org/hibernate/mapping/IndexBackref.java | 1 - .../hibernate/mapping/IndexedCollection.java | 2 - .../main/java/org/hibernate/mapping/Join.java | 4 +- .../org/hibernate/mapping/JoinedSubclass.java | 2 - .../java/org/hibernate/mapping/KeyValue.java | 1 - .../main/java/org/hibernate/mapping/List.java | 2 - .../java/org/hibernate/mapping/ManyToOne.java | 3 - .../main/java/org/hibernate/mapping/Map.java | 2 - .../hibernate/mapping/MappedSuperclass.java | 4 +- .../hibernate/mapping/MetaAttributable.java | 1 + .../org/hibernate/mapping/MetaAttribute.java | 1 - .../org/hibernate/mapping/MetadataSource.java | 1 + .../java/org/hibernate/mapping/OneToMany.java | 3 - .../java/org/hibernate/mapping/OneToOne.java | 4 - .../hibernate/mapping/PersistentClass.java | 12 +- .../mapping/PersistentClassVisitor.java | 1 + .../org/hibernate/mapping/PrimaryKey.java | 2 - .../org/hibernate/mapping/PrimitiveArray.java | 1 - .../java/org/hibernate/mapping/Property.java | 2 - .../hibernate/mapping/PropertyGeneration.java | 1 - .../hibernate/mapping/RelationalModel.java | 3 +- .../java/org/hibernate/mapping/RootClass.java | 148 +- .../org/hibernate/mapping/Selectable.java | 1 - .../main/java/org/hibernate/mapping/Set.java | 3 - .../SimpleAuxiliaryDatabaseObject.java | 4 +- .../org/hibernate/mapping/SimpleValue.java | 3 - .../mapping/SingleTableSubclass.java | 2 - .../java/org/hibernate/mapping/Subclass.java | 6 +- .../hibernate/mapping/SyntheticProperty.java | 1 + .../java/org/hibernate/mapping/Table.java | 4 +- .../org/hibernate/mapping/TableOwner.java | 1 + .../java/org/hibernate/mapping/ToOne.java | 1 - .../java/org/hibernate/mapping/TypeDef.java | 1 - .../org/hibernate/mapping/UnionSubclass.java | 2 - .../java/org/hibernate/mapping/UniqueKey.java | 2 - .../java/org/hibernate/mapping/Value.java | 2 - .../org/hibernate/mapping/ValueVisitor.java | 1 + .../org/hibernate/metadata/ClassMetadata.java | 4 +- .../metadata/CollectionMetadata.java | 1 - .../logical/AbstractAttributeContainer.java | 1 - .../metamodel/logical/Attribute.java | 1 + .../metamodel/logical/AttributeContainer.java | 1 - .../metamodel/logical/BasicType.java | 1 + .../metamodel/logical/Component.java | 1 + .../hibernate/metamodel/logical/Entity.java | 1 + .../metamodel/logical/Hierarchical.java | 1 + .../logical/PluralAttributeNature.java | 1 - .../metamodel/logical/SingularAttribute.java | 1 + .../metamodel/logical/Superclass.java | 1 + .../org/hibernate/metamodel/logical/Type.java | 1 + .../metamodel/logical/TypeNature.java | 1 + .../relational/AbstractConstraint.java | 3 +- .../relational/AbstractSimpleValue.java | 10 +- .../AbstractTableSpecification.java | 1 - .../relational/AbstractValueContainer.java | 1 - .../metamodel/relational/Column.java | 1 + .../metamodel/relational/Constraint.java | 2 +- .../metamodel/relational/Datatype.java | 1 + .../metamodel/relational/DerivedValue.java | 1 + .../metamodel/relational/Exportable.java | 1 + .../metamodel/relational/ForeignKey.java | 6 +- .../metamodel/relational/Identifier.java | 1 - .../IllegalIdentifierException.java | 1 - .../metamodel/relational/InLineView.java | 3 +- .../hibernate/metamodel/relational/Index.java | 1 + .../metamodel/relational/ObjectName.java | 1 + .../metamodel/relational/PrimaryKey.java | 1 + .../metamodel/relational/Sequence.java | 1 + .../metamodel/relational/SimpleValue.java | 1 + .../hibernate/metamodel/relational/Table.java | 1 - .../relational/TableSpecification.java | 1 + .../hibernate/metamodel/relational/Tuple.java | 1 + .../metamodel/relational/UniqueKey.java | 1 + .../hibernate/metamodel/relational/Value.java | 1 + .../metamodel/relational/ValueContainer.java | 1 + ...bstractExplicitParameterSpecification.java | 1 - ...ectionFilterKeyParameterSpecification.java | 4 +- .../DynamicFilterParameterSpecification.java | 4 +- .../param/ExplicitParameterSpecification.java | 1 + .../param/NamedParameterSpecification.java | 6 +- .../param/ParameterSpecification.java | 6 +- .../PositionalParameterSpecification.java | 6 +- ...VersionTypeSeedParameterSpecification.java | 10 +- .../hibernate/persister/PersisterFactory.java | 4 +- .../AbstractCollectionPersister.java | 50 +- .../collection/BasicCollectionPersister.java | 4 +- .../collection/CollectionPersister.java | 2 - .../collection/CollectionPropertyMapping.java | 1 - .../collection/CollectionPropertyNames.java | 1 + .../CompositeElementPropertyMapping.java | 1 - .../collection/ElementPropertyMapping.java | 1 - .../NamedQueryCollectionInitializer.java | 10 +- .../collection/OneToManyPersister.java | 4 +- .../collection/QueryableCollection.java | 1 - .../collection/SQLLoadableCollection.java | 1 + .../entity/AbstractEntityPersister.java | 37 +- .../entity/AbstractPropertyMapping.java | 8 +- .../entity/BasicEntityPropertyMapping.java | 1 - .../entity/DiscriminatorMetadata.java | 1 - .../persister/entity/DiscriminatorType.java | 4 - .../persister/entity/EntityPersister.java | 8 +- .../hibernate/persister/entity/Joinable.java | 4 +- .../entity/JoinedSubclassEntityPersister.java | 5 +- .../hibernate/persister/entity/Loadable.java | 2 - .../hibernate/persister/entity/Lockable.java | 1 + .../persister/entity/NamedQueryLoader.java | 11 +- .../persister/entity/OuterJoinLoadable.java | 1 - .../persister/entity/PropertyMapping.java | 1 - .../hibernate/persister/entity/Queryable.java | 2 - .../persister/entity/SQLLoadable.java | 1 - .../entity/SingleTableEntityPersister.java | 2 - .../entity/UnionSubclassEntityPersister.java | 8 +- .../persister/entity/UniqueKeyLoadable.java | 1 - .../org/hibernate/pretty/MessageHelper.java | 2 - .../java/org/hibernate/pretty/Printer.java | 12 +- .../property/BackrefPropertyAccessor.java | 4 +- .../property/BasicPropertyAccessor.java | 7 +- .../property/ChainedPropertyAccessor.java | 1 - .../property/DirectPropertyAccessor.java | 4 +- .../org/hibernate/property/Dom4jAccessor.java | 4 +- .../property/EmbeddedPropertyAccessor.java | 6 +- .../java/org/hibernate/property/Getter.java | 4 +- .../property/IndexPropertyAccessor.java | 6 +- .../org/hibernate/property/MapAccessor.java | 4 +- .../org/hibernate/property/NoopAccessor.java | 4 +- .../hibernate/property/PropertyAccessor.java | 1 - .../property/PropertyAccessorFactory.java | 6 +- .../java/org/hibernate/property/Setter.java | 2 - .../proxy/AbstractLazyInitializer.java | 5 +- .../proxy/AbstractSerializableProxy.java | 1 - .../proxy/EntityNotFoundDelegate.java | 3 +- .../org/hibernate/proxy/HibernateProxy.java | 1 - .../hibernate/proxy/HibernateProxyHelper.java | 1 + .../org/hibernate/proxy/LazyInitializer.java | 2 - .../org/hibernate/proxy/ProxyFactory.java | 2 - .../proxy/dom4j/Dom4jLazyInitializer.java | 6 +- .../org/hibernate/proxy/dom4j/Dom4jProxy.java | 40 +- .../proxy/dom4j/Dom4jProxyFactory.java | 2 - .../proxy/map/MapLazyInitializer.java | 2 - .../org/hibernate/proxy/map/MapProxy.java | 6 +- .../hibernate/proxy/map/MapProxyFactory.java | 6 +- .../proxy/pojo/BasicLazyInitializer.java | 4 +- .../pojo/cglib/CGLIBLazyInitializer.java | 23 +- .../proxy/pojo/cglib/CGLIBProxyFactory.java | 6 +- .../proxy/pojo/cglib/SerializableProxy.java | 2 - .../javassist/JavassistLazyInitializer.java | 34 +- .../pojo/javassist/JavassistProxyFactory.java | 2 - .../pojo/javassist/SerializableProxy.java | 2 - .../hibernate/secure/HibernatePermission.java | 1 - .../hibernate/secure/JACCConfiguration.java | 9 +- .../org/hibernate/secure/JACCPermissions.java | 1 - .../secure/JACCPreDeleteEventListener.java | 2 - .../secure/JACCPreInsertEventListener.java | 2 - .../secure/JACCPreLoadEventListener.java | 2 - .../secure/JACCPreUpdateEventListener.java | 2 - .../secure/JACCSecurityListener.java | 1 + .../internal/ClassLoaderServiceImpl.java | 2 - .../internal/ClassLoaderServiceInitiator.java | 2 - .../classloading/spi/ClassLoaderService.java | 2 - .../spi/ClassLoadingException.java | 1 - .../internal/ServiceDependencyException.java | 1 - .../service/internal/ServicesInitializer.java | 7 +- .../internal/ServicesRegistryImpl.java | 7 +- .../internal/ConnectionProviderInitiator.java | 8 +- .../DatasourceConnectionProviderImpl.java | 1 - .../DriverManagerConnectionProviderImpl.java | 16 +- .../UserSuppliedConnectionProviderImpl.java | 2 - .../connections/spi/ConnectionProvider.java | 2 - .../internal/AbstractDialectResolver.java | 10 +- .../internal/BasicDialectResolver.java | 4 +- .../dialect/internal/DialectFactoryImpl.java | 2 - .../internal/DialectFactoryInitiator.java | 4 +- .../internal/DialectResolverInitiator.java | 4 +- .../dialect/internal/DialectResolverSet.java | 7 +- .../internal/StandardDialectResolver.java | 8 +- .../jdbc/dialect/spi/DialectFactory.java | 3 - .../jdbc/dialect/spi/DialectResolver.java | 2 - .../jmx/internal/DisabledJmxServiceImpl.java | 2 - .../service/jmx/internal/JmxServiceImpl.java | 9 +- .../jmx/internal/JmxServiceInitiator.java | 4 +- .../hibernate/service/jmx/spi/JmxService.java | 2 - .../jndi/internal/JndiServiceImpl.java | 7 +- .../jndi/internal/JndiServiceInitiator.java | 2 - .../service/jndi/spi/JndiService.java | 1 - .../internal/JBossAppServerPlatform.java | 6 +- .../internal/JtaPlatformInitiator.java | 4 +- .../service/jta/platform/spi/JtaPlatform.java | 2 - .../hibernate/service/spi/Configurable.java | 1 - .../hibernate/service/spi/InjectService.java | 6 +- .../org/hibernate/service/spi/Manageable.java | 1 + .../org/hibernate/service/spi/Service.java | 1 + .../service/spi/ServiceException.java | 1 - .../service/spi/ServiceInitiator.java | 1 - .../service/spi/ServicesRegistry.java | 1 + .../spi/ServicesRegistryAwareService.java | 1 + .../org/hibernate/service/spi/Startable.java | 1 + .../org/hibernate/service/spi/Stoppable.java | 1 + .../service/spi/UnknownServiceException.java | 1 - .../org/hibernate/sql/ANSICaseFragment.java | 1 - .../org/hibernate/sql/ANSIJoinFragment.java | 1 - .../main/java/org/hibernate/sql/Alias.java | 1 - .../org/hibernate/sql/AliasGenerator.java | 1 + .../org/hibernate/sql/CacheJoinFragment.java | 3 +- .../java/org/hibernate/sql/CaseFragment.java | 4 +- .../org/hibernate/sql/ConditionFragment.java | 1 - .../org/hibernate/sql/DecodeCaseFragment.java | 1 - .../main/java/org/hibernate/sql/Delete.java | 3 - .../org/hibernate/sql/DerbyCaseFragment.java | 1 - .../hibernate/sql/DisjunctionFragment.java | 1 + .../org/hibernate/sql/ForUpdateFragment.java | 5 +- .../org/hibernate/sql/HSQLCaseFragment.java | 1 - .../java/org/hibernate/sql/InFragment.java | 2 - .../main/java/org/hibernate/sql/Insert.java | 2 - .../java/org/hibernate/sql/InsertSelect.java | 8 +- .../java/org/hibernate/sql/JoinFragment.java | 1 - .../org/hibernate/sql/MckoiCaseFragment.java | 1 - .../org/hibernate/sql/OracleJoinFragment.java | 1 - .../org/hibernate/sql/QueryJoinFragment.java | 1 - .../java/org/hibernate/sql/QuerySelect.java | 2 - .../main/java/org/hibernate/sql/Select.java | 1 - .../org/hibernate/sql/SelectExpression.java | 1 + .../org/hibernate/sql/SelectFragment.java | 2 - .../java/org/hibernate/sql/SimpleSelect.java | 2 - .../hibernate/sql/Sybase11JoinFragment.java | 1 + .../main/java/org/hibernate/sql/Template.java | 10 +- .../main/java/org/hibernate/sql/Update.java | 2 - .../antlr/CollationSpecification.java | 1 + .../sql/ordering/antlr/ColumnMapper.java | 1 - .../hibernate/sql/ordering/antlr/Factory.java | 1 - .../hibernate/sql/ordering/antlr/Node.java | 1 + .../sql/ordering/antlr/NodeSupport.java | 1 - .../sql/ordering/antlr/OrderByFragment.java | 1 + .../ordering/antlr/OrderByFragmentParser.java | 7 +- .../antlr/OrderByFragmentRenderer.java | 8 +- .../antlr/OrderByFragmentTranslator.java | 8 +- .../ordering/antlr/OrderingSpecification.java | 1 + .../hibernate/sql/ordering/antlr/SortKey.java | 1 + .../sql/ordering/antlr/SortSpecification.java | 1 - .../ordering/antlr/TranslationContext.java | 3 +- .../hibernate/stat/CategorizedStatistics.java | 1 - .../hibernate/stat/CollectionStatistics.java | 1 - .../stat/CollectionStatisticsImpl.java | 1 + .../ConcurrentCollectionStatisticsImpl.java | 1 - .../stat/ConcurrentEntityStatisticsImpl.java | 1 - .../stat/ConcurrentQueryStatisticsImpl.java | 1 - ...currentSecondLevelCacheStatisticsImpl.java | 2 - .../stat/ConcurrentStatisticsImpl.java | 8 +- .../org/hibernate/stat/EntityStatistics.java | 1 - .../hibernate/stat/EntityStatisticsImpl.java | 1 + .../org/hibernate/stat/QueryStatistics.java | 1 - .../hibernate/stat/QueryStatisticsImpl.java | 1 + .../stat/SecondLevelCacheStatistics.java | 1 - .../stat/SecondLevelCacheStatisticsImpl.java | 2 - .../org/hibernate/stat/SessionStatistics.java | 1 - .../hibernate/stat/SessionStatisticsImpl.java | 2 - .../java/org/hibernate/stat/Statistics.java | 1 + .../org/hibernate/stat/StatisticsImpl.java | 7 +- .../hibernate/stat/StatisticsImplementor.java | 1 + .../tool/hbm2ddl/ColumnMetadata.java | 1 - .../tool/hbm2ddl/ConnectionHelper.java | 1 - .../tool/hbm2ddl/DatabaseMetadata.java | 7 +- .../tool/hbm2ddl/ForeignKeyMetadata.java | 2 - .../hibernate/tool/hbm2ddl/IndexMetadata.java | 1 - .../ManagedProviderConnectionHelper.java | 8 +- .../hibernate/tool/hbm2ddl/SchemaExport.java | 25 +- .../tool/hbm2ddl/SchemaExportTask.java | 23 +- .../hibernate/tool/hbm2ddl/SchemaUpdate.java | 9 +- .../tool/hbm2ddl/SchemaUpdateTask.java | 23 +- .../tool/hbm2ddl/SchemaValidator.java | 7 +- .../tool/hbm2ddl/SchemaValidatorTask.java | 23 +- .../hbm2ddl/SuppliedConnectionHelper.java | 4 +- ...iedConnectionProviderConnectionHelper.java | 6 +- .../hibernate/tool/hbm2ddl/TableMetadata.java | 7 +- .../instrument/BasicInstrumentationTask.java | 23 +- .../tool/instrument/cglib/InstrumentTask.java | 3 +- .../instrument/javassist/InstrumentTask.java | 3 +- .../BESTransactionManagerLookup.java | 1 + .../BTMTransactionManagerLookup.java | 7 +- .../hibernate/transaction/CMTTransaction.java | 13 +- .../transaction/CMTTransactionFactory.java | 5 +- .../transaction/CacheSynchronization.java | 7 +- ...sTSStandaloneTransactionManagerLookup.java | 2 - .../JBossTransactionManagerLookup.java | 1 + .../transaction/JDBCTransaction.java | 23 +- .../transaction/JDBCTransactionFactory.java | 2 - .../JNDITransactionManagerLookup.java | 5 +- .../JOTMTransactionManagerLookup.java | 5 +- .../JOnASTransactionManagerLookup.java | 5 +- .../JRun4TransactionManagerLookup.java | 1 + .../hibernate/transaction/JTATransaction.java | 21 +- .../transaction/JTATransactionFactory.java | 7 +- .../OC4JTransactionManagerLookup.java | 1 + .../OrionTransactionManagerLookup.java | 1 + .../ResinTransactionManagerLookup.java | 1 + .../SunONETransactionManagerLookup.java | 1 + .../transaction/TransactionFactory.java | 2 - .../TransactionFactoryFactory.java | 8 +- .../transaction/TransactionManagerLookup.java | 2 - .../TransactionManagerLookupFactory.java | 8 +- ...WebSphereExtendedJTATransactionLookup.java | 3 - .../WebSphereTransactionManagerLookup.java | 8 +- .../WeblogicTransactionManagerLookup.java | 1 + .../AfterCompletionAction.java | 1 - .../BeforeCompletionManagedFlushChecker.java | 2 - .../synchronization/CallbackCoordinator.java | 7 +- .../synchronization/ExceptionMapper.java | 1 - .../HibernateSynchronizationImpl.java | 8 +- ...iasToBeanConstructorResultTransformer.java | 4 +- .../AliasToBeanResultTransformer.java | 2 - .../AliasToEntityMapResultTransformer.java | 1 - .../AliasedTupleSubsetResultTransformer.java | 1 + .../transform/BasicTransformerAdapter.java | 1 - .../transform/CacheableResultTransformer.java | 2 - .../transform/DistinctResultTransformer.java | 10 +- .../DistinctRootEntityResultTransformer.java | 1 - .../PassThroughResultTransformer.java | 3 - .../transform/ResultTransformer.java | 1 - .../RootEntityResultTransformer.java | 1 - .../transform/ToListResultTransformer.java | 3 +- .../org/hibernate/transform/Transformers.java | 3 +- .../TupleSubsetResultTransformer.java | 1 + .../hibernate/tuple/Dom4jInstantiator.java | 6 +- .../tuple/DynamicMapInstantiator.java | 2 - .../org/hibernate/tuple/ElementWrapper.java | 2 - .../tuple/EntityModeToTuplizerMapping.java | 4 +- .../hibernate/tuple/IdentifierProperty.java | 1 - .../org/hibernate/tuple/Instantiator.java | 2 - .../org/hibernate/tuple/PojoInstantiator.java | 7 +- .../java/org/hibernate/tuple/Property.java | 4 +- .../org/hibernate/tuple/PropertyFactory.java | 4 +- .../org/hibernate/tuple/StandardProperty.java | 3 +- .../java/org/hibernate/tuple/Tuplizer.java | 2 - .../org/hibernate/tuple/VersionProperty.java | 1 - .../component/AbstractComponentTuplizer.java | 6 +- .../ComponentEntityModeToTuplizerMapping.java | 18 +- .../tuple/component/ComponentMetamodel.java | 16 +- .../tuple/component/ComponentTuplizer.java | 4 +- .../component/ComponentTuplizerFactory.java | 8 +- .../component/Dom4jComponentTuplizer.java | 5 +- .../DynamicMapComponentTuplizer.java | 6 +- .../component/PojoComponentTuplizer.java | 4 +- .../tuple/entity/AbstractEntityTuplizer.java | 12 +- .../tuple/entity/Dom4jEntityTuplizer.java | 11 +- .../entity/DynamicMapEntityTuplizer.java | 12 +- .../EntityEntityModeToTuplizerMapping.java | 16 +- .../tuple/entity/EntityMetamodel.java | 9 +- .../tuple/entity/EntityTuplizer.java | 12 +- .../tuple/entity/EntityTuplizerFactory.java | 2 - .../tuple/entity/PojoEntityTuplizer.java | 11 +- .../hibernate/type/AbstractBynaryType.java | 18 +- .../hibernate/type/AbstractCharArrayType.java | 16 +- .../hibernate/type/AbstractComponentType.java | 1 + .../org/hibernate/type/AbstractLobType.java | 2 - .../type/AbstractLongBinaryType.java | 3 +- .../type/AbstractLongStringType.java | 2 - ...AbstractSingleColumnStandardBasicType.java | 2 - .../type/AbstractStandardBasicType.java | 3 - .../java/org/hibernate/type/AbstractType.java | 2 - .../hibernate/type/AdaptedImmutableType.java | 1 - .../main/java/org/hibernate/type/AnyType.java | 2 - .../java/org/hibernate/type/ArrayType.java | 2 - .../org/hibernate/type/AssociationType.java | 4 +- .../main/java/org/hibernate/type/BagType.java | 2 - .../java/org/hibernate/type/BasicType.java | 1 + .../org/hibernate/type/BasicTypeRegistry.java | 9 +- .../org/hibernate/type/BigDecimalType.java | 2 - .../org/hibernate/type/BigIntegerType.java | 2 - .../java/org/hibernate/type/BinaryType.java | 2 - .../java/org/hibernate/type/BlobType.java | 2 - .../java/org/hibernate/type/BooleanType.java | 2 - .../org/hibernate/type/ByteArrayBlobType.java | 4 +- .../java/org/hibernate/type/ByteType.java | 2 - .../org/hibernate/type/CalendarDateType.java | 2 - .../java/org/hibernate/type/CalendarType.java | 2 - .../org/hibernate/type/CharArrayType.java | 3 +- .../org/hibernate/type/CharBooleanType.java | 1 - .../type/CharacterArrayClobType.java | 1 - .../hibernate/type/CharacterArrayType.java | 3 +- .../org/hibernate/type/CharacterType.java | 2 - .../java/org/hibernate/type/ClassType.java | 1 - .../java/org/hibernate/type/ClobType.java | 2 - .../org/hibernate/type/CollectionType.java | 3 - .../org/hibernate/type/ComponentType.java | 8 +- .../hibernate/type/CompositeCustomType.java | 3 - .../org/hibernate/type/CompositeType.java | 2 - .../java/org/hibernate/type/CurrencyType.java | 2 - .../hibernate/type/CustomCollectionType.java | 6 +- .../java/org/hibernate/type/CustomType.java | 3 - .../java/org/hibernate/type/DateType.java | 2 - .../org/hibernate/type/DbTimestampType.java | 29 +- .../org/hibernate/type/DiscriminatorType.java | 1 + .../java/org/hibernate/type/DoubleType.java | 2 - .../hibernate/type/EmbeddedComponentType.java | 4 +- .../java/org/hibernate/type/EntityType.java | 2 - .../java/org/hibernate/type/EnumType.java | 6 +- .../java/org/hibernate/type/FloatType.java | 2 - .../hibernate/type/ForeignKeyDirection.java | 2 - .../org/hibernate/type/IdentifierBagType.java | 4 +- .../org/hibernate/type/IdentifierType.java | 1 + .../java/org/hibernate/type/ImageType.java | 1 - .../org/hibernate/type/ImmutableType.java | 2 - .../java/org/hibernate/type/IntegerType.java | 2 - .../java/org/hibernate/type/ListType.java | 2 - .../java/org/hibernate/type/LiteralType.java | 1 - .../java/org/hibernate/type/LocaleType.java | 2 - .../java/org/hibernate/type/LongType.java | 2 - .../org/hibernate/type/ManyToOneType.java | 2 - .../main/java/org/hibernate/type/MapType.java | 2 - .../hibernate/type/MaterializedBlobType.java | 3 +- .../hibernate/type/MaterializedClobType.java | 1 - .../java/org/hibernate/type/MetaType.java | 2 - .../java/org/hibernate/type/MutableType.java | 2 - .../java/org/hibernate/type/NullableType.java | 7 +- .../hibernate/type/NumericBooleanType.java | 2 - .../java/org/hibernate/type/ObjectType.java | 1 + .../java/org/hibernate/type/OneToOneType.java | 2 - .../org/hibernate/type/OrderedMapType.java | 1 - .../org/hibernate/type/OrderedSetType.java | 1 - .../org/hibernate/type/PostgresUUIDType.java | 2 - .../type/PrimitiveByteArrayBlobType.java | 1 + .../type/PrimitiveCharacterArrayClobType.java | 1 - .../org/hibernate/type/PrimitiveType.java | 1 - .../type/SerializableToBlobType.java | 4 +- .../org/hibernate/type/SerializableType.java | 2 - .../type/SerializationException.java | 1 - .../main/java/org/hibernate/type/SetType.java | 2 - .../java/org/hibernate/type/ShortType.java | 2 - .../org/hibernate/type/SingleColumnType.java | 2 - .../org/hibernate/type/SortedMapType.java | 2 - .../org/hibernate/type/SortedSetType.java | 2 - .../hibernate/type/SpecialOneToOneType.java | 2 - .../hibernate/type/StandardBasicTypes.java | 1 + .../org/hibernate/type/StringClobType.java | 2 - .../type/StringRepresentableType.java | 1 - .../java/org/hibernate/type/StringType.java | 1 - .../java/org/hibernate/type/TextType.java | 1 - .../java/org/hibernate/type/TimeType.java | 2 - .../java/org/hibernate/type/TimeZoneType.java | 2 - .../org/hibernate/type/TimestampType.java | 2 - .../org/hibernate/type/TrueFalseType.java | 2 - .../main/java/org/hibernate/type/Type.java | 2 - .../java/org/hibernate/type/TypeFactory.java | 7 +- .../java/org/hibernate/type/TypeHelper.java | 2 - .../java/org/hibernate/type/TypeResolver.java | 2 - .../org/hibernate/type/UUIDBinaryType.java | 2 - .../java/org/hibernate/type/UUIDCharType.java | 2 - .../main/java/org/hibernate/type/UrlType.java | 2 - .../java/org/hibernate/type/VersionType.java | 2 - .../type/WrappedMaterializedBlobType.java | 1 - .../org/hibernate/type/WrapperBinaryType.java | 3 +- .../hibernate/type/XmlRepresentableType.java | 1 - .../java/org/hibernate/type/YesNoType.java | 2 - .../type/descriptor/BinaryStream.java | 1 - .../type/descriptor/CharacterStream.java | 1 - .../type/descriptor/JdbcTypeNameMapper.java | 7 +- .../type/descriptor/ValueBinder.java | 1 - .../type/descriptor/ValueExtractor.java | 1 - .../type/descriptor/WrapperOptions.java | 1 - .../java/AbstractTypeDescriptor.java | 2 - .../descriptor/java/ArrayMutabilityPlan.java | 1 - .../java/BigDecimalTypeDescriptor.java | 2 - .../java/BigIntegerTypeDescriptor.java | 2 - .../descriptor/java/BinaryStreamImpl.java | 2 - .../descriptor/java/BlobTypeDescriptor.java | 2 - .../java/BooleanTypeDescriptor.java | 6 +- .../java/ByteArrayTypeDescriptor.java | 2 - .../descriptor/java/ByteTypeDescriptor.java | 1 - .../java/CalendarDateTypeDescriptor.java | 2 - .../java/CalendarTypeDescriptor.java | 2 - .../java/CharacterArrayTypeDescriptor.java | 2 - .../descriptor/java/CharacterStreamImpl.java | 2 - .../java/CharacterTypeDescriptor.java | 1 - .../descriptor/java/ClassTypeDescriptor.java | 1 - .../descriptor/java/ClobTypeDescriptor.java | 2 - .../java/CurrencyTypeDescriptor.java | 2 - .../type/descriptor/java/DataHelper.java | 13 +- .../descriptor/java/DateTypeDescriptor.java | 2 - .../descriptor/java/DoubleTypeDescriptor.java | 2 - .../descriptor/java/FloatTypeDescriptor.java | 2 - .../java/ImmutableMutabilityPlan.java | 1 - .../java/IncomparableComparator.java | 1 - .../java/IntegerTypeDescriptor.java | 2 - .../descriptor/java/JavaTypeDescriptor.java | 2 - .../java/JdbcDateTypeDescriptor.java | 2 - .../java/JdbcTimeTypeDescriptor.java | 2 - .../java/JdbcTimestampTypeDescriptor.java | 2 - .../descriptor/java/LocaleTypeDescriptor.java | 2 - .../descriptor/java/LongTypeDescriptor.java | 2 - .../type/descriptor/java/MutabilityPlan.java | 1 - .../java/MutableMutabilityPlan.java | 1 - .../PrimitiveByteArrayTypeDescriptor.java | 2 - ...PrimitiveCharacterArrayTypeDescriptor.java | 2 - .../java/SerializableTypeDescriptor.java | 2 - .../descriptor/java/ShortTypeDescriptor.java | 1 - .../descriptor/java/StringTypeDescriptor.java | 2 - .../java/TimeZoneTypeDescriptor.java | 2 - .../descriptor/java/UUIDTypeDescriptor.java | 2 - .../descriptor/java/UrlTypeDescriptor.java | 2 - .../type/descriptor/sql/BasicBinder.java | 11 +- .../type/descriptor/sql/BasicExtractor.java | 7 +- .../descriptor/sql/BigIntTypeDescriptor.java | 2 - .../descriptor/sql/BinaryTypeDescriptor.java | 1 - .../descriptor/sql/BitTypeDescriptor.java | 2 - .../descriptor/sql/BlobTypeDescriptor.java | 5 +- .../descriptor/sql/CharTypeDescriptor.java | 1 - .../descriptor/sql/ClobTypeDescriptor.java | 3 - .../descriptor/sql/DateTypeDescriptor.java | 2 - .../descriptor/sql/DecimalTypeDescriptor.java | 4 +- .../descriptor/sql/DoubleTypeDescriptor.java | 2 - .../descriptor/sql/FloatTypeDescriptor.java | 1 - .../descriptor/sql/IntegerTypeDescriptor.java | 2 - .../sql/LongVarbinaryTypeDescriptor.java | 1 - .../sql/LongVarcharTypeDescriptor.java | 1 - .../descriptor/sql/NumericTypeDescriptor.java | 1 - .../descriptor/sql/RealTypeDescriptor.java | 4 +- .../sql/SmallIntTypeDescriptor.java | 2 - .../descriptor/sql/SqlTypeDescriptor.java | 2 - .../descriptor/sql/TimeTypeDescriptor.java | 4 +- .../sql/TimestampTypeDescriptor.java | 4 +- .../descriptor/sql/TinyIntTypeDescriptor.java | 2 - .../sql/VarbinaryTypeDescriptor.java | 2 - .../descriptor/sql/VarcharTypeDescriptor.java | 2 - .../hibernate/usertype/CompositeUserType.java | 2 - .../hibernate/usertype/EnhancedUserType.java | 1 + .../hibernate/usertype/LoggableUserType.java | 3 +- .../hibernate/usertype/ParameterizedType.java | 1 - .../usertype/UserCollectionType.java | 2 - .../java/org/hibernate/usertype/UserType.java | 2 - .../hibernate/usertype/UserVersionType.java | 2 - .../java/org/hibernate/util/ArrayHelper.java | 2 - .../java/org/hibernate/util/BytesHelper.java | 1 + .../hibernate/util/CalendarComparator.java | 1 - .../java/org/hibernate/util/Cloneable.java | 2 - .../org/hibernate/util/CollectionHelper.java | 1 - .../hibernate/util/ComparableComparator.java | 1 - .../java/org/hibernate/util/ConfigHelper.java | 7 +- .../org/hibernate/util/DTDEntityResolver.java | 23 +- .../org/hibernate/util/EmptyIterator.java | 1 - .../java/org/hibernate/util/EqualsHelper.java | 1 + .../util/ExternalSessionFactoryConfig.java | 18 +- .../java/org/hibernate/util/FilterHelper.java | 10 +- .../java/org/hibernate/util/IdentityMap.java | 1 - .../java/org/hibernate/util/IdentitySet.java | 1 - .../hibernate/util/JDBCExceptionReporter.java | 17 +- .../java/org/hibernate/util/JTAHelper.java | 2 - .../org/hibernate/util/JoinedIterator.java | 1 - .../main/java/org/hibernate/util/LRUMap.java | 1 - .../java/org/hibernate/util/LazyIterator.java | 1 - .../java/org/hibernate/util/MarkerObject.java | 1 - .../org/hibernate/util/ReflectHelper.java | 2 - .../hibernate/util/SerializationHelper.java | 7 +- .../org/hibernate/util/SimpleMRUCache.java | 6 +- .../org/hibernate/util/SingletonIterator.java | 1 - .../org/hibernate/util/SoftLimitMRUCache.java | 3 +- .../java/org/hibernate/util/StringHelper.java | 6 +- .../java/org/hibernate/util/XMLHelper.java | 7 +- .../org/hibernate/util/xml/ErrorLogger.java | 7 +- .../org/hibernate/util/xml/MappingReader.java | 11 +- .../java/org/hibernate/util/xml/Origin.java | 1 - .../org/hibernate/util/xml/OriginImpl.java | 1 - .../org/hibernate/util/xml/XmlDocument.java | 2 - .../hibernate/util/xml/XmlDocumentImpl.java | 2 - .../org/hibernate/TestingDatabaseInfo.java | 24 +- .../org/hibernate/cache/QueryKeyTest.java | 19 +- .../hibernate/connection/PropertiesTest.java | 3 - .../dialect/DerbyDialectTestCase.java | 1 - .../java/org/hibernate/dialect/Mocks.java | 3 +- .../dialect/SQLServer2005DialectTestCase.java | 1 - .../hibernate/dialect/TestingDialects.java | 6 +- .../dialect/resolver/DialectFactoryTest.java | 33 +- .../dialect/resolver/DialectResolverTest.java | 7 +- .../engine/query/ParameterParserTest.java | 1 - .../org/hibernate/id/AbstractHolderTest.java | 1 - .../hibernate/id/BigDecimalHolderTest.java | 1 - .../hibernate/id/BigIntegerHolderTest.java | 1 - .../java/org/hibernate/id/LongHolderTest.java | 1 + .../SequenceHiLoGeneratorNoIncrementTest.java | 5 +- .../id/SequenceHiLoGeneratorTest.java | 3 - .../hibernate/id/TableHiLoGeneratorTest.java | 3 - .../id/enhanced/OptimizerUnitTest.java | 4 +- .../enhanced/SequenceStyleConfigUnitTest.java | 13 +- .../id/uuid/CustomVersionOneStrategyTest.java | 2 - .../org/hibernate/jdbc/JdbcSupportTest.java | 22 +- .../jdbc/util/BasicFormatterTest.java | 2 - .../test/java/org/hibernate/jmx/Entity.java | 1 + .../java/org/hibernate/jmx/TrivialTest.java | 1 - .../metamodel/relational/ObjectNameTests.java | 1 - .../relational/TableManipulationTests.java | 2 - .../property/BasicPropertyAccessorTest.java | 1 - .../java/org/hibernate/sql/TemplateTest.java | 9 +- .../subclassProxyInterface/Doctor.java | 1 + .../subclassProxyInterface/IDoctor.java | 1 + .../subclassProxyInterface/Person.java | 1 + .../SubclassProxyInterfaceTest.java | 2 - .../test/FailureExpectedCollector.java | 19 +- .../cid/AbstractCompositeIdTest.java | 14 +- .../cid/MyInterface.java | 5 +- .../cid/MyInterfaceImpl.java | 4 +- .../AbstractComponentPropertyRefTest.java | 14 +- .../propertyref/Address.java | 3 +- .../propertyref/AddressImpl.java | 4 +- .../propertyref/Server.java | 4 +- .../propertyref/ServerImpl.java | 5 +- .../org/hibernate/test/annotations/A320.java | 1 - .../org/hibernate/test/annotations/A320b.java | 1 - .../AlternativeNamingStrategy.java | 1 - .../test/annotations/AmericaCupClass.java | 1 - .../org/hibernate/test/annotations/Boat.java | 1 - .../hibernate/test/annotations/Company.java | 1 - .../test/annotations/ConfigurationTest.java | 3 - .../hibernate/test/annotations/Country.java | 5 - .../hibernate/test/annotations/Customer.java | 4 +- .../hibernate/test/annotations/Discount.java | 1 - .../test/annotations/EntityTest.java | 2 - .../org/hibernate/test/annotations/Ferry.java | 1 - .../hibernate/test/annotations/Flight.java | 1 - .../test/annotations/FlyingObject.java | 1 - .../test/annotations/IncorrectEntity.java | 1 - .../test/annotations/JoinedSubclassTest.java | 1 - .../hibernate/test/annotations/Passport.java | 1 - .../org/hibernate/test/annotations/Plane.java | 1 - .../org/hibernate/test/annotations/Port.java | 1 - .../test/annotations/SafeMappingTest.java | 1 - .../test/annotations/SecuredBindingTest.java | 2 - .../org/hibernate/test/annotations/Sky.java | 1 - .../hibernate/test/annotations/TestCase.java | 3 - .../org/hibernate/test/annotations/Thing.java | 1 - .../hibernate/test/annotations/Ticket.java | 1 - .../test/annotations/TicketComparator.java | 1 - .../test/annotations/access/AccessTest.java | 1 - .../test/annotations/access/Bed.java | 2 - .../test/annotations/access/BigBed.java | 3 +- .../test/annotations/access/Chair.java | 1 - .../test/annotations/access/Closet.java | 1 - .../test/annotations/access/Foobar.java | 1 - .../test/annotations/access/Furniture.java | 2 - .../test/annotations/access/Gardenshed.java | 2 - .../test/annotations/access/Thingy.java | 1 - .../test/annotations/access/Woody.java | 2 - .../access/jpa/AccessMappingTest.java | 2 - .../annotations/access/jpa/AccessTest.java | 2 - .../test/annotations/access/jpa/Animal.java | 1 - .../test/annotations/access/jpa/Bed.java | 1 - .../test/annotations/access/jpa/Being.java | 1 - .../test/annotations/access/jpa/BigBed.java | 1 - .../test/annotations/access/jpa/Chair.java | 1 - .../test/annotations/access/jpa/Circle.java | 1 - .../test/annotations/access/jpa/Color.java | 1 - .../test/annotations/access/jpa/Course1.java | 1 - .../test/annotations/access/jpa/Course2.java | 1 - .../test/annotations/access/jpa/Course3.java | 1 - .../test/annotations/access/jpa/Course4.java | 1 - .../test/annotations/access/jpa/Course5.java | 1 - .../test/annotations/access/jpa/Course6.java | 1 - .../test/annotations/access/jpa/Course7.java | 1 - .../test/annotations/access/jpa/Course8.java | 1 - .../annotations/access/jpa/Furniture.java | 1 - .../annotations/access/jpa/Gardenshed.java | 1 - .../test/annotations/access/jpa/Horse.java | 1 - .../test/annotations/access/jpa/Person.java | 1 - .../test/annotations/access/jpa/Position.java | 1 - .../test/annotations/access/jpa/Shape.java | 3 - .../test/annotations/access/jpa/Square.java | 1 - .../test/annotations/access/jpa/Student.java | 1 - .../test/annotations/access/jpa/Thingy.java | 1 - .../test/annotations/access/jpa/User.java | 1 - .../test/annotations/access/jpa/Woody.java | 1 - .../test/annotations/access/xml/Boy.java | 2 - .../test/annotations/access/xml/Cook.java | 1 - .../test/annotations/access/xml/Crew.java | 4 +- .../test/annotations/access/xml/Driver.java | 1 - .../test/annotations/access/xml/Knive.java | 1 - .../annotations/access/xml/RentalCar.java | 1 - .../test/annotations/access/xml/Tourist.java | 1 - .../test/annotations/access/xml/Waiter.java | 1 - .../annotations/access/xml/XmlAccessTest.java | 3 - .../test/annotations/any/AnyTest.java | 1 - .../test/annotations/any/CharProperty.java | 1 - .../test/annotations/any/IntegerProperty.java | 1 - .../test/annotations/any/LongProperty.java | 1 - .../test/annotations/any/Property.java | 1 + .../test/annotations/any/PropertyList.java | 2 - .../test/annotations/any/PropertyMap.java | 2 - .../test/annotations/any/PropertySet.java | 2 - .../test/annotations/any/StringProperty.java | 1 - .../test/annotations/any/package-info.java | 6 +- .../test/annotations/array/ArrayTest.java | 1 - .../test/annotations/array/Competitor.java | 1 - .../test/annotations/array/Contest.java | 5 +- .../annotations/backquotes/BackquoteTest.java | 1 - .../test/annotations/backquotes/Bug.java | 3 - .../test/annotations/backquotes/Category.java | 1 - .../test/annotations/backquotes/Printer.java | 3 +- .../annotations/backquotes/PrinterCable.java | 3 +- .../annotations/beanvalidation/Address.java | 1 - .../BeanValidationAutoTest.java | 2 - .../BeanValidationDisabledTest.java | 2 - .../BeanValidationGroupsTest.java | 2 - .../BeanValidationProvidedFactoryTest.java | 2 - .../annotations/beanvalidation/Button.java | 1 - .../annotations/beanvalidation/Color.java | 1 - .../annotations/beanvalidation/CupHolder.java | 1 - .../annotations/beanvalidation/DDLTest.java | 1 - .../DDLWithoutCallbackTest.java | 2 - .../annotations/beanvalidation/Display.java | 1 - .../beanvalidation/DisplayConnector.java | 1 - .../HibernateTraversableResolverTest.java | 2 - .../annotations/beanvalidation/MinMax.java | 1 - .../annotations/beanvalidation/Music.java | 1 - .../beanvalidation/PowerSupply.java | 1 - .../annotations/beanvalidation/Range.java | 1 - .../test/annotations/beanvalidation/Rock.java | 1 - .../annotations/beanvalidation/Screen.java | 1 - .../annotations/beanvalidation/Strict.java | 1 + .../test/annotations/beanvalidation/Tv.java | 2 - .../annotations/beanvalidation/TvOwner.java | 1 - .../test/annotations/bytecode/Hammer.java | 3 +- .../bytecode/ProxyBreakingTest.java | 7 +- .../test/annotations/bytecode/Tool.java | 3 +- .../test/annotations/cascade/CascadeTest.java | 2 - .../test/annotations/cascade/Mouth.java | 7 +- .../test/annotations/cascade/Tooth.java | 1 - .../org/hibernate/test/annotations/cid/A.java | 2 - .../hibernate/test/annotations/cid/AId.java | 1 - .../org/hibernate/test/annotations/cid/B.java | 1 - .../org/hibernate/test/annotations/cid/C.java | 1 - .../test/annotations/cid/Channel.java | 3 +- .../hibernate/test/annotations/cid/Child.java | 1 - .../test/annotations/cid/ChildPk.java | 1 - .../test/annotations/cid/CompositeIdTest.java | 2 - .../test/annotations/cid/LittleGenius.java | 9 +- .../hibernate/test/annotations/cid/Order.java | 11 +- .../test/annotations/cid/OrderLine.java | 9 +- .../test/annotations/cid/OrderLinePk.java | 10 +- .../test/annotations/cid/Parent.java | 1 - .../test/annotations/cid/ParentPk.java | 1 - .../test/annotations/cid/Presenter.java | 3 +- .../test/annotations/cid/Product.java | 7 +- .../test/annotations/cid/SomeEntity.java | 3 +- .../test/annotations/cid/SomeEntityId.java | 1 - .../test/annotations/cid/TvMagazin.java | 3 +- .../test/annotations/cid/TvMagazinPk.java | 4 +- .../test/annotations/cid/TvProgram.java | 2 - .../annotations/cid/TvProgramIdClass.java | 1 - .../annotations/cid/keymanytoone/Card.java | 1 - .../cid/keymanytoone/CardField.java | 1 - .../keymanytoone/EagerKeyManyToOneTest.java | 1 - .../annotations/cid/keymanytoone/Key.java | 1 - .../cid/keymanytoone/PrimaryKey.java | 1 - .../annotations/collectionelement/Boy.java | 2 - .../annotations/collectionelement/Brand.java | 1 - .../annotations/collectionelement/Bug.java | 1 - .../collectionelement/BugSystem.java | 4 +- .../collectionelement/Character.java | 1 + .../CollectionElementTest.java | 2 - .../collectionelement/CountryAttitude.java | 2 - .../collectionelement/FavoriteFood.java | 1 + .../collectionelement/LocalizedString.java | 2 - .../annotations/collectionelement/Matrix.java | 2 - .../collectionelement/OrderByTest.java | 6 +- .../annotations/collectionelement/Person.java | 1 - .../collectionelement/Products.java | 4 +- .../collectionelement/TestCourse.java | 2 - .../annotations/collectionelement/Toy.java | 2 - .../collectionelement/Widgets.java | 1 - .../deepcollectionelements/A.java | 5 - .../deepcollectionelements/B.java | 1 - .../deepcollectionelements/C.java | 6 +- .../DeepCollectionElementTest.java | 1 - .../indexedCollection/Contact.java | 1 - .../IndexedCollectionOfElementsTest.java | 3 +- .../indexedCollection/Sale.java | 12 +- .../configuration/package-info.java | 2 +- .../dataTypes/BasicOperationsTest.java | 2 - .../test/annotations/dataTypes/Grade.java | 1 + .../annotations/dataTypes/SomeEntity.java | 1 - .../dataTypes/SomeOtherEntity.java | 2 - .../derivedidentities/Dependent.java | 1 - .../derivedidentities/DependentId.java | 1 - .../derivedidentities/Employee.java | 1 - .../derivedidentities/Employer.java | 1 - .../derivedidentities/EmployerId.java | 1 - .../derivedidentities/MedicalHistory.java | 2 - .../annotations/derivedidentities/Person.java | 1 - .../derivedidentities/bidirectional/Bar.java | 1 - .../CompositeDerivedIdentityTest.java | 3 +- .../bidirectional/Dependent.java | 1 - .../bidirectional/DependentId.java | 1 + ...ntityWithBidirectionalAssociationTest.java | 1 - .../bidirectional/Employee.java | 1 - .../derivedidentities/bidirectional/Foo.java | 1 - .../OneToOneWithDerivedIdentityTest.java | 1 - .../bidirectional/Order.java | 4 +- .../bidirectional/OrderLine.java | 5 +- .../bidirectional/OrderLinePK.java | 3 +- .../bidirectional/Product.java | 4 +- .../derivedidentities/e1/a/Dependent.java | 2 - .../derivedidentities/e1/a/DependentId.java | 1 - ...vedIdentitySimpleParentIdClassDepTest.java | 4 +- .../derivedidentities/e1/a/Employee.java | 1 - .../derivedidentities/e1/b/Dependent.java | 1 - .../derivedidentities/e1/b/DependentId.java | 1 - ...IdentitySimpleParentEmbeddedIdDepTest.java | 1 - .../derivedidentities/e1/b/Employee.java | 1 - .../e1/b/ExclusiveDependent.java | 1 - .../e1/b/specjmapid/Customer.java | 1 - .../e1/b/specjmapid/CustomerInventory.java | 1 - .../e1/b/specjmapid/CustomerInventoryPK.java | 1 - .../b/specjmapid/IdMapManyToOneSpecjTest.java | 2 - .../e1/b/specjmapid/Item.java | 1 - .../derivedidentities/e1/b2/Customer.java | 2 - .../e1/b2/CustomerInventory.java | 2 - .../e1/b2/CustomerInventoryPK.java | 1 - .../IdClassGeneratedValueManyToOneTest.java | 2 - .../derivedidentities/e1/b2/Item.java | 2 - .../derivedidentities/e1/c/Dependent.java | 2 - ...edIdentitySimpleParentEmbeddedDepTest.java | 1 - .../derivedidentities/e1/c/Employee.java | 1 - .../derivedidentities/e2/a/Dependent.java | 1 - .../derivedidentities/e2/a/DependentId.java | 2 - ...edIdentityIdClassParentIdClassDepTest.java | 1 - .../derivedidentities/e2/a/Employee.java | 1 - .../derivedidentities/e2/a/EmployeeId.java | 1 - .../derivedidentities/e2/b/Dependent.java | 3 - .../derivedidentities/e2/b/DependentId.java | 2 - ...dentityIdClassParentEmbeddedIdDepTest.java | 1 - .../derivedidentities/e2/b/Employee.java | 1 - .../derivedidentities/e2/b/EmployeeId.java | 2 - .../derivedidentities/e3/a/Dependent.java | 1 - .../derivedidentities/e3/a/DependentId.java | 1 - ...edIdentityEmbeddedIdParentIdClassTest.java | 1 - .../derivedidentities/e3/a/Employee.java | 1 - .../derivedidentities/e3/a/EmployeeId.java | 1 - .../derivedidentities/e3/b/Dependent.java | 1 - .../derivedidentities/e3/b/DependentId.java | 1 - ...tityEmbeddedIdParentEmbeddedIdDepTest.java | 1 - .../derivedidentities/e3/b/Employee.java | 1 - .../derivedidentities/e3/b/EmployeeId.java | 1 - ...ivedIdentitySimpleParentSimpleDepTest.java | 2 - .../e4/a/FinancialHistory.java | 3 - .../e4/a/MedicalHistory.java | 2 - .../derivedidentities/e4/a/Person.java | 2 - .../derivedidentities/e4/a/Simple.java | 1 - ...entitySimpleParentSimpleDepMapsIdTest.java | 2 - .../e4/b/FinancialHistory.java | 1 - .../e4/b/MedicalHistory.java | 1 - .../derivedidentities/e4/b/Person.java | 1 - ...IdClassParentSameIdTypeIdClassDepTest.java | 1 - .../e5/a/MedicalHistory.java | 1 - .../derivedidentities/e5/a/Person.java | 2 - .../derivedidentities/e5/a/PersonId.java | 1 - ...lassParentSameIdTypeEmbeddedIdDepTest.java | 1 - .../e5/b/MedicalHistory.java | 2 - .../derivedidentities/e5/b/Person.java | 1 - .../derivedidentities/e5/b/PersonId.java | 1 - .../e5/c/ForeignGeneratorViaMapsIdTest.java | 1 - .../e5/c/MedicalHistory.java | 3 - .../derivedidentities/e5/c/Person.java | 1 - ...eddedIdParentSameIdTypeIdClassDepTest.java | 1 - .../e6/a/MedicalHistory.java | 3 - .../derivedidentities/e6/a/Person.java | 1 - .../derivedidentities/e6/a/PersonId.java | 1 - ...edIdParentSameIdTypeEmbeddedIdDepTest.java | 1 - .../e6/b/MedicalHistory.java | 1 - .../derivedidentities/e6/b/Person.java | 1 - .../derivedidentities/e6/b/PersonId.java | 1 - .../duplicatedgenerator/DuplicateTest.java | 1 - .../duplicatedgenerator/Flight.java | 1 - .../test/annotations/embedded/Address.java | 1 - .../annotations/embedded/AddressType.java | 1 - .../test/annotations/embedded/Book.java | 1 - .../test/annotations/embedded/CorpType.java | 1 - .../test/annotations/embedded/Country.java | 2 - .../test/annotations/embedded/Deal.java | 1 - .../annotations/embedded/EmbeddedTest.java | 2 - .../annotations/embedded/FavoriteThings.java | 1 - .../test/annotations/embedded/FixedLeg.java | 1 - .../test/annotations/embedded/FloatLeg.java | 1 - .../embedded/InternetFavorites.java | 3 +- .../embedded/InternetProvider.java | 1 - .../test/annotations/embedded/Leg.java | 1 - .../annotations/embedded/LegalStructure.java | 1 - .../test/annotations/embedded/Manager.java | 1 - .../annotations/embedded/Nationality.java | 1 - .../annotations/embedded/NotonialDeal.java | 1 - .../test/annotations/embedded/Person.java | 1 - .../annotations/embedded/RegionalArticle.java | 1 - .../embedded/RegionalArticlePk.java | 2 - .../test/annotations/embedded/SpreadDeal.java | 1 - .../test/annotations/embedded/Summary.java | 4 +- .../test/annotations/embedded/Swap.java | 1 - .../annotations/embedded/URLFavorite.java | 1 - .../annotations/embedded/VanillaSwap.java | 1 - .../annotations/embedded/WealthyPerson.java | 6 +- .../embedded/many2one/Address.java | 2 - .../embedded/many2one/Country.java | 1 - .../many2one/EmbeddableWithMany2OneTest.java | 2 - .../annotations/embedded/many2one/Person.java | 1 - .../annotations/embedded/one2many/Alias.java | 2 - .../one2many/EmbeddableWithOne2ManyTest.java | 4 +- .../annotations/embedded/one2many/Name.java | 2 - .../annotations/embedded/one2many/Person.java | 1 - .../embedded/one2many/PersonName.java | 2 - .../annotations/engine/collection/Father.java | 2 - .../annotations/engine/collection/Mother.java | 2 - .../annotations/engine/collection/Son.java | 1 - ...UnidirCollectionWithMultipleOwnerTest.java | 1 - .../test/annotations/entity/Address.java | 1 - .../entity/BasicHibernateAnnotationsTest.java | 2 - .../test/annotations/entity/Bid.java | 1 - .../test/annotations/entity/Car.java | 1 - .../annotations/entity/CasterStringType.java | 2 - .../test/annotations/entity/CommunityBid.java | 1 - .../annotations/entity/ContactDetails.java | 1 - .../test/annotations/entity/Country.java | 1 - .../test/annotations/entity/Drill.java | 3 +- .../test/annotations/entity/FirstName.java | 4 +- .../test/annotations/entity/Flight.java | 2 - .../test/annotations/entity/Forest.java | 5 +- .../annotations/entity/FormalLastName.java | 1 - .../annotations/entity/Java5FeaturesTest.java | 1 - .../test/annotations/entity/LastName.java | 2 - .../test/annotations/entity/Length.java | 1 + .../entity/LocalContactDetails.java | 1 - .../annotations/entity/MonetaryAmount.java | 1 - .../entity/MonetaryAmountUserType.java | 2 - .../test/annotations/entity/Name.java | 2 - .../test/annotations/entity/Narrative.java | 3 +- .../entity/OverseasPhoneNumber.java | 3 +- .../test/annotations/entity/Peugot.java | 2 - .../test/annotations/entity/PhoneNumber.java | 1 + .../annotations/entity/PhoneNumberType.java | 1 - .../test/annotations/entity/Player.java | 3 +- .../test/annotations/entity/PowerDrill.java | 3 +- .../entity/PropertyDefaultMappingsTest.java | 1 - .../test/annotations/entity/Race.java | 1 - .../test/annotations/entity/Ransom.java | 2 - .../test/annotations/entity/SoccerTeam.java | 4 +- .../test/annotations/entity/Starred.java | 1 + .../test/annotations/entity/Tool.java | 3 +- .../test/annotations/entity/Topic.java | 5 +- .../test/annotations/entity/Tree.java | 2 - .../annotations/entity/WashingMachine.java | 1 - .../test/annotations/entity/Widget.java | 3 +- .../test/annotations/entity/ZipCode.java | 2 - .../test/annotations/entity/package-info.java | 2 +- .../annotations/entitynonentity/Cellular.java | 1 + .../entitynonentity/Communication.java | 1 + .../entitynonentity/EntityNonEntityTest.java | 1 - .../test/annotations/entitynonentity/GSM.java | 1 - .../entitynonentity/Interaction.java | 3 +- .../annotations/entitynonentity/Phone.java | 1 - .../annotations/entitynonentity/Voice.java | 1 - .../test/annotations/fetch/Branch.java | 9 +- .../test/annotations/fetch/FetchingTest.java | 2 - .../test/annotations/fetch/Leaf.java | 1 - .../test/annotations/fetch/Person.java | 2 - .../test/annotations/fetch/Stay.java | 6 +- .../annotations/fetchprofile/Country.java | 1 - .../annotations/fetchprofile/Customer.java | 2 - .../annotations/fetchprofile/Customer2.java | 2 - .../annotations/fetchprofile/Customer3.java | 2 - .../annotations/fetchprofile/Customer4.java | 2 - .../annotations/fetchprofile/Customer5.java | 2 - .../fetchprofile/FetchProfileTest.java | 3 +- .../fetchprofile/MoreFetchProfileTest.java | 2 - .../test/annotations/fetchprofile/Order.java | 1 - .../fetchprofile/SupportTickets.java | 1 - .../fetchprofile/package-info.java | 1 - .../test/annotations/fkcircularity/A.java | 3 +- .../test/annotations/fkcircularity/A_PK.java | 4 +- .../test/annotations/fkcircularity/B.java | 3 +- .../test/annotations/fkcircularity/C.java | 3 +- .../annotations/fkcircularity/ClassA.java | 1 - .../annotations/fkcircularity/ClassB.java | 1 - .../annotations/fkcircularity/ClassC.java | 1 - .../annotations/fkcircularity/ClassD.java | 1 - .../test/annotations/fkcircularity/D.java | 3 +- .../test/annotations/fkcircularity/D_PK.java | 4 +- .../fkcircularity/FkCircularityTest.java | 3 +- .../test/annotations/generics/Classes.java | 34 +- .../test/annotations/generics/DNA.java | 3 +- .../test/annotations/generics/Dummy.java | 5 +- .../generics/EmbeddedGenericsTest.java | 15 +- .../test/annotations/generics/Gene.java | 14 +- .../annotations/generics/GenericsTest.java | 1 - .../test/annotations/generics/Item.java | 1 - .../test/annotations/generics/Paper.java | 1 - .../test/annotations/generics/PaperType.java | 1 - .../test/annotations/generics/Price.java | 1 - .../annotations/generics/PricedStuff.java | 1 - .../test/annotations/generics/SomeGuy.java | 1 - .../test/annotations/generics/State.java | 3 +- .../test/annotations/generics/StateType.java | 8 +- .../test/annotations/generics/Stuff.java | 1 - .../generics/UnresolvedTypeTest.java | 9 +- .../test/annotations/generics/WildEntity.java | 1 - .../genericsinheritance/Child.java | 9 +- .../genericsinheritance/ChildHierarchy1.java | 5 +- .../genericsinheritance/ChildHierarchy2.java | 5 +- .../genericsinheritance/ChildHierarchy22.java | 5 +- .../GenericsInheritanceTest.java | 5 +- .../genericsinheritance/Parent.java | 18 +- .../genericsinheritance/ParentHierarchy1.java | 5 +- .../genericsinheritance/ParentHierarchy2.java | 5 +- .../ParentHierarchy22.java | 5 +- .../test/annotations/id/EnumIdTest.java | 1 - .../test/annotations/id/IdClassTest.java | 1 - .../hibernate/test/annotations/id/IdTest.java | 1 - .../id/JoinColumnOverrideTest.java | 3 +- .../test/annotations/id/NewSchemeIdTest.java | 1 - .../test/annotations/id/UUIDGenerator.java | 2 - .../test/annotations/id/entities/Ball.java | 1 - .../annotations/id/entities/BreakDance.java | 7 +- .../test/annotations/id/entities/Bunny.java | 5 +- .../annotations/id/entities/Computer.java | 1 - .../annotations/id/entities/Department.java | 2 - .../test/annotations/id/entities/Dog.java | 1 - .../test/annotations/id/entities/FirTree.java | 1 - .../annotations/id/entities/Footballer.java | 1 - .../annotations/id/entities/FootballerPk.java | 1 - .../annotations/id/entities/Furniture.java | 2 - .../annotations/id/entities/GoalKeeper.java | 1 - .../test/annotations/id/entities/Home.java | 1 - .../annotations/id/entities/Location.java | 1 - .../id/entities/MilitaryBuilding.java | 1 - .../test/annotations/id/entities/Monkey.java | 1 - .../test/annotations/id/entities/Phone.java | 1 - .../test/annotations/id/entities/Planet.java | 1 + .../id/entities/PlanetCheatSheet.java | 1 - .../annotations/id/entities/PointyTooth.java | 3 - .../test/annotations/id/entities/Shoe.java | 2 - .../annotations/id/entities/SoundSystem.java | 1 - .../test/annotations/id/entities/Store.java | 2 - .../test/annotations/id/entities/Tower.java | 1 - .../test/annotations/id/entities/Tree.java | 1 - .../annotations/id/entities/TwinkleToes.java | 3 - .../id/generationmappings/AutoEntity.java | 2 - .../CompleteSequenceEntity.java | 1 - .../MinimalSequenceEntity.java | 1 - .../MinimalTableEntity.java | 1 - .../NewGeneratorMappingsTest.java | 1 - .../test/annotations/id/package-info.java | 1 + .../annotations/id/sequences/EnumIdTest.java | 1 - .../annotations/id/sequences/IdClassTest.java | 1 - .../test/annotations/id/sequences/IdTest.java | 5 +- .../id/sequences/JoinColumnOverrideTest.java | 1 - .../id/sequences/NewSchemeIdTest.java | 1 - .../id/sequences/UUIDGenerator.java | 2 - .../id/sequences/entities/Ball.java | 1 - .../id/sequences/entities/BreakDance.java | 5 +- .../id/sequences/entities/Bunny.java | 5 +- .../id/sequences/entities/Computer.java | 1 - .../id/sequences/entities/Department.java | 1 - .../id/sequences/entities/Dog.java | 1 - .../id/sequences/entities/FirTree.java | 1 - .../id/sequences/entities/Footballer.java | 1 - .../id/sequences/entities/FootballerPk.java | 1 - .../id/sequences/entities/Furniture.java | 2 - .../id/sequences/entities/GoalKeeper.java | 1 - .../id/sequences/entities/Home.java | 1 - .../id/sequences/entities/Location.java | 1 - .../sequences/entities/MilitaryBuilding.java | 1 - .../id/sequences/entities/Monkey.java | 1 - .../id/sequences/entities/Phone.java | 1 - .../id/sequences/entities/Planet.java | 1 + .../sequences/entities/PlanetCheatSheet.java | 1 - .../id/sequences/entities/PointyTooth.java | 3 - .../id/sequences/entities/Shoe.java | 1 - .../id/sequences/entities/SoundSystem.java | 1 - .../id/sequences/entities/Store.java | 1 - .../id/sequences/entities/Tower.java | 1 - .../id/sequences/entities/Tree.java | 1 - .../id/sequences/entities/TwinkleToes.java | 3 - .../id/sequences/package-info.java | 1 + .../test/annotations/idclass/DomainAdmin.java | 1 - .../annotations/idclass/DomainAdminId.java | 1 - .../idclass/IdClassCompositePKTest.java | 1 - .../idclass/xml/HabitatSpeciesLink.java | 3 +- .../idclass/xml/IdClassXmlTest.java | 3 +- .../IdClassGeneratedValueTest.java | 2 - .../idclassgeneratedvalue/Multiple.java | 3 - .../idclassgeneratedvalue/MultiplePK.java | 1 - .../idclassgeneratedvalue/Simple.java | 1 - .../idclassgeneratedvalue/Simple2.java | 2 - .../idclassgeneratedvalue/SimplePK.java | 1 - .../IdentifierCollectionTest.java | 5 +- .../identifiercollection/Passport.java | 4 +- .../identifiercollection/Stamp.java | 5 +- .../annotations/idmanytoone/BasketItems.java | 19 +- .../idmanytoone/BasketItemsPK.java | 9 +- .../test/annotations/idmanytoone/Card.java | 7 +- .../annotations/idmanytoone/CardField.java | 5 +- .../test/annotations/idmanytoone/CardKey.java | 5 +- .../annotations/idmanytoone/Customer.java | 9 +- .../annotations/idmanytoone/Customers.java | 5 +- .../idmanytoone/IdManyToOneTest.java | 3 +- .../test/annotations/idmanytoone/Project.java | 5 +- .../idmanytoone/ShoppingBaskets.java | 2 - .../idmanytoone/ShoppingBasketsPK.java | 13 +- .../test/annotations/idmanytoone/Store.java | 9 +- .../idmanytoone/StoreCustomer.java | 7 +- .../idmanytoone/StoreCustomerPK.java | 5 +- .../idmanytoone/alphabetical/A.java | 1 - .../idmanytoone/alphabetical/Acces.java | 1 - .../AlphabeticalIdManyToOneTest.java | 1 - .../AlphabeticalManyToOneTest.java | 1 - .../idmanytoone/alphabetical/B.java | 1 - .../idmanytoone/alphabetical/BId.java | 1 - .../idmanytoone/alphabetical/Benefserv.java | 2 - .../idmanytoone/alphabetical/C.java | 1 - .../idmanytoone/alphabetical/CId.java | 1 - .../idmanytoone/alphabetical/Droitacces.java | 2 - .../idmanytoone/alphabetical/Service.java | 2 - .../test/annotations/immutable/Country.java | 6 - .../test/annotations/immutable/Foobar.java | 2 - .../annotations/immutable/ImmutableTest.java | 1 - .../test/annotations/immutable/State.java | 1 - .../annotations/indexcoll/AddressBook.java | 2 - .../annotations/indexcoll/AddressEntry.java | 1 - .../annotations/indexcoll/AddressEntryPk.java | 1 - .../indexcoll/AlphabeticalDirectory.java | 3 +- .../annotations/indexcoll/Atmosphere.java | 12 +- .../test/annotations/indexcoll/Drawer.java | 1 - .../test/annotations/indexcoll/Dress.java | 1 - .../test/annotations/indexcoll/Gas.java | 3 +- .../test/annotations/indexcoll/GasKey.java | 3 +- .../annotations/indexcoll/Generation.java | 3 +- .../indexcoll/GenerationGroup.java | 5 +- .../annotations/indexcoll/GenerationUser.java | 11 +- .../indexcoll/IndexedCollectionTest.java | 4 +- .../annotations/indexcoll/MapKeyTest.java | 5 +- .../test/annotations/indexcoll/News.java | 1 - .../test/annotations/indexcoll/Newspaper.java | 1 - .../test/annotations/indexcoll/Painter.java | 1 - .../test/annotations/indexcoll/Painting.java | 1 - .../annotations/indexcoll/PaintingPk.java | 1 - .../indexcoll/PressReleaseAgency.java | 1 - .../test/annotations/indexcoll/Software.java | 3 +- .../test/annotations/indexcoll/Trainee.java | 5 +- .../test/annotations/indexcoll/Training.java | 6 +- .../test/annotations/indexcoll/Version.java | 3 +- .../test/annotations/indexcoll/Wardrobe.java | 2 - .../test/annotations/inheritance/Apple.java | 1 - .../test/annotations/inheritance/Carrot.java | 2 - .../test/annotations/inheritance/Fruit.java | 1 - .../annotations/inheritance/SubclassTest.java | 2 - .../test/annotations/inheritance/Tomato.java | 4 +- .../annotations/inheritance/Vegetable.java | 1 - .../annotations/inheritance/VegetablePk.java | 1 - .../discriminatoroptions/BaseClass.java | 2 - .../DiscriminatorOptionsTest.java | 1 - .../discriminatoroptions/SubClass.java | 3 - .../inheritance/joined/Account.java | 4 +- .../annotations/inheritance/joined/Alarm.java | 3 +- .../annotations/inheritance/joined/Asset.java | 7 +- .../inheritance/joined/Client.java | 3 +- .../inheritance/joined/Clothing.java | 3 +- .../inheritance/joined/Company.java | 3 +- .../inheritance/joined/Customer.java | 5 +- .../inheritance/joined/Document.java | 2 - .../inheritance/joined/EventInformation.java | 3 +- .../annotations/inheritance/joined/File.java | 3 +- .../inheritance/joined/FinancialAsset.java | 3 +- .../inheritance/joined/Folder.java | 1 - .../JoinedSubclassAndSecondaryTable.java | 3 +- .../joined/JoinedSubclassTest.java | 2 - .../inheritance/joined/LegalEntity.java | 3 +- .../inheritance/joined/Parent.java | 3 +- .../inheritance/joined/Person.java | 3 +- .../annotations/inheritance/joined/Pool.java | 9 +- .../inheritance/joined/ProgramExecution.java | 1 - .../inheritance/joined/PropertyAsset.java | 3 +- .../inheritance/joined/Sweater.java | 1 - .../inheritance/joined/SwimmingPool.java | 3 +- .../inheritance/joined/SymbolicLink.java | 1 - .../inheritance/mixed/Document.java | 1 - .../annotations/inheritance/mixed/File.java | 1 - .../annotations/inheritance/mixed/Folder.java | 1 - .../inheritance/mixed/SubclassTest.java | 2 - .../inheritance/mixed/SymbolicLink.java | 1 - .../inheritance/singletable/Building.java | 2 - .../inheritance/singletable/Funk.java | 1 - .../inheritance/singletable/House.java | 1 - .../inheritance/singletable/Music.java | 4 +- .../inheritance/singletable/Noise.java | 1 - .../inheritance/singletable/PaperTrash.java | 1 - .../inheritance/singletable/Rock.java | 1 - .../inheritance/singletable/Trash.java | 1 - .../inheritance/union/Document.java | 1 - .../annotations/inheritance/union/File.java | 1 - .../annotations/inheritance/union/Folder.java | 1 - .../inheritance/union/SubclassTest.java | 2 - .../inheritance/union/SymbolicLink.java | 1 - .../test/annotations/interfaces/Contact.java | 3 +- .../annotations/interfaces/ContactImpl.java | 3 +- .../interfaces/InterfacesTest.java | 3 +- .../test/annotations/interfaces/User.java | 3 +- .../test/annotations/interfaces/UserImpl.java | 3 +- .../hibernate/test/annotations/join/A.java | 3 +- .../hibernate/test/annotations/join/B.java | 3 +- .../hibernate/test/annotations/join/C.java | 3 +- .../hibernate/test/annotations/join/Cat.java | 10 +- .../test/annotations/join/Death.java | 3 +- .../hibernate/test/annotations/join/Dog.java | 1 - .../test/annotations/join/DogPk.java | 1 - .../test/annotations/join/JoinTest.java | 2 - .../hibernate/test/annotations/join/Life.java | 1 - .../test/annotations/join/SysGroupsOrm.java | 14 +- .../test/annotations/join/SysUserOrm.java | 25 +- .../test/annotations/loader/LoaderTest.java | 6 +- .../test/annotations/loader/Player.java | 18 +- .../test/annotations/loader/Team.java | 24 +- .../test/annotations/lob/AbstractBook.java | 3 - .../annotations/lob/AbstractCompiledCode.java | 1 - .../test/annotations/lob/AbstractLobTest.java | 1 - .../hibernate/test/annotations/lob/Book.java | 3 - .../lob/CharacterArrayTextType.java | 1 - .../test/annotations/lob/CompiledCode.java | 2 - .../hibernate/test/annotations/lob/Dog.java | 1 - .../test/annotations/lob/Editor.java | 1 - .../test/annotations/lob/ImageHolder.java | 1 - .../test/annotations/lob/ImageTest.java | 4 +- .../test/annotations/lob/LobTest.java | 4 - .../annotations/lob/LongStringHolder.java | 2 - .../lob/MaterializedBlobEntity.java | 1 - .../annotations/lob/MaterializedBlobTest.java | 3 - .../lob/PrimitiveCharacterArrayTextType.java | 1 - .../lob/SerializableToImageType.java | 2 - .../test/annotations/lob/TextTest.java | 4 +- .../test/annotations/lob/VersionedBook.java | 1 - .../lob/VersionedCompiledCode.java | 1 - .../annotations/lob/VersionedLobTest.java | 2 - .../annotations/lob/WrappedImageType.java | 1 - .../test/annotations/lob/package-info.java | 1 - .../test/annotations/manytomany/Building.java | 3 +- .../manytomany/BuildingCompany.java | 5 +- .../test/annotations/manytomany/Cat.java | 3 +- .../test/annotations/manytomany/CatPk.java | 1 - .../test/annotations/manytomany/City.java | 1 - .../test/annotations/manytomany/Company.java | 5 +- .../annotations/manytomany/ContactInfo.java | 3 +- .../annotations/manytomany/Contractor.java | 2 - .../test/annotations/manytomany/Employee.java | 4 +- .../test/annotations/manytomany/Employer.java | 3 - .../test/annotations/manytomany/Friend.java | 1 - .../test/annotations/manytomany/Group.java | 2 - .../annotations/manytomany/GroupWithSet.java | 7 +- .../annotations/manytomany/Inspector.java | 1 - .../manytomany/InspectorPrefixes.java | 1 - .../test/annotations/manytomany/JobInfo.java | 1 - .../annotations/manytomany/KnownClient.java | 1 - .../test/annotations/manytomany/Man.java | 1 - .../test/annotations/manytomany/ManPk.java | 3 +- .../ManyToManyMaxFetchDepth0Test.java | 2 - .../manytomany/ManyToManyTest.java | 3 - .../annotations/manytomany/Permission.java | 1 - .../annotations/manytomany/PhoneNumber.java | 3 +- .../manytomany/ProgramManager.java | 3 +- .../test/annotations/manytomany/Store.java | 1 - .../test/annotations/manytomany/Supplier.java | 1 - .../test/annotations/manytomany/Woman.java | 2 - .../test/annotations/manytomany/WomanPk.java | 3 +- .../test/annotations/manytomany/Zone.java | 1 - .../annotations/manytoone/BiggestForest.java | 7 +- .../test/annotations/manytoone/Car.java | 2 - .../test/annotations/manytoone/Carz.java | 10 +- .../test/annotations/manytoone/Child.java | 1 - .../test/annotations/manytoone/Color.java | 1 - .../test/annotations/manytoone/Customer.java | 3 +- .../test/annotations/manytoone/Deal.java | 7 +- .../annotations/manytoone/DistrictUser.java | 23 +- .../annotations/manytoone/ForestType.java | 8 +- .../test/annotations/manytoone/Frame.java | 6 +- .../test/annotations/manytoone/Lens.java | 10 +- .../test/annotations/manytoone/Lotz.java | 9 +- .../test/annotations/manytoone/LotzPK.java | 1 - .../manytoone/ManyToOneJoinTest.java | 5 +- .../manytoone/ManyToOneOnNonPkTest.java | 4 - .../annotations/manytoone/ManyToOneTest.java | 2 - .../test/annotations/manytoone/Node.java | 1 - .../test/annotations/manytoone/NodePk.java | 1 - .../test/annotations/manytoone/Order.java | 7 +- .../test/annotations/manytoone/OrderLine.java | 7 +- .../test/annotations/manytoone/Parent.java | 1 - .../test/annotations/manytoone/ParentPk.java | 1 - .../test/annotations/manytoone/TreeType.java | 13 +- .../test/annotations/manytoone/User.java | 25 +- .../test/annotations/manytoone/UserPK.java | 11 +- .../referencedcolumnname/GenericObject.java | 1 - .../manytoone/referencedcolumnname/Item.java | 5 - .../ManyToOneReferencedColumnNameTest.java | 4 +- .../referencedcolumnname/Vendor.java | 5 - .../referencedcolumnname/WarehouseItem.java | 1 - .../referencedcolumnname/ZItemCost.java | 3 - .../manytoonewithformula/Company.java | 1 - .../manytoonewithformula/Contract.java | 4 +- .../manytoonewithformula/ContractId.java | 3 +- .../manytoonewithformula/FoodItem.java | 6 +- .../manytoonewithformula/Language.java | 2 - .../manytoonewithformula/Manufacturer.java | 4 +- .../manytoonewithformula/ManufacturerId.java | 4 +- .../ManyToOneWithFormulaTest.java | 3 +- .../manytoonewithformula/Menu.java | 3 +- .../manytoonewithformula/Message.java | 2 - .../manytoonewithformula/Model.java | 3 +- .../manytoonewithformula/ModelId.java | 3 +- .../manytoonewithformula/Person.java | 2 - .../manytoonewithformula/Product.java | 5 +- .../intermediate/Account.java | 3 +- .../intermediate/AccountBase.java | 6 +- .../IntermediateMappedSuperclassTest.java | 2 - .../intermediate/SavingsAccount.java | 3 +- .../intermediate/SavingsAccountBase.java | 3 +- .../test/annotations/namingstrategy/A.java | 13 +- .../annotations/namingstrategy/Address.java | 1 - .../namingstrategy/AddressEntry.java | 1 - .../namingstrategy/DummyNamingStrategy.java | 1 - .../namingstrategy/NamingStrategyTest.java | 1 - .../annotations/namingstrategy/Person.java | 2 - .../test/annotations/naturalid/Citizen.java | 2 - .../naturalid/NaturalIdOnManyToOne.java | 2 - .../NaturalIdOnSingleManyToOneTest.java | 1 - .../annotations/naturalid/NaturalIdTest.java | 2 - .../test/annotations/naturalid/State.java | 5 +- .../test/annotations/notfound/Coin.java | 2 - .../test/annotations/notfound/Currency.java | 1 - .../annotations/notfound/NotFoundTest.java | 1 - .../test/annotations/onetomany/Child.java | 1 - .../test/annotations/onetomany/City.java | 2 - .../annotations/onetomany/Manufacturer.java | 3 +- .../test/annotations/onetomany/Model.java | 3 +- .../test/annotations/onetomany/Monkey.java | 1 - .../annotations/onetomany/OneToManyTest.java | 4 +- .../test/annotations/onetomany/Order.java | 5 +- .../annotations/onetomany/OrderByTest.java | 3 +- .../test/annotations/onetomany/OrderID.java | 1 - .../test/annotations/onetomany/OrderItem.java | 1 - .../annotations/onetomany/OrderItemID.java | 1 - .../annotations/onetomany/Organisation.java | 11 +- .../onetomany/OrganisationUser.java | 3 +- .../test/annotations/onetomany/Parent.java | 2 - .../test/annotations/onetomany/ParentPk.java | 1 - .../test/annotations/onetomany/Person.java | 9 +- .../annotations/onetomany/PoliticalParty.java | 1 - .../annotations/onetomany/Politician.java | 1 - .../test/annotations/onetomany/Soldier.java | 1 - .../test/annotations/onetomany/Street.java | 4 +- .../test/annotations/onetomany/Tiger.java | 1 - .../test/annotations/onetomany/Trainer.java | 2 - .../test/annotations/onetomany/Troop.java | 2 - .../test/annotations/onetoone/Address.java | 1 - .../test/annotations/onetoone/Body.java | 1 - .../test/annotations/onetoone/Client.java | 1 - .../test/annotations/onetoone/Computer.java | 1 - .../test/annotations/onetoone/ComputerPk.java | 1 - .../test/annotations/onetoone/Father.java | 1 + .../test/annotations/onetoone/Heart.java | 1 - .../onetoone/OneToOneErrorTest.java | 5 +- .../annotations/onetoone/OneToOneTest.java | 2 - .../test/annotations/onetoone/Owner.java | 7 +- .../annotations/onetoone/OwnerAddress.java | 6 +- .../test/annotations/onetoone/Party.java | 1 - .../annotations/onetoone/PartyAffiliate.java | 2 - .../annotations/onetoone/SerialNumber.java | 1 - .../annotations/onetoone/SerialNumberPk.java | 1 - .../test/annotations/onetoone/Show.java | 1 - .../annotations/onetoone/ShowDescription.java | 1 - .../test/annotations/onetoone/Son.java | 1 + .../test/annotations/onetoone/Trousers.java | 1 - .../annotations/onetoone/TrousersZip.java | 1 - .../onetoone/hhh4851/BaseEntity.java | 1 - .../annotations/onetoone/hhh4851/Device.java | 13 +- .../onetoone/hhh4851/DeviceGroupConfig.java | 1 - .../onetoone/hhh4851/HHH4851Test.java | 1 - .../onetoone/hhh4851/Hardware.java | 23 +- .../onetoone/hhh4851/ManagedDevice.java | 1 - .../annotations/onetoone/hhh4851/Owner.java | 1 - .../onetoone/primarykey/Address.java | 1 - .../primarykey/NullablePrimaryKeyTest.java | 1 - .../onetoone/primarykey/Person.java | 1 - .../test/annotations/override/Addr.java | 2 - .../test/annotations/override/Address.java | 2 - .../override/AssociationOverrideTest.java | 10 +- .../override/AttributeOverrideTest.java | 1 - .../annotations/override/ContactInfo.java | 3 +- .../test/annotations/override/Employee.java | 1 - .../test/annotations/override/Location.java | 3 +- .../test/annotations/override/Move.java | 3 +- .../annotations/override/PhoneNumber.java | 5 +- .../annotations/override/PropertyInfo.java | 1 - .../annotations/override/PropertyRecord.java | 4 +- .../test/annotations/override/SocialSite.java | 3 +- .../override/SocialTouchPoints.java | 5 +- .../test/annotations/override/Trip.java | 3 +- .../test/annotations/persister/Card.java | 1 - .../persister/CollectionPersister.java | 1 - .../test/annotations/persister/Deck.java | 2 - .../persister/EntityPersister.java | 2 - .../annotations/persister/PersisterTest.java | 1 - .../test/annotations/polymorphism/Car.java | 4 +- .../annotations/polymorphism/MovingThing.java | 3 +- .../polymorphism/PolymorphismTest.java | 5 +- .../annotations/polymorphism/SportCar.java | 4 +- .../test/annotations/query/Area.java | 1 - .../test/annotations/query/Captain.java | 1 - .../annotations/query/CasimirParticle.java | 5 +- .../test/annotations/query/Chaos.java | 18 +- .../test/annotations/query/Darkness.java | 1 - .../test/annotations/query/Dictionary.java | 1 - .../test/annotations/query/Dimensions.java | 1 - .../test/annotations/query/Identity.java | 1 - .../test/annotations/query/Mark.java | 1 - .../test/annotations/query/Night.java | 1 - .../annotations/query/QueryAndSQLTest.java | 2 - .../test/annotations/query/SpaceShip.java | 1 - .../query/SynonymousDictionary.java | 1 - .../test/annotations/query/Twilight.java | 1 - .../test/annotations/quote/Phone.java | 7 - .../annotations/quote/QuoteGlobalTest.java | 1 - .../test/annotations/quote/QuoteTest.java | 5 +- .../test/annotations/quote/Role.java | 7 +- .../test/annotations/quote/User.java | 9 +- .../ExplicitSqlResultSetMappingTest.java | 1 - .../quote/resultsetmappings/MyEntity.java | 1 - .../annotations/referencedcolumnname/Bag.java | 1 - .../referencedcolumnname/Clothes.java | 1 - .../referencedcolumnname/House.java | 1 - .../referencedcolumnname/Inhabitant.java | 1 - .../referencedcolumnname/Item.java | 3 +- .../referencedcolumnname/ItemCost.java | 7 +- .../referencedcolumnname/Luggage.java | 1 - .../referencedcolumnname/Postman.java | 1 - .../referencedcolumnname/Rambler.java | 1 - .../ReferencedColumnNameTest.java | 4 +- .../referencedcolumnname/Vendor.java | 5 +- .../referencedcolumnname/WarehouseItem.java | 5 +- .../reflection/Administration.java | 3 +- .../annotations/reflection/Availability.java | 3 +- .../test/annotations/reflection/BusTrip.java | 3 +- .../annotations/reflection/BusTripPk.java | 3 +- .../annotations/reflection/Competition.java | 3 +- .../JPAOverridenAnnotationReaderTest.java | 9 +- .../annotations/reflection/LogListener.java | 3 +- .../test/annotations/reflection/Match.java | 3 +- .../annotations/reflection/Organization.java | 3 +- .../reflection/OtherLogListener.java | 3 +- .../SocialSecurityMoralAccount.java | 3 +- .../reflection/SocialSecurityNumber.java | 3 +- .../SocialSecurityPhysicalAccount.java | 3 +- .../annotations/reflection/TennisMatch.java | 3 +- .../reflection/XMLContextTest.java | 4 +- .../test/annotations/strategy/Location.java | 1 + .../test/annotations/strategy/Storm.java | 4 +- .../annotations/strategy/StrategyTest.java | 1 - .../test/annotations/subselect/Bid.java | 3 +- .../annotations/subselect/HighestBid.java | 4 +- .../test/annotations/subselect/Item.java | 4 +- .../annotations/subselect/SubselectTest.java | 3 +- .../annotations/tableperclass/Component.java | 4 +- .../annotations/tableperclass/Machine.java | 1 - .../annotations/tableperclass/Product.java | 3 +- .../test/annotations/tableperclass/Robot.java | 1 - .../test/annotations/tableperclass/T800.java | 1 - .../tableperclass/TablePerClassTest.java | 5 +- .../test/annotations/target/Brand.java | 2 - .../test/annotations/target/Luggage.java | 1 + .../test/annotations/target/LuggageImpl.java | 8 +- .../test/annotations/target/Owner.java | 2 +- .../test/annotations/target/OwnerImpl.java | 1 - .../test/annotations/target/Size.java | 1 + .../test/annotations/target/SizeImpl.java | 1 - .../test/annotations/target/TargetTest.java | 3 +- .../test/annotations/tuplizer/Country.java | 5 +- .../test/annotations/tuplizer/Cuisine.java | 8 +- .../tuplizer/DataProxyHandler.java | 5 +- .../tuplizer/DynamicComponentTuplizer.java | 3 +- .../tuplizer/DynamicEntityTuplizer.java | 11 +- .../tuplizer/DynamicInstantiator.java | 8 +- .../tuplizer/EntityNameInterceptor.java | 3 +- .../annotations/tuplizer/ProxyHelper.java | 5 +- .../annotations/tuplizer/TuplizerTest.java | 5 +- .../hibernate/test/annotations/type/Dvd.java | 2 - .../test/annotations/type/MyOid.java | 1 - .../test/annotations/type/MyOidGenerator.java | 2 - .../test/annotations/type/MyOidType.java | 2 - .../test/annotations/type/TypeTest.java | 1 - .../test/annotations/various/Antenna.java | 6 +- .../test/annotations/various/Conductor.java | 2 - .../annotations/various/DBTimestamped.java | 2 - .../annotations/various/GeneratedTest.java | 5 +- .../test/annotations/various/IndexTest.java | 2 - .../various/OptimisticLockAnnotationTest.java | 1 - .../various/ProfessionalAgreement.java | 3 +- .../annotations/various/TimestampTest.java | 1 - .../test/annotations/various/Truck.java | 4 +- .../annotations/various/VMTimestamped.java | 2 - .../test/annotations/various/Vehicule.java | 2 - .../ColumnTransformerTest.java | 1 - .../various/readwriteexpression/Staff.java | 2 - .../test/annotations/xml/ejb3/CarModel.java | 3 +- .../test/annotations/xml/ejb3/Company.java | 1 - .../ejb3/Ejb3XmlElementCollectionTest.java | 1 - .../xml/ejb3/Ejb3XmlManyToManyTest.java | 1 - .../xml/ejb3/Ejb3XmlManyToOneTest.java | 1 - .../xml/ejb3/Ejb3XmlOneToManyTest.java | 1 - .../xml/ejb3/Ejb3XmlOneToOneTest.java | 1 - .../annotations/xml/ejb3/Ejb3XmlTest.java | 2 - .../annotations/xml/ejb3/Ejb3XmlTestCase.java | 3 - .../test/annotations/xml/ejb3/Entity1.java | 1 + .../test/annotations/xml/ejb3/Entity2.java | 1 - .../test/annotations/xml/ejb3/Entity3.java | 1 - .../test/annotations/xml/ejb3/Light.java | 3 +- .../test/annotations/xml/ejb3/Lighter.java | 3 +- .../annotations/xml/ejb3/Manufacturer.java | 1 - .../test/annotations/xml/ejb3/Model.java | 3 +- .../annotations/xml/ejb3/VicePresident.java | 1 + .../hibernate/test/annotations/xml/hbm/A.java | 1 + .../test/annotations/xml/hbm/AImpl.java | 3 +- .../hibernate/test/annotations/xml/hbm/B.java | 1 + .../test/annotations/xml/hbm/BImpl.java | 1 - .../test/annotations/xml/hbm/CloudType.java | 3 +- .../test/annotations/xml/hbm/Government.java | 1 + .../test/annotations/xml/hbm/HbmTest.java | 2 - .../xml/hbm/HbmWithIdentityTest.java | 3 +- .../annotations/xml/hbm/PrimeMinister.java | 1 - .../test/annotations/xml/hbm/Sky.java | 3 +- .../hibernate/test/annotations/xml/hbm/Z.java | 1 + .../test/annotations/xml/hbm/ZImpl.java | 3 +- .../java/org/hibernate/test/any/Address.java | 7 +- .../org/hibernate/test/any/AnyTypeTest.java | 12 +- .../test/any/ComplexPropertyValue.java | 9 +- .../test/any/IntegerPropertyValue.java | 3 +- .../java/org/hibernate/test/any/Person.java | 3 +- .../org/hibernate/test/any/PropertySet.java | 7 +- .../org/hibernate/test/any/PropertyValue.java | 3 +- .../test/any/StringPropertyValue.java | 3 +- .../test/java/org/hibernate/test/array/A.java | 1 + .../org/hibernate/test/array/ArrayTest.java | 2 - .../test/java/org/hibernate/test/array/B.java | 1 + .../hibernate/test/ast/ASTIteratorTest.java | 7 +- .../org/hibernate/test/ast/ASTUtilTest.java | 6 +- .../org/hibernate/test/batch/BatchTest.java | 7 +- .../org/hibernate/test/batch/DataPoint.java | 1 - .../test/batchfetch/BatchFetchTest.java | 3 - .../org/hibernate/test/batchfetch/Model.java | 1 + .../test/batchfetch/ProductLine.java | 1 - .../java/org/hibernate/test/bidi/Auction.java | 1 - .../org/hibernate/test/bidi/AuctionTest.java | 5 +- .../org/hibernate/test/bidi/AuctionTest2.java | 5 +- .../java/org/hibernate/test/bidi/Bid.java | 1 - .../org/hibernate/test/bytecode/Bean.java | 3 +- .../test/bytecode/BeanReflectionHelper.java | 4 +- .../hibernate/test/bytecode/ProxyBean.java | 3 +- .../bytecode/cglib/CGLIBThreadLocalTest.java | 21 +- .../cglib/InvocationTargetExceptionTest.java | 21 +- .../cglib/ReflectionOptimizerTest.java | 4 +- .../InvocationTargetExceptionTest.java | 21 +- .../javassist/ReflectionOptimizerTest.java | 4 +- .../hibernate/test/cache/CacheableItem.java | 3 - .../test/cache/InsertedDataTest.java | 2 - .../java/org/hibernate/test/cascade/A.java | 5 +- .../BidirectionalOneToManyCascadeTest.java | 3 - .../CascadeTestWithAssignedParentIdTest.java | 4 - .../org/hibernate/test/cascade/Child.java | 1 + .../test/cascade/DeleteOrphanChild.java | 1 + .../java/org/hibernate/test/cascade/G.java | 5 +- .../java/org/hibernate/test/cascade/H.java | 5 +- .../java/org/hibernate/test/cascade/Job.java | 1 + .../org/hibernate/test/cascade/JobBatch.java | 3 +- .../test/cascade/MultiPathCascadeTest.java | 4 +- .../org/hibernate/test/cascade/Parent.java | 1 - .../hibernate/test/cascade/RefreshTest.java | 3 - .../CascadeMergeToChildBeforeParentTest.java | 2 - ...ascadeCheckNullFalseDelayedInsertTest.java | 3 - ...CascadeCheckNullTrueDelayedInsertTest.java | 2 - ...ircleCascadeCheckNullibilityFalseTest.java | 2 - ...CircleCascadeCheckNullibilityTrueTest.java | 2 - ...ltiPathCircleCascadeDelayedInsertTest.java | 2 - .../circle/MultiPathCircleCascadeTest.java | 3 - .../hibernate/test/cascade/circle/Node.java | 7 +- .../hibernate/test/cascade/circle/Route.java | 7 +- .../hibernate/test/cascade/circle/Tour.java | 5 +- .../test/cascade/circle/Transport.java | 1 + .../test/cascade/circle/Vehicle.java | 3 +- .../hibernate/test/cfg/CacheableFileTest.java | 4 +- .../cfg/ConfigurationSerializationTest.java | 7 +- .../org/hibernate/test/cfg/ListenerTest.java | 2 - .../internal/ServiceBootstrappingTest.java | 14 +- .../TestServicesRegistryBootstrapping.java | 1 - .../hibernate/test/cid/CompositeIdTest.java | 3 - .../cid/CompositeIdWithGeneratorTest.java | 3 - .../java/org/hibernate/test/cid/Customer.java | 7 +- .../java/org/hibernate/test/cid/LineItem.java | 1 - .../java/org/hibernate/test/cid/Order.java | 1 - .../java/org/hibernate/test/cid/Product.java | 1 - .../hibernate/test/cid/PurchaseDetail.java | 1 + .../hibernate/test/cid/PurchaseRecord.java | 1 - .../test/cid/PurchaseRecordIdGenerator.java | 2 - .../compkey/BackrefCompositeMapKeyTest.java | 10 +- .../backref/map/compkey/MapKey.java | 1 - .../collection/backref/map/compkey/Part.java | 1 - .../backref/map/compkey/Product.java | 1 - .../test/collection/bag/BagOwner.java | 7 +- .../collection/bag/PersistentBagTest.java | 17 +- .../test/collection/idbag/IdbagOwner.java | 7 +- .../collection/idbag/PersistentIdBagTest.java | 17 +- .../test/collection/list/ListOwner.java | 7 +- .../collection/list/PersistentListTest.java | 17 +- .../hibernate/test/collection/map/Child.java | 3 +- .../hibernate/test/collection/map/Parent.java | 7 +- .../collection/map/PersistentMapTest.java | 17 +- .../test/collection/original/Animal.java | 1 + .../collection/original/CollectionTest.java | 3 - .../test/collection/original/Email.java | 1 + .../test/collection/original/Mammal.java | 1 + .../test/collection/original/Permission.java | 1 + .../test/collection/original/User.java | 1 - .../test/collection/original/Zoo.java | 1 - .../hibernate/test/collection/set/Child.java | 3 +- .../test/collection/set/Container.java | 1 - .../hibernate/test/collection/set/Parent.java | 7 +- .../set/PersistentSetNonLazyTest.java | 4 +- .../collection/set/PersistentSetTest.java | 27 +- .../common/BasicTestingJdbcServiceImpl.java | 4 +- .../common/ConnectionProviderBuilder.java | 2 - .../test/common/ServiceRegistryHolder.java | 4 - .../test/component/basic/ComponentTest.java | 7 +- .../test/component/basic/Employee.java | 9 +- .../component/basic/OptionalComponent.java | 1 + .../test/component/basic/Person.java | 1 - .../hibernate/test/component/basic/User.java | 1 - .../CascadeToComponentCollectionTest.java | 17 +- .../cascading/collection/Definition.java | 7 +- .../collection/LocalizedStrings.java | 9 +- .../component/cascading/collection/Value.java | 3 +- .../component/cascading/toone/Address.java | 3 +- .../CascadeToComponentAssociationTest.java | 12 +- .../component/cascading/toone/Document.java | 3 +- .../cascading/toone/PersonalInfo.java | 3 +- .../test/component/cascading/toone/User.java | 3 +- .../test/compositeelement/Child.java | 1 + .../CompositeElementTest.java | 7 +- .../test/compositeelement/Parent.java | 1 - .../connections/AggressiveReleaseTest.java | 3 - .../BasicConnectionProviderTest.java | 2 - .../ConnectionManagementTestCase.java | 1 - .../CurrentSessionConnectionTest.java | 2 - .../org/hibernate/test/connections/Other.java | 3 +- .../org/hibernate/test/connections/Silly.java | 1 - .../connections/SuppliedConnectionTest.java | 3 - .../ThreadLocalCurrentSessionTest.java | 2 - .../hibernate/test/criteria/AbstractFoo.java | 3 +- .../java/org/hibernate/test/criteria/Bar.java | 3 +- .../hibernate/test/criteria/CityState.java | 1 + .../org/hibernate/test/criteria/Course.java | 1 - .../test/criteria/CourseMeeting.java | 1 + .../test/criteria/CourseMeetingId.java | 1 - .../test/criteria/CriteriaQueryTest.java | 7 +- .../hibernate/test/criteria/Enrolment.java | 1 - .../org/hibernate/test/criteria/GreatFoo.java | 3 +- .../org/hibernate/test/criteria/LikeTest.java | 2 - .../test/criteria/LongInElementsTest.java | 4 +- .../test/criteria/StringExpression.java | 1 - .../org/hibernate/test/criteria/Student.java | 1 - .../hibernate/test/criteria/StudentDTO.java | 1 + .../hibernate/test/criteria/TestObject.java | 1 + .../java/org/hibernate/test/cuk/Account.java | 1 - .../java/org/hibernate/test/cuk/Address.java | 1 - .../test/cuk/CompositePropertyRefTest.java | 3 - .../java/org/hibernate/test/cuk/Person.java | 1 - .../test/cut/CompositeUserTypeTest.java | 3 - .../hibernate/test/cut/MonetoryAmount.java | 1 - .../test/cut/MonetoryAmountUserType.java | 2 - .../org/hibernate/test/cut/MutualFund.java | 1 + .../org/hibernate/test/cut/Transaction.java | 1 + .../test/deletetransient/Address.java | 7 +- .../DeleteTransientEntityTest.java | 14 +- .../hibernate/test/deletetransient/Note.java | 3 +- .../test/deletetransient/Person.java | 11 +- .../hibernate/test/deletetransient/Suite.java | 9 +- .../AnsiTrimEmulationFunctionTest.java | 3 - .../function/MySQLRoundFunctionTest.java | 2 - .../test/dialect/function/Product.java | 1 - .../cache/SQLFunctionsInterSystemsTest.java | 3 +- .../cache/TestInterSystemsFunctionsClass.java | 5 +- .../unit/lockhint/AbstractLockHintTest.java | 16 +- .../unit/lockhint/SQLServerLockHintsTest.java | 10 +- .../lockhint/SybaseASE15LockHintsTest.java | 4 +- .../unit/lockhint/SybaseLockHintsTest.java | 10 +- .../hibernate/test/discriminator/Address.java | 1 + .../test/discriminator/Customer.java | 1 + .../test/discriminator/DiscriminatorTest.java | 5 +- .../test/discriminator/Employee.java | 1 - .../hibernate/test/discriminator/Person.java | 1 + .../hibernate/test/dynamicentity/Address.java | 1 + .../hibernate/test/dynamicentity/Company.java | 1 + .../test/dynamicentity/Customer.java | 1 + .../test/dynamicentity/DataProxyHandler.java | 3 +- .../hibernate/test/dynamicentity/Person.java | 1 - .../test/dynamicentity/ProxyHelper.java | 3 +- .../InterceptorDynamicEntityTest.java | 6 +- .../interceptor/ProxyInterceptor.java | 8 +- .../tuplizer/EntityNameInterceptor.java | 1 - .../tuplizer/MyEntityInstantiator.java | 22 +- .../tuplizer/MyEntityTuplizer.java | 9 +- .../tuplizer/TuplizerDynamicEntityTest.java | 19 +- .../ImprovedTuplizerDynamicEntityTest.java | 21 +- .../tuplizer2/MyEntityInstantiator.java | 18 +- .../tuplizer2/MyEntityTuplizer.java | 15 +- .../java/org/hibernate/test/ecid/Course.java | 1 - .../test/ecid/EmbeddedCompositeIdTest.java | 5 +- .../hibernate/test/ecid/UniversityCourse.java | 1 + .../dom4j/accessors/Dom4jAccessorTest.java | 2 - .../entitymode/dom4j/basic/Dom4jTest.java | 3 - .../entitymode/dom4j/component/Component.java | 1 + .../dom4j/component/ComponentOwner.java | 1 + .../dom4j/component/ComponentReference.java | 1 + .../dom4j/component/Dom4jComponentTest.java | 8 +- .../test/entitymode/dom4j/many2one/Car.java | 1 - .../entitymode/dom4j/many2one/CarPart.java | 1 + .../entitymode/dom4j/many2one/CarType.java | 1 + .../dom4j/many2one/Dom4jManyToOneTest.java | 3 - .../map/basic/DynamicClassTest.java | 3 - .../map/subclass/SubclassDynamicMapTest.java | 4 +- .../multi/MultiRepresentationTest.java | 3 - .../test/entitymode/multi/Stock.java | 3 +- .../test/entitymode/multi/Valuation.java | 1 - .../org/hibernate/test/entityname/Car.java | 1 + .../EntityNameFromSubClassTest.java | 1 - .../org/hibernate/test/entityname/Person.java | 1 - .../hibernate/test/entityname/Vehicle.java | 1 + .../AbstractCollectionEventTest.java | 4 +- .../AbstractParentWithCollection.java | 1 - .../collection/BrokenCollectionEventTest.java | 7 +- .../test/event/collection/Child.java | 1 + .../test/event/collection/ChildEntity.java | 1 + .../test/event/collection/ChildValue.java | 1 + .../event/collection/CollectionListeners.java | 2 - .../test/event/collection/Entity.java | 1 + .../collection/ParentWithCollection.java | 1 - ...bstractAssociationCollectionEventTest.java | 1 - ...ManyToManyBagToSetCollectionEventTest.java | 5 +- ...ManyToManySetToSetCollectionEventTest.java | 5 +- .../ChildWithBidirectionalManyToMany.java | 2 - .../ParentWithBidirectionalManyToMany.java | 4 +- ...tionalOneToManyBagCollectionEventTest.java | 5 +- ...eToManyBagSubclassCollectionEventTest.java | 4 +- ...tionalOneToManySetCollectionEventTest.java | 5 +- .../onetomany/ChildWithManyToOne.java | 1 - .../ParentWithBidirectionalOneToMany.java | 4 +- ...entWithBidirectionalOneToManySubclass.java | 4 - .../ParentWithCollectionOfEntities.java | 1 - ...ionalManyToManyBagCollectionEventTest.java | 5 +- ...tionalOneToManyBagCollectionEventTest.java | 5 +- ...tionalOneToManySetCollectionEventTest.java | 5 +- .../values/ParentWithCollectionOfValues.java | 5 +- .../values/ValuesBagCollectionEventTest.java | 5 +- .../hibernate/test/events/CallbackTest.java | 6 +- .../org/hibernate/test/exception/Group.java | 1 - .../exception/SQLExceptionConversionTest.java | 3 - .../org/hibernate/test/exception/User.java | 3 +- .../hibernate/test/extendshbm/Customer.java | 1 + .../hibernate/test/extendshbm/Employee.java | 1 - .../test/extendshbm/ExtendsTest.java | 2 - .../org/hibernate/test/extendshbm/Person.java | 1 + .../hibernate/test/extralazy/Document.java | 1 + .../test/extralazy/ExtraLazyTest.java | 3 - .../org/hibernate/test/extralazy/Group.java | 1 - .../test/extralazy/SessionAttribute.java | 1 - .../org/hibernate/test/extralazy/User.java | 1 - .../test/fetchprofiles/join/Course.java | 1 + .../fetchprofiles/join/CourseOffering.java | 3 +- .../test/fetchprofiles/join/Department.java | 1 + .../test/fetchprofiles/join/Enrollment.java | 1 + .../join/JoinFetchProfileTest.java | 6 +- .../test/fetchprofiles/join/Student.java | 1 + .../org/hibernate/test/filter/Category.java | 1 - .../org/hibernate/test/filter/Department.java | 3 +- .../test/filter/DynamicFilterTest.java | 1 - .../org/hibernate/test/filter/LineItem.java | 1 + .../java/org/hibernate/test/filter/Order.java | 3 +- .../org/hibernate/test/filter/Product.java | 1 - .../hibernate/test/filter/Salesperson.java | 5 +- .../BasicFilteredBulkManipulationTest.java | 3 +- .../hibernate/test/filter/hql/Customer.java | 1 + .../hibernate/test/filter/hql/Employee.java | 1 - .../JoinedFilteredBulkManipulationTest.java | 4 +- .../org/hibernate/test/filter/hql/Person.java | 1 + .../org/hibernate/test/filter/hql/User.java | 1 + .../hibernate/test/formulajoin/Detail.java | 1 - .../test/formulajoin/FormulaJoinTest.java | 3 - .../hibernate/test/formulajoin/Master.java | 1 - .../AbstractGeneratedPropertyTest.java | 3 +- .../test/generated/ComponentOwner.java | 3 +- .../generated/GeneratedPropertyEntity.java | 1 + .../PartiallyGeneratedComponentTest.java | 16 +- ...mestampGeneratedValuesWithCachingTest.java | 10 +- ...TriggerGeneratedValuesWithCachingTest.java | 8 +- ...ggerGeneratedValuesWithoutCachingTest.java | 2 - .../identity/IdentityGeneratedKeysTest.java | 18 +- .../test/generatedkeys/identity/MyChild.java | 3 +- .../test/generatedkeys/identity/MyEntity.java | 7 +- .../generatedkeys/identity/MySibling.java | 3 +- .../test/generatedkeys/select/MyEntity.java | 1 + .../select/SelectGeneratorTest.java | 2 - .../generatedkeys/seqidentity/MyEntity.java | 3 +- .../seqidentity/SequenceIdentityTest.java | 18 +- .../test/hql/ASTParserLoadingOrderByTest.java | 1 - .../test/hql/ASTParserLoadingTest.java | 1 - .../java/org/hibernate/test/hql/Address.java | 1 + .../java/org/hibernate/test/hql/Animal.java | 3 +- .../test/hql/BooleanLiteralEntity.java | 3 +- .../test/hql/BulkManipulationTest.java | 1 - .../test/java/org/hibernate/test/hql/Car.java | 1 + .../test/java/org/hibernate/test/hql/Cat.java | 1 + .../test/hql/ClassicTranslatorTest.java | 2 - .../hibernate/test/hql/Classification.java | 7 +- .../test/hql/ClassificationType.java | 22 +- .../test/hql/ComponentContainer.java | 3 +- .../hibernate/test/hql/CrazyCompositeKey.java | 1 - .../CriteriaClassicAggregationReturnTest.java | 29 +- .../test/hql/CriteriaHQLAlignmentTest.java | 9 +- .../test/java/org/hibernate/test/hql/Dog.java | 1 + .../hibernate/test/hql/DomesticAnimal.java | 1 + .../org/hibernate/test/hql/EJBQLTest.java | 4 - .../hql/EntityWithArgFunctionAsColumn.java | 1 + .../test/hql/EntityWithCrazyCompositeKey.java | 1 + .../hql/EntityWithFunctionAsColumnHolder.java | 1 - .../hql/EntityWithNoArgFunctionAsColumn.java | 1 + .../test/hql/FunctionNameAsColumnTest.java | 1 - .../java/org/hibernate/test/hql/HQLTest.java | 4 - .../hql/HeresAnotherCrazyIdFieldName.java | 1 + .../org/hibernate/test/hql/HqlParserTest.java | 10 +- .../java/org/hibernate/test/hql/Human.java | 1 - .../java/org/hibernate/test/hql/Image.java | 1 + .../hibernate/test/hql/IntegerVersioned.java | 1 + .../java/org/hibernate/test/hql/Joiner.java | 1 + .../test/hql/KeyManyToOneEntity.java | 1 - .../test/hql/KeyManyToOneKeyEntity.java | 1 + .../java/org/hibernate/test/hql/Lizard.java | 1 + .../java/org/hibernate/test/hql/Mammal.java | 1 - .../hql/MoreCrazyIdFieldNameStuffEntity.java | 1 + .../java/org/hibernate/test/hql/Name.java | 1 + .../org/hibernate/test/hql/PettingZoo.java | 1 + .../java/org/hibernate/test/hql/Pickup.java | 1 + .../test/hql/QueryTranslatorTestCase.java | 5 +- .../java/org/hibernate/test/hql/Reptile.java | 1 + .../test/java/org/hibernate/test/hql/SUV.java | 1 + .../hql/ScrollableCollectionFetchingTest.java | 2 - .../test/hql/SimpleAssociatedEntity.java | 1 + .../test/hql/SimpleEntityWithAssociation.java | 1 - .../org/hibernate/test/hql/StateProvince.java | 1 + .../test/hql/TimestampVersioned.java | 1 - .../java/org/hibernate/test/hql/Truck.java | 1 + .../java/org/hibernate/test/hql/User.java | 1 - .../hql/VariousKeywordPropertyEntity.java | 1 + .../java/org/hibernate/test/hql/Vehicle.java | 1 + .../hibernate/test/hql/WithClauseTest.java | 3 - .../test/java/org/hibernate/test/hql/Zoo.java | 1 - .../test/java/org/hibernate/test/id/Car.java | 1 + .../id/MultipleHiLoPerTableGeneratorTest.java | 2 - .../java/org/hibernate/test/id/Plane.java | 1 + .../java/org/hibernate/test/id/Product.java | 1 + .../java/org/hibernate/test/id/Radio.java | 1 + .../test/id/UseIdentifierRollbackTest.java | 2 - .../hibernate/test/id/uuid/sqlrep/Node.java | 1 - .../uuid/sqlrep/sqlbinary/UUIDBinaryTest.java | 3 +- .../id/uuid/sqlrep/sqlchar/UUIDCharTest.java | 1 - .../id/uuid/strategy/CustomStrategyTest.java | 1 - .../hibernate/test/id/uuid/strategy/Node.java | 1 - .../java/org/hibernate/test/idbag/Group.java | 1 + .../org/hibernate/test/idbag/IdBagTest.java | 3 - .../java/org/hibernate/test/idbag/User.java | 1 - .../org/hibernate/test/idclass/Customer.java | 1 + .../hibernate/test/idclass/CustomerId.java | 1 - .../test/idclass/FavoriteCustomer.java | 1 + .../hibernate/test/idclass/IdClassTest.java | 2 - .../BigIntegerIncrementGeneratorTest.java | 5 +- .../idgen/biginteger/increment/Entity.java | 1 - .../BigIntegerSequenceGeneratorTest.java | 4 +- .../idgen/biginteger/sequence/Entity.java | 1 - .../BasicForcedTableSequenceTest.java | 23 +- .../idgen/enhanced/forcedtable/Entity.java | 3 +- .../HiLoForcedTableSequenceTest.java | 23 +- .../PooledForcedTableSequenceTest.java | 23 +- .../enhanced/sequence/BasicSequenceTest.java | 19 +- .../test/idgen/enhanced/sequence/Entity.java | 3 +- .../enhanced/sequence/HiLoSequenceTest.java | 21 +- .../enhanced/sequence/PooledSequenceTest.java | 21 +- .../idgen/enhanced/table/BasicTableTest.java | 19 +- .../test/idgen/enhanced/table/Entity.java | 3 +- .../idgen/enhanced/table/HiLoTableTest.java | 21 +- .../idgen/enhanced/table/PooledTableTest.java | 21 +- .../IdentifierPropertyReferencesTest.java | 20 +- .../org/hibernate/test/idprops/LineItem.java | 3 +- .../hibernate/test/idprops/LineItemPK.java | 5 +- .../org/hibernate/test/idprops/Order.java | 9 +- .../org/hibernate/test/idprops/Person.java | 3 +- .../hibernate/test/immutable/Contract.java | 2 - .../test/immutable/ContractVariation.java | 1 - .../test/immutable/ImmutableTest.java | 5 +- .../org/hibernate/test/immutable/Info.java | 1 - .../org/hibernate/test/immutable/Party.java | 3 - .../org/hibernate/test/immutable/Plan.java | 1 - .../AbstractEntityWithManyToManyTest.java | 2 - .../AbstractEntityWithOneToManyTest.java | 2 - .../entitywithmutablecollection/Contract.java | 1 - .../ContractVariation.java | 1 - .../entitywithmutablecollection/Info.java | 1 - .../entitywithmutablecollection/Owner.java | 1 - .../entitywithmutablecollection/Party.java | 3 - .../entitywithmutablecollection/Plan.java | 1 - .../EntityWithInverseManyToManyTest.java | 4 +- .../EntityWithInverseOneToManyJoinTest.java | 4 +- .../EntityWithInverseOneToManyTest.java | 4 +- ...sionedEntityWithInverseManyToManyTest.java | 4 +- ...thInverseOneToManyFailureExpectedTest.java | 4 +- ...verseOneToManyJoinFailureExpectedTest.java | 4 +- ...nedEntityWithInverseOneToManyJoinTest.java | 4 +- ...rsionedEntityWithInverseOneToManyTest.java | 4 +- .../EntityWithNonInverseManyToManyTest.java | 4 +- ...ityWithNonInverseManyToManyUnidirTest.java | 4 +- ...EntityWithNonInverseOneToManyJoinTest.java | 4 +- .../EntityWithNonInverseOneToManyTest.java | 4 +- ...tityWithNonInverseOneToManyUnidirTest.java | 4 +- ...nedEntityWithNonInverseManyToManyTest.java | 4 +- ...EntityWithNonInverseOneToManyJoinTest.java | 4 +- ...onedEntityWithNonInverseOneToManyTest.java | 4 +- .../org/hibernate/test/importfile/Dog.java | 1 + .../org/hibernate/test/importfile/Human.java | 1 + .../test/importfile/ImportFileTest.java | 2 - .../hibernate/test/insertordering/Group.java | 3 +- .../insertordering/InsertOrderingTest.java | 37 +- .../test/insertordering/Membership.java | 5 +- .../hibernate/test/insertordering/User.java | 9 +- .../instrument/buildtime/InstrumentTest.java | 4 +- .../instrument/cases/AbstractExecutable.java | 11 +- .../test/instrument/cases/Executable.java | 3 +- .../cases/TestCustomColumnReadAndWrite.java | 2 - .../cases/TestDirtyCheckExecutable.java | 17 +- .../cases/TestFetchAllExecutable.java | 17 +- .../TestInjectFieldInterceptorExecutable.java | 10 +- .../TestIsPropertyInitializedExecutable.java | 9 +- .../instrument/cases/TestLazyExecutable.java | 24 +- .../cases/TestLazyManyToOneExecutable.java | 18 +- .../TestLazyPropertyCustomTypeExecutable.java | 15 +- .../cases/TestManyToOneProxyExecutable.java | 13 +- .../cases/TestSharedPKOneToOneExecutable.java | 7 +- .../instrument/domain/CustomBlobType.java | 22 +- .../test/instrument/domain/Document.java | 1 - .../test/instrument/domain/Entity.java | 3 +- .../domain/EntityWithOneToOnes.java | 1 + .../test/instrument/domain/Folder.java | 1 - .../instrument/domain/OneToOneNoProxy.java | 1 + .../test/instrument/domain/OneToOneProxy.java | 1 + .../test/instrument/domain/Owner.java | 1 + .../test/instrument/domain/Problematic.java | 3 +- ...sformingClassLoaderInstrumentTestCase.java | 18 +- .../runtime/CGLIBInstrumentationTest.java | 12 +- .../runtime/JavassistInstrumentationTest.java | 4 +- .../interceptor/CollectionInterceptor.java | 2 - .../org/hibernate/test/interceptor/Image.java | 3 +- .../interceptor/InstantiateInterceptor.java | 2 - .../test/interceptor/InterceptorTest.java | 3 - .../org/hibernate/test/interceptor/Log.java | 1 - .../test/interceptor/PropertyInterceptor.java | 2 - .../test/interceptor/StatefulInterceptor.java | 2 - .../org/hibernate/test/interceptor/User.java | 1 - .../test/interfaceproxy/Document.java | 1 - .../test/interfaceproxy/DocumentImpl.java | 1 - .../interfaceproxy/DocumentInterceptor.java | 4 +- .../hibernate/test/interfaceproxy/Folder.java | 1 + .../test/interfaceproxy/FolderImpl.java | 1 + .../interfaceproxy/InterfaceProxyTest.java | 2 - .../hibernate/test/interfaceproxy/Item.java | 1 + .../test/interfaceproxy/ItemImpl.java | 1 + .../test/interfaceproxy/SecureDocument.java | 1 + .../interfaceproxy/SecureDocumentImpl.java | 1 + .../java/org/hibernate/test/iterate/Item.java | 1 + .../hibernate/test/iterate/IterateTest.java | 3 - .../java/org/hibernate/test/jdbc/Boat.java | 1 + .../hibernate/test/jdbc/GeneralWorkTest.java | 3 - .../java/org/hibernate/test/jdbc/Person.java | 1 + .../org/hibernate/test/jdbc/TypeInfoTest.java | 2 - .../jdbc/proxies/AggressiveReleaseTest.java | 1 - .../proxies/BasicConnectionProxyTest.java | 2 - .../org/hibernate/test/join/Customer.java | 1 + .../org/hibernate/test/join/Employee.java | 1 - .../org/hibernate/test/join/JoinTest.java | 3 - .../hibernate/test/join/OptionalJoinTest.java | 14 +- .../java/org/hibernate/test/join/Person.java | 1 + .../java/org/hibernate/test/join/Thing.java | 1 + .../java/org/hibernate/test/join/User.java | 3 +- .../test/joinedsubclass/Address.java | 1 + .../test/joinedsubclass/Customer.java | 1 + .../test/joinedsubclass/Employee.java | 1 - .../joinedsubclass/JoinedSubclassTest.java | 3 - .../hibernate/test/joinedsubclass/Person.java | 1 + .../org/hibernate/test/joinfetch/Bid.java | 1 - .../hibernate/test/joinfetch/Category.java | 1 + .../org/hibernate/test/joinfetch/Comment.java | 1 - .../org/hibernate/test/joinfetch/Group.java | 1 - .../org/hibernate/test/joinfetch/Item.java | 1 - .../test/joinfetch/JoinFetchTest.java | 3 - .../org/hibernate/test/joinfetch/User.java | 1 - .../hibernate/test/jpa/AbstractJPATest.java | 36 +- .../java/org/hibernate/test/jpa/Item.java | 7 +- .../java/org/hibernate/test/jpa/MyEntity.java | 3 +- .../hibernate/test/jpa/MySubclassEntity.java | 3 +- .../java/org/hibernate/test/jpa/Part.java | 5 +- .../test/jpa/cascade/CascadeTest.java | 15 +- .../org/hibernate/test/jpa/cascade/Child.java | 3 +- .../test/jpa/cascade/ChildAssigned.java | 3 +- .../hibernate/test/jpa/cascade/ChildInfo.java | 3 +- .../test/jpa/cascade/ChildInfoAssigned.java | 3 +- .../org/hibernate/test/jpa/cascade/Other.java | 3 +- .../test/jpa/cascade/OtherAssigned.java | 3 +- .../hibernate/test/jpa/cascade/Parent.java | 3 +- .../test/jpa/cascade/ParentAssigned.java | 3 +- .../test/jpa/cascade/ParentInfo.java | 3 +- .../test/jpa/cascade/ParentInfoAssigned.java | 3 +- .../test/jpa/fetch/FetchingTest.java | 19 +- .../org/hibernate/test/jpa/fetch/Person.java | 11 +- .../org/hibernate/test/jpa/fetch/Stay.java | 7 +- .../hibernate/test/jpa/lock/JPALockTest.java | 24 +- .../test/jpa/lock/RepeatableReadTest.java | 29 +- .../jpa/naturalid/ImmutableNaturalIdTest.java | 2 - .../hibernate/test/jpa/naturalid/User.java | 1 + .../test/jpa/proxy/JPAProxyTest.java | 23 +- .../test/jpa/ql/JPAQLComplianceTest.java | 12 +- .../test/jpa/ql/NativeQueryTest.java | 12 +- .../test/jpa/removed/RemovedEntityTest.java | 14 +- .../bidir/component/Customer.java | 7 +- .../component/EagerKeyManyToOneTest.java | 24 +- .../bidir/component/LazyKeyManyToOneTest.java | 19 +- .../keymanytoone/bidir/component/Order.java | 9 +- .../keymanytoone/bidir/embedded/Customer.java | 7 +- .../bidir/embedded/KeyManyToOneTest.java | 19 +- .../keymanytoone/bidir/embedded/Order.java | 9 +- .../hibernate/test/lazycache/Document.java | 1 - .../test/lazycache/InstrumentCacheTest.java | 2 - .../hibernate/test/lazyonetoone/Employee.java | 1 - .../test/lazyonetoone/Employment.java | 1 - .../test/lazyonetoone/LazyOneToOneTest.java | 3 - .../hibernate/test/lazyonetoone/Person.java | 1 + .../java/org/hibernate/test/legacy/A.java | 1 + .../hibernate/test/legacy/ABCProxyTest.java | 3 - .../org/hibernate/test/legacy/ABCTest.java | 4 +- .../org/hibernate/test/legacy/Abstract.java | 1 - .../hibernate/test/legacy/AbstractProxy.java | 1 + .../org/hibernate/test/legacy/Assignable.java | 1 - .../java/org/hibernate/test/legacy/B.java | 1 - .../java/org/hibernate/test/legacy/Bar.java | 1 + .../org/hibernate/test/legacy/BarProxy.java | 1 + .../hibernate/test/legacy/BasicNameable.java | 1 + .../java/org/hibernate/test/legacy/Baz.java | 1 - .../org/hibernate/test/legacy/Blobber.java | 1 - .../org/hibernate/test/legacy/Broken.java | 1 - .../java/org/hibernate/test/legacy/C1.java | 1 - .../java/org/hibernate/test/legacy/C2.java | 1 - .../org/hibernate/test/legacy/CacheTest.java | 4 +- .../org/hibernate/test/legacy/Category.java | 1 - .../java/org/hibernate/test/legacy/Child.java | 1 + .../org/hibernate/test/legacy/Circular.java | 1 + .../org/hibernate/test/legacy/Company.java | 1 + .../org/hibernate/test/legacy/Component.java | 1 + .../test/legacy/ComponentCollection.java | 1 - .../test/legacy/ComponentNotNull.java | 1 + .../test/legacy/ComponentNotNullMaster.java | 1 - .../test/legacy/ComponentNotNullTest.java | 3 - .../test/legacy/Componentizable.java | 1 + .../test/legacy/CompositeElement.java | 1 - .../hibernate/test/legacy/CompositeIdId.java | 1 - .../org/hibernate/test/legacy/Contained.java | 1 - .../org/hibernate/test/legacy/Container.java | 1 - .../org/hibernate/test/legacy/Custom.java | 1 + .../test/legacy/CustomPersister.java | 8 +- .../hibernate/test/legacy/CustomSQLTest.java | 5 +- .../java/org/hibernate/test/legacy/D.java | 1 + .../org/hibernate/test/legacy/Detail.java | 1 - .../test/legacy/DoubleStringType.java | 3 - .../java/org/hibernate/test/legacy/Down.java | 1 + .../java/org/hibernate/test/legacy/Drug.java | 1 + .../java/org/hibernate/test/legacy/E.java | 1 - .../java/org/hibernate/test/legacy/Eye.java | 1 - .../java/org/hibernate/test/legacy/Fee.java | 1 - .../java/org/hibernate/test/legacy/Fixed.java | 1 - .../java/org/hibernate/test/legacy/Fo.java | 1 - .../java/org/hibernate/test/legacy/Foo.java | 2 - .../org/hibernate/test/legacy/FooBarTest.java | 1 - .../hibernate/test/legacy/FooComponent.java | 1 - .../org/hibernate/test/legacy/FooProxy.java | 1 + .../java/org/hibernate/test/legacy/Fum.java | 2 - .../hibernate/test/legacy/FumCompositeID.java | 1 + .../org/hibernate/test/legacy/FumTest.java | 3 - .../java/org/hibernate/test/legacy/Fumm.java | 1 - .../org/hibernate/test/legacy/Glarch.java | 2 - .../hibernate/test/legacy/GlarchProxy.java | 1 - .../org/hibernate/test/legacy/Holder.java | 1 - .../java/org/hibernate/test/legacy/I.java | 1 + .../org/hibernate/test/legacy/IJ2Test.java | 3 - .../org/hibernate/test/legacy/IJTest.java | 3 - .../org/hibernate/test/legacy/Immutable.java | 1 + .../java/org/hibernate/test/legacy/Inner.java | 1 - .../org/hibernate/test/legacy/InnerKey.java | 1 - .../hibernate/test/legacy/Intervention.java | 1 + .../java/org/hibernate/test/legacy/J.java | 1 + .../java/org/hibernate/test/legacy/Jay.java | 1 + .../java/org/hibernate/test/legacy/K.java | 1 - .../hibernate/test/legacy/LegacyTestCase.java | 10 +- .../org/hibernate/test/legacy/Location.java | 1 - .../java/org/hibernate/test/legacy/Lower.java | 1 - .../org/hibernate/test/legacy/MainObject.java | 1 + .../java/org/hibernate/test/legacy/Many.java | 1 + .../org/hibernate/test/legacy/MapTest.java | 3 - .../org/hibernate/test/legacy/Master.java | 1 - .../test/legacy/MasterDetailTest.java | 5 +- .../org/hibernate/test/legacy/Medication.java | 1 + .../org/hibernate/test/legacy/Middle.java | 1 - .../org/hibernate/test/legacy/MiddleKey.java | 1 - .../java/org/hibernate/test/legacy/Mono.java | 1 - .../org/hibernate/test/legacy/MoreStuff.java | 1 - .../java/org/hibernate/test/legacy/Multi.java | 1 - .../hibernate/test/legacy/MultiTableTest.java | 3 - .../hibernate/test/legacy/Multiplicity.java | 1 - .../test/legacy/MultiplicityType.java | 2 - .../org/hibernate/test/legacy/Nameable.java | 1 + .../java/org/hibernate/test/legacy/Named.java | 1 + .../test/legacy/NestingComponent.java | 1 - .../test/legacy/NonReflectiveBinderTest.java | 4 - .../org/hibernate/test/legacy/Object2.java | 1 + .../java/org/hibernate/test/legacy/One.java | 1 - .../test/legacy/OneToOneCacheTest.java | 3 - .../java/org/hibernate/test/legacy/Outer.java | 1 - .../org/hibernate/test/legacy/OuterKey.java | 1 - .../org/hibernate/test/legacy/Parent.java | 1 + .../test/legacy/ParentChildTest.java | 5 +- .../java/org/hibernate/test/legacy/Part.java | 1 + .../java/org/hibernate/test/legacy/Party.java | 1 + .../org/hibernate/test/legacy/Person.java | 1 + .../java/org/hibernate/test/legacy/Po.java | 1 - .../test/legacy/QueryByExampleTest.java | 3 - .../java/org/hibernate/test/legacy/Qux.java | 2 - .../org/hibernate/test/legacy/Resource.java | 1 + .../org/hibernate/test/legacy/Result.java | 1 + .../test/legacy/ReverseComparator.java | 1 - .../java/org/hibernate/test/legacy/Role.java | 1 - .../java/org/hibernate/test/legacy/S.java | 1 + .../test/legacy/SQLFunctionsTest.java | 1 - .../hibernate/test/legacy/SQLLoaderTest.java | 3 - .../org/hibernate/test/legacy/Several.java | 1 - .../org/hibernate/test/legacy/Simple.java | 1 - .../org/hibernate/test/legacy/Single.java | 1 - .../org/hibernate/test/legacy/Sortable.java | 1 + .../hibernate/test/legacy/StatisticsTest.java | 4 +- .../test/legacy/StringComparator.java | 1 - .../java/org/hibernate/test/legacy/Stuff.java | 1 - .../hibernate/test/legacy/SubComponent.java | 1 + .../org/hibernate/test/legacy/SubDetail.java | 1 + .../org/hibernate/test/legacy/SubMulti.java | 1 - .../java/org/hibernate/test/legacy/Super.java | 1 + .../java/org/hibernate/test/legacy/Top.java | 1 + .../org/hibernate/test/legacy/Trivial.java | 1 + .../hibernate/test/legacy/TrivialClass.java | 1 + .../java/org/hibernate/test/legacy/Up.java | 1 - .../org/hibernate/test/legacy/Vetoer.java | 2 - .../java/org/hibernate/test/legacy/W.java | 1 - .../java/org/hibernate/test/legacy/X.java | 1 - .../java/org/hibernate/test/legacy/Y.java | 1 + .../java/org/hibernate/test/legacy/Z.java | 1 + .../hibernate/test/lob/BlobLocatorTest.java | 3 - .../hibernate/test/lob/ClobLocatorTest.java | 5 +- .../org/hibernate/test/lob/ImageTest.java | 2 - .../org/hibernate/test/lob/LobHolder.java | 8 +- .../test/lob/LongByteArrayHolder.java | 3 +- .../hibernate/test/lob/LongByteArrayTest.java | 3 +- .../hibernate/test/lob/LongStringHolder.java | 3 +- .../hibernate/test/lob/LongStringTest.java | 3 +- .../test/lob/MaterializedBlobTest.java | 4 +- .../test/lob/MaterializedClobTest.java | 6 +- .../hibernate/test/lob/SerializableData.java | 1 - .../test/lob/SerializableHolder.java | 3 +- .../test/lob/SerializableTypeTest.java | 2 - .../java/org/hibernate/test/lob/TextTest.java | 4 +- .../org/hibernate/test/manytomany/Group.java | 1 - .../test/manytomany/ManyToManyTest.java | 2 - .../org/hibernate/test/manytomany/User.java | 1 - .../batchload/BatchedManyToManyTest.java | 23 +- .../test/manytomany/batchload/Group.java | 3 +- .../test/manytomany/batchload/User.java | 3 +- .../test/manytomany/ordered/Group.java | 9 +- .../ordered/OrderedManyToManyTest.java | 27 +- .../test/manytomany/ordered/User.java | 9 +- ...bstractManyToManyAssociationClassTest.java | 4 +- .../manytomanyassociationclass/Group.java | 3 +- .../Membership.java | 1 - .../test/manytomanyassociationclass/User.java | 3 +- ...ToManyAssociationClassCompositeIdTest.java | 4 +- .../MembershipWithCompositeId.java | 2 - ...yToManyAssociationClassAssignedIdTest.java | 4 +- ...ToManyAssociationClassGeneratedIdTest.java | 7 +- .../java/org/hibernate/test/map/Group.java | 1 - .../test/map/MapIndexFormulaTest.java | 3 - .../hibernate/test/map/SessionAttribute.java | 1 - .../java/org/hibernate/test/map/User.java | 1 - .../org/hibernate/test/mapcompelem/Item.java | 1 + .../mapcompelem/MapCompositeElementTest.java | 3 - .../org/hibernate/test/mapcompelem/Part.java | 1 + .../hibernate/test/mapcompelem/Product.java | 1 - .../hibernate/test/mapelemformula/Group.java | 1 - .../mapelemformula/MapElementFormulaTest.java | 2 - .../hibernate/test/mapelemformula/User.java | 1 + .../mapping/PersistentClassVisitorTest.java | 2 - .../test/mapping/ValueVisitorTest.java | 2 - .../test/mappingexception/InvalidMapping.java | 3 +- .../MappingExceptionTest.java | 5 +- .../hibernate/test/mappingexception/User.java | 5 +- .../org/hibernate/test/mixed/Document.java | 2 - .../test/mixed/DocumentInterceptor.java | 2 - .../java/org/hibernate/test/mixed/Folder.java | 1 + .../java/org/hibernate/test/mixed/Item.java | 1 + .../org/hibernate/test/mixed/MixedTest.java | 2 - .../hibernate/test/mixed/SecureDocument.java | 1 + .../test/namingstrategy/Customers.java | 1 + .../namingstrategy/NamingStrategyTest.java | 3 +- .../namingstrategy/TestNamingStrategy.java | 1 - .../test/naturalid/immutable/Child.java | 3 +- .../ImmutableEntityNaturalIdTest.java | 5 +- .../immutable/ImmutableNaturalIdTest.java | 4 +- .../test/naturalid/immutable/Parent.java | 3 +- .../test/naturalid/immutable/User.java | 1 + .../mutable/MutableNaturalIdTest.java | 3 - .../test/naturalid/mutable/User.java | 1 + .../AbstractOperationTestCase.java | 38 +- .../test/nonflushedchanges/Address.java | 5 +- .../test/nonflushedchanges/Competition.java | 3 +- .../test/nonflushedchanges/Competitor.java | 3 +- .../test/nonflushedchanges/CreateTest.java | 3 - .../test/nonflushedchanges/DeleteTest.java | 12 +- .../test/nonflushedchanges/Employee.java | 1 - .../test/nonflushedchanges/Employer.java | 1 - .../test/nonflushedchanges/GetLoadTest.java | 3 - .../test/nonflushedchanges/MergeTest.java | 3 - .../test/nonflushedchanges/Node.java | 1 - .../test/nonflushedchanges/NumberedNode.java | 1 - .../test/nonflushedchanges/Person.java | 5 +- .../nonflushedchanges/PersonalDetails.java | 5 +- .../nonflushedchanges/SaveOrUpdateTest.java | 6 +- .../nonflushedchanges/TimestampedEntity.java | 7 +- .../nonflushedchanges/VersionedEntity.java | 9 +- .../org/hibernate/test/ondelete/Address.java | 1 + .../org/hibernate/test/ondelete/Employee.java | 1 - .../hibernate/test/ondelete/OnDeleteTest.java | 5 +- .../org/hibernate/test/ondelete/Person.java | 1 + .../hibernate/test/ondelete/Salesperson.java | 1 - ...ctRecursiveBidirectionalOneToManyTest.java | 3 - ...edRecursiveBidirectionalOneToManyTest.java | 4 - .../org/hibernate/test/onetomany/Child.java | 1 + .../org/hibernate/test/onetomany/Node.java | 3 +- .../test/onetomany/OneToManyTest.java | 2 - .../org/hibernate/test/onetomany/Parent.java | 1 - ...ursiveBidirectionalOneToManyCacheTest.java | 2 - ...siveBidirectionalOneToManyNoCacheTest.java | 2 - ...sionedBidirectionalOneToManyCacheTest.java | 2 - ...onedBidirectionalOneToManyNoCacheTest.java | 2 - .../test/onetoone/formula/Address.java | 1 - .../onetoone/formula/OneToOneFormulaTest.java | 2 - .../test/onetoone/formula/Person.java | 1 - .../test/onetoone/joined/Address.java | 1 + .../test/onetoone/joined/Entity.java | 1 + .../joined/JoinedSubclassOneToOneTest.java | 5 +- .../hibernate/test/onetoone/joined/Org.java | 1 + .../test/onetoone/joined/Person.java | 1 + .../test/onetoone/link/Customer.java | 1 + .../test/onetoone/link/Employee.java | 1 + .../test/onetoone/link/OneToOneLinkTest.java | 3 - .../hibernate/test/onetoone/link/Person.java | 1 - .../nopojo/DynamicMapOneToOneTest.java | 5 +- .../test/onetoone/optional/Address.java | 3 +- .../test/onetoone/optional/Entity.java | 3 +- .../optional/OptionalOneToOneTest.java | 16 +- .../hibernate/test/onetoone/optional/Org.java | 3 +- .../test/onetoone/optional/Person.java | 3 +- .../test/onetoone/singletable/Address.java | 1 + .../DiscrimSubclassOneToOneTest.java | 5 +- .../test/onetoone/singletable/Entity.java | 1 + .../test/onetoone/singletable/Org.java | 1 - .../test/onetoone/singletable/Person.java | 1 + .../test/ops/AbstractOperationTestCase.java | 9 +- .../java/org/hibernate/test/ops/Address.java | 3 +- .../org/hibernate/test/ops/Competition.java | 5 +- .../org/hibernate/test/ops/Competitor.java | 3 +- .../org/hibernate/test/ops/CreateTest.java | 5 +- .../org/hibernate/test/ops/DeleteTest.java | 10 +- .../java/org/hibernate/test/ops/Employee.java | 3 +- .../java/org/hibernate/test/ops/Employer.java | 3 +- .../org/hibernate/test/ops/GetLoadTest.java | 6 +- .../org/hibernate/test/ops/MergeTest.java | 3 - .../java/org/hibernate/test/ops/Node.java | 1 - .../org/hibernate/test/ops/NumberedNode.java | 1 - .../java/org/hibernate/test/ops/Person.java | 3 +- .../hibernate/test/ops/PersonalDetails.java | 3 +- .../hibernate/test/ops/SaveOrUpdateTest.java | 10 +- .../hibernate/test/ops/TimestampedEntity.java | 5 +- .../hibernate/test/ops/VersionedEntity.java | 7 +- .../org/hibernate/test/optlock/Document.java | 1 + .../test/optlock/OptimisticLockTest.java | 2 - .../test/optlock/PublicationDate.java | 1 + .../hibernate/test/ordered/OrderByTest.java | 3 - .../org/hibernate/test/ordered/Search.java | 1 - .../java/org/hibernate/test/orphan/Mail.java | 1 + .../org/hibernate/test/orphan/OrphanTest.java | 2 - .../java/org/hibernate/test/orphan/Part.java | 1 - .../org/hibernate/test/orphan/Product.java | 1 - .../test/orphan/PropertyRefTest.java | 2 - .../java/org/hibernate/test/orphan/User.java | 1 - .../DeleteOneToOneOrphansTest.java | 2 - .../one2one/fk/bidirectional/Employee.java | 1 + .../fk/bidirectional/EmployeeInfo.java | 1 + .../composite/DeleteOneToOneOrphansTest.java | 2 - .../orphan/one2one/fk/composite/Employee.java | 1 + .../one2one/fk/composite/EmployeeInfo.java | 1 - .../DeleteOneToOneOrphansTest.java | 2 - .../fk/reversed/bidirectional/Employee.java | 1 + .../reversed/bidirectional/EmployeeInfo.java | 1 + .../DeleteOneToOneOrphansTest.java | 2 - .../fk/reversed/unidirectional/Employee.java | 1 + .../reversed/unidirectional/EmployeeInfo.java | 1 + .../DeleteOneToOneOrphansTest.java | 2 - .../one2one/pk/bidirectional/Employee.java | 1 + .../pk/bidirectional/EmployeeInfo.java | 1 + .../DeleteOneToOneOrphansTest.java | 2 - .../one2one/pk/unidirectional/Employee.java | 1 + .../pk/unidirectional/EmployeeInfo.java | 1 + .../hibernate/test/pagination/DataPoint.java | 1 - .../test/pagination/DistinctSelectTest.java | 2 - .../org/hibernate/test/pagination/Entry.java | 1 - .../test/pagination/PaginationTest.java | 9 +- .../org/hibernate/test/pagination/Tag.java | 1 + .../test/propertyref/basic/Account.java | 3 +- .../test/propertyref/basic/Address.java | 3 +- .../test/propertyref/basic/Group.java | 3 +- .../test/propertyref/basic/Person.java | 9 +- .../propertyref/basic/PropertyRefTest.java | 9 +- .../component/complete/Account.java | 3 +- .../CompleteComponentPropertyRefTest.java | 4 +- .../component/complete/Identity.java | 3 +- .../component/complete/Person.java | 3 +- .../component/partial/Account.java | 3 +- .../component/partial/Identity.java | 3 +- .../PartialComponentPropertyRefTest.java | 4 +- .../propertyref/component/partial/Person.java | 3 +- .../inheritence/discrim/Account.java | 3 +- .../inheritence/discrim/Customer.java | 3 +- .../inheritence/discrim/Person.java | 3 +- .../discrim/SubclassPropertyRefTest.java | 4 +- .../inheritence/joined/Account.java | 3 +- .../inheritence/joined/BankAccount.java | 3 +- .../joined/JoinedSubclassPropertyRefTest.java | 4 +- .../inheritence/joined/Person.java | 3 +- .../inheritence/union/Account.java | 3 +- .../inheritence/union/Customer.java | 3 +- .../propertyref/inheritence/union/Person.java | 3 +- .../union/UnionSubclassPropertyRefTest.java | 16 +- .../org/hibernate/test/proxy/Container.java | 5 +- .../org/hibernate/test/proxy/DataPoint.java | 1 - .../java/org/hibernate/test/proxy/Info.java | 3 +- .../java/org/hibernate/test/proxy/Owner.java | 1 - .../org/hibernate/test/proxy/ProxyTest.java | 5 +- ...stractQueryCacheResultTransformerTest.java | 4 +- .../hibernate/test/querycache/Address.java | 1 + .../org/hibernate/test/querycache/Course.java | 1 - .../test/querycache/CourseMeeting.java | 1 + .../test/querycache/CourseMeetingId.java | 1 - ...QueryCacheIgnoreResultTransformerTest.java | 2 - ...QueryCacheNormalResultTransformerTest.java | 2 - ...riaQueryCachePutResultTransformerTest.java | 2 - .../hibernate/test/querycache/Enrolment.java | 1 - ...QueryCacheIgnoreResultTransformerTest.java | 2 - ...QueryCacheNormalResultTransformerTest.java | 2 - ...HqlQueryCachePutResultTransformerTest.java | 2 - .../org/hibernate/test/querycache/Item.java | 3 +- .../hibernate/test/querycache/PersonName.java | 1 + .../test/querycache/QueryCacheTest.java | 7 +- .../hibernate/test/querycache/Student.java | 1 - .../hibernate/test/querycache/StudentDTO.java | 1 + .../hibernate/test/queryplan/Customer.java | 1 + .../hibernate/test/queryplan/Employee.java | 1 - .../test/queryplan/GetHqlQueryPlanTest.java | 4 +- .../NativeSQLQueryPlanEqualsTest.java | 5 +- ...veSQLQueryReturnEqualsAndHashCodeTest.java | 2 - .../org/hibernate/test/queryplan/Person.java | 1 + .../org/hibernate/test/queryplan/User.java | 1 + .../test/readonly/AbstractReadOnlyTest.java | 1 - .../hibernate/test/readonly/Container.java | 5 +- .../org/hibernate/test/readonly/Course.java | 1 + .../hibernate/test/readonly/DataPoint.java | 3 +- .../hibernate/test/readonly/Enrolment.java | 1 - .../org/hibernate/test/readonly/Info.java | 3 +- .../org/hibernate/test/readonly/Owner.java | 1 - .../readonly/ReadOnlyCriteriaQueryTest.java | 5 +- .../test/readonly/ReadOnlyProxyTest.java | 5 +- .../ReadOnlySessionLazyNonLazyTest.java | 11 +- .../test/readonly/ReadOnlySessionTest.java | 5 +- .../hibernate/test/readonly/ReadOnlyTest.java | 3 - .../readonly/ReadOnlyVersionedNodesTest.java | 2 - .../org/hibernate/test/readonly/Student.java | 1 - .../hibernate/test/readonly/StudentDTO.java | 1 + .../hibernate/test/readonly/TextHolder.java | 1 + .../test/readonly/VersionedNode.java | 7 +- .../hibernate/test/reattachment/Child.java | 3 +- .../CollectionReattachmentTest.java | 12 +- .../hibernate/test/reattachment/Parent.java | 7 +- .../reattachment/ProxyReattachmentTest.java | 19 +- .../test/resulttransformer/Contract.java | 3 +- .../test/resulttransformer/PartnerA.java | 3 +- .../test/resulttransformer/PartnerB.java | 3 +- .../ResultTransformerTest.java | 4 +- .../java/org/hibernate/test/rowid/Point.java | 1 - .../org/hibernate/test/rowid/RowIdTest.java | 9 +- .../org/hibernate/test/rowid/RowIdType.java | 2 - .../test/schemaupdate/MigrationTest.java | 2 - .../hibernate/test/schemaupdate/Version.java | 1 + .../org/hibernate/test/sorted/Search.java | 1 - .../org/hibernate/test/sorted/SortTest.java | 3 - .../sql/check/ExceptionCheckingEntity.java | 3 +- .../test/sql/check/OracleCheckStyleTest.java | 12 +- .../test/sql/check/ParamCheckingEntity.java | 3 +- .../test/sql/check/ResultCheckStyleTest.java | 11 +- .../hibernate/test/sql/hand/Dimension.java | 3 +- .../hibernate/test/sql/hand/Employment.java | 1 - .../org/hibernate/test/sql/hand/Group.java | 3 +- .../hibernate/test/sql/hand/ImageHolder.java | 1 + .../test/sql/hand/MonetaryAmount.java | 3 +- .../test/sql/hand/MonetaryAmountUserType.java | 2 - .../org/hibernate/test/sql/hand/Order.java | 5 +- .../hibernate/test/sql/hand/Organization.java | 1 - .../org/hibernate/test/sql/hand/Person.java | 1 + .../org/hibernate/test/sql/hand/Product.java | 9 +- .../hibernate/test/sql/hand/SpaceShip.java | 3 +- .../org/hibernate/test/sql/hand/Speech.java | 3 +- .../hibernate/test/sql/hand/TextHolder.java | 1 + .../sql/hand/custom/CustomSQLTestSupport.java | 6 +- .../custom/CustomStoredProcTestSupport.java | 22 +- .../oracle/DataDirectOracleCustomSQLTest.java | 4 +- .../sql/hand/custom/db2/DB2CustomSQLTest.java | 4 +- .../hand/custom/mysql/MySQLCustomSQLTest.java | 4 +- .../custom/oracle/OracleCustomSQLTest.java | 4 +- .../sqlserver/SQLServerCustomSQLTest.java | 4 +- .../custom/sybase/SybaseCustomSQLTest.java | 8 +- ...CustomInsertSQLWithIdentityColumnTest.java | 18 +- .../sql/hand/query/NativeSQLQueriesTest.java | 41 +- .../NativeSqlAndQuotedIdentifiersTest.java | 1 - .../sql/hand/quotedidentifiers/Person.java | 1 + .../org/hibernate/test/stateless/Contact.java | 1 + .../org/hibernate/test/stateless/Country.java | 1 + .../hibernate/test/stateless/Document.java | 1 - .../org/hibernate/test/stateless/Org.java | 1 + .../org/hibernate/test/stateless/Paper.java | 1 + .../stateless/StatelessSessionQueryTest.java | 2 - .../test/stateless/StatelessSessionTest.java | 3 - .../test/stateless/fetching/Resource.java | 1 + .../StatelessSessionFetchingTest.java | 1 - .../test/stateless/fetching/Task.java | 1 - .../test/stateless/fetching/User.java | 1 + .../org/hibernate/test/stats/Continent.java | 1 - .../org/hibernate/test/stats/Country.java | 1 + .../org/hibernate/test/stats/Locality.java | 1 + .../org/hibernate/test/stats/Province.java | 1 + .../test/stats/SessionStatsTest.java | 7 +- .../java/org/hibernate/test/stats/State.java | 1 + .../org/hibernate/test/stats/StatsTest.java | 7 +- .../test/subclassfilter/Customer.java | 1 + .../DiscrimSubclassFilterTest.java | 3 - .../test/subclassfilter/Employee.java | 3 +- .../JoinedSubclassFilterTest.java | 3 - .../hibernate/test/subclassfilter/Person.java | 1 + .../UnionSubclassFilterTest.java | 3 - .../org/hibernate/test/subselect/Alien.java | 1 + .../org/hibernate/test/subselect/Being.java | 1 + .../org/hibernate/test/subselect/Human.java | 1 + .../test/subselect/SubselectTest.java | 3 - .../hibernate/test/subselectfetch/Child.java | 1 - .../hibernate/test/subselectfetch/Parent.java | 1 - .../subselectfetch/SubselectFetchTest.java | 3 - .../org/hibernate/test/ternary/Employee.java | 1 - .../java/org/hibernate/test/ternary/Site.java | 1 - .../hibernate/test/ternary/TernaryTest.java | 3 - .../org/hibernate/test/timestamp/Person.java | 1 - .../test/timestamp/TimestampTest.java | 3 - .../org/hibernate/test/timestamp/User.java | 1 - .../java/org/hibernate/test/tm/CMTTest.java | 3 - .../test/typedmanytoone/Address.java | 1 - .../test/typedmanytoone/AddressId.java | 1 - .../test/typedmanytoone/Customer.java | 1 - .../typedmanytoone/TypedManyToOneTest.java | 3 - .../hibernate/test/typedonetoone/Address.java | 1 - .../test/typedonetoone/AddressId.java | 1 - .../test/typedonetoone/Customer.java | 1 - .../test/typedonetoone/TypedOneToOneTest.java | 3 - .../DefaultValueIntegerType.java | 8 +- .../typeparameters/TypeParameterTest.java | 3 - .../hibernate/test/typeparameters/Widget.java | 1 + .../test/unconstrained/Employee.java | 1 + .../hibernate/test/unconstrained/Person.java | 1 + .../test/unconstrained/UnconstrainedTest.java | 2 - .../hibernate/test/unidir/BackrefTest.java | 2 - .../java/org/hibernate/test/unidir/Child.java | 1 + .../org/hibernate/test/unidir/Parent.java | 1 - .../hibernate/test/unionsubclass/Alien.java | 1 - .../hibernate/test/unionsubclass/Being.java | 1 - .../test/unionsubclass/Employee.java | 1 + .../hibernate/test/unionsubclass/Hive.java | 1 - .../hibernate/test/unionsubclass/Human.java | 1 + .../test/unionsubclass/Location.java | 1 - .../hibernate/test/unionsubclass/Thing.java | 1 + .../test/unionsubclass/UnionSubclassTest.java | 3 - .../test/unionsubclass/alias/CarBuyer.java | 1 + .../test/unionsubclass/alias/Customer.java | 1 - .../test/unionsubclass/alias/PersonID.java | 1 - .../test/unionsubclass/alias/SellCarTest.java | 1 - .../test/unionsubclass/alias/Seller.java | 1 - .../test/unionsubclass2/Address.java | 1 + .../test/unionsubclass2/Customer.java | 1 + .../test/unionsubclass2/Employee.java | 1 - .../hibernate/test/unionsubclass2/Person.java | 1 + .../unionsubclass2/UnionSubclassTest.java | 3 - .../test/usercollection/basic/Email.java | 1 + .../test/usercollection/basic/IMyList.java | 1 - .../test/usercollection/basic/MyList.java | 1 - .../test/usercollection/basic/MyListType.java | 2 - .../basic/PersistentMyList.java | 1 - .../test/usercollection/basic/User.java | 1 - .../basic/UserCollectionTypeTest.java | 2 - .../parameterized/DefaultableList.java | 5 +- .../parameterized/DefaultableListImpl.java | 5 +- .../parameterized/DefaultableListType.java | 24 +- .../usercollection/parameterized/Entity.java | 7 +- .../ParameterizedUserCollectionTypeTest.java | 16 +- .../PersistentDefaultableList.java | 10 +- .../test/util/PropertiesHelperTest.java | 3 - .../org/hibernate/test/util/SchemaUtil.java | 6 +- .../hibernate/test/util/StringHelperTest.java | 12 +- .../org/hibernate/test/util/dtd/Child.java | 3 +- .../test/util/dtd/EntityResolverTest.java | 12 +- .../org/hibernate/test/util/dtd/Parent.java | 9 +- .../org/hibernate/test/version/Person.java | 1 - .../java/org/hibernate/test/version/Task.java | 1 + .../org/hibernate/test/version/Thing.java | 1 + .../hibernate/test/version/VersionTest.java | 2 - .../test/version/db/DbVersionTest.java | 3 - .../org/hibernate/test/version/db/Group.java | 1 - .../hibernate/test/version/db/Permission.java | 1 - .../org/hibernate/test/version/db/User.java | 3 +- .../hibernate/test/version/sybase/Group.java | 1 - .../test/version/sybase/Permission.java | 1 - .../sybase/SybaseTimestampVersioningTest.java | 2 - .../hibernate/test/version/sybase/User.java | 2 - .../java/org/hibernate/test/where/File.java | 1 - .../org/hibernate/test/where/WhereTest.java | 2 - .../cache/BaseCacheProviderTestCase.java | 4 +- .../org/hibernate/testing/cache/Item.java | 1 + .../testing/cache/VersionedItem.java | 1 + .../AbstractClassLoaderIsolatedTestCase.java | 3 +- .../testing/junit/DialectChecks.java | 1 - .../testing/junit/FailureExpected.java | 1 - .../testing/junit/RequiresDialect.java | 2 - .../testing/junit/RequiresDialectFeature.java | 1 - .../testing/junit/SkipForDialect.java | 2 - .../testing/junit/TestSuiteVisitor.java | 6 +- .../hibernate/testing/junit/UnitTestCase.java | 3 +- .../DatabaseSpecificFunctionalTestCase.java | 3 +- .../functional/ExecutionEnvironment.java | 14 +- .../junit/functional/FunctionalTestCase.java | 3 +- .../FunctionalTestClassTestSuite.java | 3 +- .../annotations/HibernateTestCase.java | 1 - .../testing/tm/ConnectionProviderImpl.java | 2 - .../testing/tm/SimpleJtaTransactionImpl.java | 1 - .../tm/SimpleJtaTransactionManagerImpl.java | 1 - .../tm/TransactionManagerLookupImpl.java | 6 +- .../hibernate/type/BasicTypeRegistryTest.java | 5 - .../java/org/hibernate/type/TypeTest.java | 3 - .../java/AbstractDescriptorTest.java | 2 - .../java/BigDecimalDescriptorTest.java | 1 - .../java/BigIntegerDescriptorTest.java | 1 - .../descriptor/java/BlobDescriptorTest.java | 2 - .../java/BooleanDescriptorTest.java | 1 + .../descriptor/java/StringDescriptorTest.java | 1 + .../sql/PreparedStatementProxy.java | 2 - .../type/descriptor/sql/ResultSetProxy.java | 1 - .../type/descriptor/sql/StringClobImpl.java | 1 - .../sql/StringValueMappingTest.java | 5 - .../org/hibernate/util/SerializableThing.java | 1 - .../util/SerializationHelperTest.java | 3 - .../org/hibernate/util/StringHelperTest.java | 1 - .../cache/AbstractEhCacheRegionFactory.java | 4 +- .../java/org/hibernate/cache/EhCache.java | 9 +- .../org/hibernate/cache/EhCacheLogger.java | 22 +- .../org/hibernate/cache/EhCacheProvider.java | 9 +- .../hibernate/cache/EhCacheRegionFactory.java | 1 - .../cache/SingletonEhCacheProvider.java | 54 +- .../cache/SingletonEhCacheRegionFactory.java | 1 - .../java/org/hibernate/cache/EhCacheTest.java | 6 +- .../ejb/AbstractEntityManagerImpl.java | 23 +- .../org/hibernate/ejb/AbstractQueryImpl.java | 6 +- .../org/hibernate/ejb/AvailableSettings.java | 1 + .../ejb/CurrentEntityManagerImpl.java | 3 - .../org/hibernate/ejb/Ejb3Configuration.java | 28 +- .../ejb/Ejb3ConfigurationObjectFactory.java | 3 +- .../ejb/EntityManagerFactoryImpl.java | 27 +- .../org/hibernate/ejb/EntityManagerImpl.java | 9 +- .../ejb/EventListenerConfigurator.java | 2 - .../hibernate/ejb/HibernateEntityManager.java | 2 - .../ejb/HibernateEntityManagerFactory.java | 2 - .../HibernateEntityManagerImplementor.java | 2 - .../hibernate/ejb/HibernatePersistence.java | 4 - .../org/hibernate/ejb/HibernateQuery.java | 1 - .../java/org/hibernate/ejb/QueryHints.java | 3 +- .../java/org/hibernate/ejb/QueryImpl.java | 5 +- .../org/hibernate/ejb/TransactionImpl.java | 3 - .../main/java/org/hibernate/ejb/Version.java | 7 +- .../InjectedDataSourceConnectionProvider.java | 8 +- .../hibernate/ejb/criteria/AbstractNode.java | 1 - .../ejb/criteria/BasicPathUsageException.java | 1 - .../criteria/CollectionJoinImplementor.java | 1 - .../ejb/criteria/CriteriaBuilderImpl.java | 36 +- .../ejb/criteria/CriteriaQueryCompiler.java | 9 +- .../ejb/criteria/CriteriaQueryImpl.java | 4 +- .../ejb/criteria/CriteriaSubqueryImpl.java | 1 - .../ejb/criteria/ExpressionImplementor.java | 1 - .../ejb/criteria/FromImplementor.java | 4 - .../criteria/IllegalDereferenceException.java | 1 + .../ejb/criteria/JoinImplementor.java | 1 - .../ejb/criteria/ListJoinImplementor.java | 1 - .../ejb/criteria/MapJoinImplementor.java | 1 - .../org/hibernate/ejb/criteria/OrderImpl.java | 3 +- .../ejb/criteria/ParameterContainer.java | 1 - .../ejb/criteria/ParameterRegistry.java | 1 - .../ejb/criteria/PathImplementor.java | 1 - .../hibernate/ejb/criteria/PathSource.java | 1 - .../ejb/criteria/QueryStructure.java | 24 +- .../hibernate/ejb/criteria/Renderable.java | 1 + .../ejb/criteria/SelectionImplementor.java | 1 - .../ejb/criteria/SetJoinImplementor.java | 1 - .../ejb/criteria/TupleElementImplementor.java | 1 - .../ejb/criteria/ValueHandlerFactory.java | 1 - .../expression/AbstractTupleElement.java | 2 - .../expression/BinaryArithmeticOperation.java | 4 +- .../expression/BinaryOperatorExpression.java | 1 - .../expression/CoalesceExpression.java | 5 +- .../expression/CompoundSelectionImpl.java | 4 +- .../criteria/expression/ConcatExpression.java | 3 +- .../expression/EntityTypeExpression.java | 4 +- .../criteria/expression/ExpressionImpl.java | 2 - .../expression/ListIndexExpression.java | 3 +- .../expression/LiteralExpression.java | 7 +- .../expression/MapEntryExpression.java | 2 - .../expression/NullLiteralExpression.java | 2 - .../criteria/expression/NullifExpression.java | 3 +- .../expression/ParameterExpressionImpl.java | 4 +- .../expression/PathTypeExpression.java | 2 - .../expression/SearchedCaseExpression.java | 5 +- .../criteria/expression/SelectionImpl.java | 4 +- .../expression/SimpleCaseExpression.java | 5 +- .../SizeOfCollectionExpression.java | 3 +- .../SubqueryComparisonModifierExpression.java | 4 +- .../expression/UnaryArithmeticOperation.java | 3 +- .../expression/UnaryOperatorExpression.java | 1 - .../expression/function/AbsFunction.java | 1 - .../function/AggregationFunction.java | 1 - .../function/BasicFunctionExpression.java | 5 +- .../expression/function/CastFunction.java | 4 +- .../function/CurrentDateFunction.java | 2 - .../function/CurrentTimeFunction.java | 2 - .../function/CurrentTimestampFunction.java | 1 - .../function/FunctionExpression.java | 1 - .../expression/function/LengthFunction.java | 1 - .../expression/function/LocateFunction.java | 4 +- .../expression/function/LowerFunction.java | 1 - .../ParameterizedFunctionExpression.java | 5 +- .../expression/function/SqrtFunction.java | 1 - .../function/SubstringFunction.java | 4 +- .../expression/function/TrimFunction.java | 5 +- .../expression/function/UpperFunction.java | 1 - .../ejb/criteria/path/AbstractFromImpl.java | 2 - .../ejb/criteria/path/AbstractJoinImpl.java | 3 - .../ejb/criteria/path/AbstractPathImpl.java | 2 - .../path/CollectionAttributeJoin.java | 3 - .../ejb/criteria/path/ListAttributeJoin.java | 3 - .../ejb/criteria/path/MapAttributeJoin.java | 3 - .../ejb/criteria/path/MapKeyHelpers.java | 2 - .../path/PluralAttributeJoinSupport.java | 3 - .../criteria/path/PluralAttributePath.java | 2 - .../hibernate/ejb/criteria/path/RootImpl.java | 2 - .../ejb/criteria/path/SetAttributeJoin.java | 3 - .../criteria/path/SingularAttributeJoin.java | 2 - .../criteria/path/SingularAttributePath.java | 2 - .../predicate/AbstractPredicateImpl.java | 4 +- .../predicate/AbstractSimplePredicate.java | 4 +- .../criteria/predicate/BetweenPredicate.java | 4 +- .../predicate/BooleanAssertionPredicate.java | 2 - .../predicate/BooleanExpressionPredicate.java | 4 +- .../BooleanStaticAssertionPredicate.java | 2 - .../predicate/ComparisonPredicate.java | 6 +- .../criteria/predicate/CompoundPredicate.java | 2 - .../criteria/predicate/ExistsPredicate.java | 3 +- .../predicate/ExplicitTruthValueCheck.java | 4 +- .../ejb/criteria/predicate/InPredicate.java | 6 +- .../criteria/predicate/IsEmptyPredicate.java | 3 +- .../ejb/criteria/predicate/LikePredicate.java | 3 +- .../criteria/predicate/MemberOfPredicate.java | 3 +- .../criteria/predicate/NullnessPredicate.java | 4 +- .../ejb/criteria/predicate/TruthValue.java | 1 + .../org/hibernate/ejb/event/BeanCallback.java | 3 +- .../org/hibernate/ejb/event/Callback.java | 2 - .../ejb/event/CallbackHandlerConsumer.java | 1 + .../hibernate/ejb/event/CallbackResolver.java | 19 +- .../ejb/event/EJB3AutoFlushEventListener.java | 1 - .../ejb/event/EJB3DeleteEventListener.java | 4 +- .../event/EJB3FlushEntityEventListener.java | 1 - .../ejb/event/EJB3FlushEventListener.java | 1 - .../ejb/event/EJB3MergeEventListener.java | 2 - .../ejb/event/EJB3PersistEventListener.java | 8 +- .../EJB3PersistOnFlushEventListener.java | 1 - .../event/EJB3PostDeleteEventListener.java | 1 - .../event/EJB3PostInsertEventListener.java | 1 - .../ejb/event/EJB3PostLoadEventListener.java | 1 - .../event/EJB3PostUpdateEventListener.java | 1 - .../ejb/event/EJB3SaveEventListener.java | 2 - .../event/EJB3SaveOrUpdateEventListener.java | 2 - .../ejb/event/EntityCallbackHandler.java | 4 +- .../hibernate/ejb/event/ListenerCallback.java | 4 +- .../InterceptFieldClassFileTransformer.java | 2 - .../ejb/metamodel/AbstractAttribute.java | 8 +- .../metamodel/AbstractIdentifiableType.java | 3 +- .../ejb/metamodel/AbstractManagedType.java | 14 +- .../hibernate/ejb/metamodel/AbstractType.java | 1 - .../ejb/metamodel/AttributeFactory.java | 7 +- .../ejb/metamodel/AttributeImplementor.java | 1 - .../ejb/metamodel/BasicTypeImpl.java | 1 - .../ejb/metamodel/EmbeddableTypeImpl.java | 2 - .../ejb/metamodel/EntityTypeImpl.java | 1 - .../metamodel/MappedSuperclassTypeImpl.java | 2 - .../ejb/metamodel/MetadataContext.java | 7 +- .../ejb/metamodel/MetamodelImpl.java | 16 +- .../ejb/metamodel/PluralAttributeImpl.java | 2 - .../ejb/metamodel/SingularAttributeImpl.java | 3 +- .../ejb/packaging/AbstractJarVisitor.java | 15 +- .../hibernate/ejb/packaging/ClassFilter.java | 1 + .../org/hibernate/ejb/packaging/Entry.java | 1 - .../ejb/packaging/ExplodedJarVisitor.java | 7 +- .../hibernate/ejb/packaging/FileFilter.java | 1 + .../ejb/packaging/FileZippedJarVisitor.java | 9 +- .../org/hibernate/ejb/packaging/Filter.java | 1 + .../InputStreamZippedJarVisitor.java | 10 +- .../ejb/packaging/JarProtocolVisitor.java | 2 - .../hibernate/ejb/packaging/JarVisitor.java | 3 +- .../ejb/packaging/JarVisitorFactory.java | 7 +- .../ejb/packaging/JavaElementFilter.java | 1 + .../ejb/packaging/NamedInputStream.java | 1 - .../ejb/packaging/NativeScanner.java | 2 - .../ejb/packaging/PackageFilter.java | 1 + .../ejb/packaging/PersistenceMetadata.java | 3 +- .../ejb/packaging/PersistenceXmlLoader.java | 7 +- .../org/hibernate/ejb/packaging/Scanner.java | 5 +- .../hibernate/ejb/packaging/XmlHelper.java | 2 - .../transaction/JoinableCMTTransaction.java | 4 +- .../JoinableCMTTransactionFactory.java | 3 +- .../hibernate/ejb/util/CacheModeHelper.java | 2 - .../ejb/util/ConfigurationHelper.java | 7 +- .../ejb/util/LockModeTypeHelper.java | 2 - .../org/hibernate/ejb/util/LogHelper.java | 1 - .../org/hibernate/ejb/util/NamingHelper.java | 14 +- .../ejb/util/PersistenceUtilHelper.java | 14 +- .../hibernate/engine/EJB3CascadeStyle.java | 1 + .../hibernate/engine/EJB3CascadingAction.java | 7 +- .../ejb/TestEntityManagerLogger.java | 21 - .../ejb/criteria/CriteriaCompilingTest.java | 2 - .../ejb/criteria/QueryBuilderTest.java | 8 +- .../criteria/basic/AggregationResultTest.java | 3 - .../basic/BasicCriteriaUsageTest.java | 6 +- .../ejb/criteria/basic/ExpressionsTest.java | 4 - .../ejb/criteria/basic/PredicateTest.java | 2 - .../hibernate/ejb/criteria/basic/Wall.java | 5 +- .../ejb/criteria/components/Client.java | 1 - .../components/ComponentCriteriaTest.java | 3 - .../ejb/criteria/components/Name.java | 3 +- .../ejb/criteria/paths/ImplicitJoinTest.java | 2 - .../subquery/CorrelatedSubqueryTest.java | 2 - .../subquery/UncorrelatedSubqueryTest.java | 2 - .../ejb/criteria/tuple/TupleCriteriaTest.java | 4 +- .../AbstractMetamodelSpecificTest.java | 1 - .../org/hibernate/ejb/metamodel/Address.java | 1 - .../org/hibernate/ejb/metamodel/Alias.java | 1 - .../org/hibernate/ejb/metamodel/Country.java | 1 - .../hibernate/ejb/metamodel/CreditCard.java | 1 - .../org/hibernate/ejb/metamodel/Customer.java | 1 - .../ejb/metamodel/EmbeddedTypeTest.java | 2 - .../org/hibernate/ejb/metamodel/Info.java | 1 - .../org/hibernate/ejb/metamodel/LineItem.java | 1 - .../org/hibernate/ejb/metamodel/Order.java | 1 - .../org/hibernate/ejb/metamodel/Phone.java | 1 - .../org/hibernate/ejb/metamodel/Product.java | 1 - .../hibernate/ejb/metamodel/ShelfLife.java | 1 - .../org/hibernate/ejb/metamodel/Spouse.java | 1 - .../test/java/org/hibernate/ejb/test/Cat.java | 3 +- .../org/hibernate/ejb/test/Distributor.java | 1 - .../hibernate/ejb/test/EntityManagerTest.java | 2 - .../java/org/hibernate/ejb/test/Item.java | 2 - .../java/org/hibernate/ejb/test/Kitten.java | 1 - .../ejb/test/LastUpdateListener.java | 1 - .../hibernate/ejb/test/MyNamingStrategy.java | 1 - .../org/hibernate/ejb/test/NoOpListener.java | 3 +- .../java/org/hibernate/ejb/test/TestCase.java | 5 +- .../java/org/hibernate/ejb/test/Wallet.java | 1 - .../ejb/test/association/AssociationTest.java | 4 +- .../ejb/test/association/Incident.java | 3 +- .../ejb/test/association/IncidentStatus.java | 3 +- .../ejb/test/association/Kitchen.java | 3 +- .../hibernate/ejb/test/association/Oven.java | 11 +- .../beanvalidation/BeanValidationTest.java | 3 - .../ejb/test/beanvalidation/CupHolder.java | 4 +- .../annotation/ConfigurationTest.java | 4 +- .../annotation/ExplicitlyCacheableEntity.java | 1 - .../ExplicitlyNonCacheableEntity.java | 1 - .../NoCacheableAnnotationEntity.java | 2 - .../cachemodes/SharedCacheModesTest.java | 2 - .../cacheable/cachemodes/SimpleEntity.java | 2 - .../test/callbacks/CallbackAndDirtyTest.java | 2 - .../ejb/test/callbacks/CallbacksTest.java | 3 - .../test/callbacks/CommunicationSystem.java | 1 - .../ejb/test/callbacks/CountryChecker.java | 1 - .../callbacks/CountryNameCheckerListener.java | 1 - .../ejb/test/callbacks/Customer.java | 1 - .../ejb/test/callbacks/Employee.java | 1 - .../ejb/test/callbacks/ExceptionListener.java | 3 +- .../ejb/test/callbacks/FirstOneListener.java | 1 - .../ejb/test/callbacks/IncreaseListener.java | 1 - .../hibernate/ejb/test/callbacks/Person.java | 1 - .../hibernate/ejb/test/callbacks/Plant.java | 3 +- .../ejb/test/callbacks/RemoteControl.java | 1 - .../hibernate/ejb/test/callbacks/Rythm.java | 7 +- .../ejb/test/callbacks/Television.java | 3 +- .../ejb/test/callbacks/Translation.java | 1 - .../ejb/test/callbacks/VideoSystem.java | 3 +- .../hibernate/ejb/test/cascade/Author.java | 3 +- .../ejb/test/cascade/CascadeTest.java | 4 +- .../ejb/test/cascade/Conference.java | 1 - .../ejb/test/cascade/DeleteOrphanTest.java | 2 - .../test/cascade/DetachAndContainsTest.java | 15 +- .../ejb/test/cascade/ExtractionDocument.java | 2 - .../test/cascade/ExtractionDocumentInfo.java | 1 - .../hibernate/ejb/test/cascade/FetchTest.java | 2 - .../ejb/test/cascade/FetchTest2.java | 2 - .../hibernate/ejb/test/cascade/Grandson.java | 1 - .../hibernate/ejb/test/cascade/Parent.java | 1 - .../hibernate/ejb/test/cascade/Soldier.java | 1 - .../hibernate/ejb/test/cascade/Soldier2.java | 1 - .../org/hibernate/ejb/test/cascade/Son.java | 1 - .../org/hibernate/ejb/test/cascade/Song.java | 3 +- .../hibernate/ejb/test/cascade/Student.java | 2 - .../hibernate/ejb/test/cascade/Teacher.java | 3 - .../org/hibernate/ejb/test/cascade/Troop.java | 2 - .../hibernate/ejb/test/cascade/Troop2.java | 3 +- .../connection/DataSourceInjectionTest.java | 3 - .../ejb/test/connection/FakeDataSource.java | 1 - .../connection/FakeDataSourceException.java | 1 + .../connection/PersistenceUnitInfoImpl.java | 2 - .../ConfigurationObjectSettingTest.java | 3 - .../EntityManagerSerializationTest.java | 3 - .../ExceptionInterceptor.java | 6 - .../ejb3configuration/InterceptorTest.java | 2 - .../LocalExceptionInterceptor.java | 4 +- .../PersistenceUnitInfoAdapter.java | 2 - .../ProgrammaticConfTest.java | 3 - .../ejb/test/ejb3configuration/TestCase.java | 2 - .../org/hibernate/ejb/test/emops/Cat.java | 1 - .../org/hibernate/ejb/test/emops/Colony.java | 5 +- .../hibernate/ejb/test/emops/Competition.java | 14 +- .../hibernate/ejb/test/emops/Competitor.java | 5 +- .../hibernate/ejb/test/emops/Decorate.java | 1 - .../org/hibernate/ejb/test/emops/Dog.java | 1 - .../org/hibernate/ejb/test/emops/Dress.java | 5 +- .../org/hibernate/ejb/test/emops/Empire.java | 11 +- .../ejb/test/emops/FlushModeTest.java | 4 +- .../hibernate/ejb/test/emops/FlushTest.java | 11 +- .../ejb/test/emops/GetReferenceTest.java | 4 +- .../org/hibernate/ejb/test/emops/Mail.java | 3 +- .../hibernate/ejb/test/emops/MergeTest.java | 4 +- .../org/hibernate/ejb/test/emops/Music.java | 5 +- .../org/hibernate/ejb/test/emops/Pet.java | 1 - .../org/hibernate/ejb/test/emops/Race.java | 3 +- .../hibernate/ejb/test/emops/RefreshTest.java | 4 +- .../hibernate/ejb/test/emops/RemoveTest.java | 4 +- .../hibernate/ejb/test/emops/cascade/A.java | 1 - .../hibernate/ejb/test/emops/cascade/B1.java | 1 - .../hibernate/ejb/test/emops/cascade/B2.java | 1 - .../hibernate/ejb/test/emops/cascade/B3.java | 1 - .../hibernate/ejb/test/emops/cascade/B4.java | 1 - .../hibernate/ejb/test/emops/cascade/C1.java | 1 - .../hibernate/ejb/test/emops/cascade/C2.java | 1 - .../emops/cascade/CascadePersistTest.java | 4 +- .../ejb/test/exception/ExceptionTest.java | 4 +- .../ejb/test/exception/Instrument.java | 1 - .../hibernate/ejb/test/exception/Music.java | 5 +- .../ejb/test/exception/Musician.java | 2 - .../hibernate/ejb/test/inheritance/Fruit.java | 7 +- .../ejb/test/inheritance/InheritanceTest.java | 4 +- .../ejb/test/inheritance/Strawberry.java | 3 +- .../instrument/InstrumentedClassLoader.java | 2 - ...nterceptFieldClassFileTransformerTest.java | 2 - .../hibernate/ejb/test/instrument/Simple.java | 1 + .../ejb/test/jee/OrmVersionTest.java | 3 - .../org/hibernate/ejb/test/lob/BlobTest.java | 4 - .../hibernate/ejb/test/lob/ImageReader.java | 1 - .../org/hibernate/ejb/test/lock/Lock.java | 1 - .../org/hibernate/ejb/test/lock/LockTest.java | 2 +- .../org/hibernate/ejb/test/lock/Lockable.java | 1 - .../ejb/test/lock/QueryLockingTest.java | 2 - .../ejb/test/lock/UnversionedLock.java | 5 +- .../org/hibernate/ejb/test/mapping/Phone.java | 7 - .../ejb/test/mapping/QuotingTest.java | 1 - .../hibernate/ejb/test/metadata/Address.java | 3 +- .../hibernate/ejb/test/metadata/Animal.java | 5 +- .../hibernate/ejb/test/metadata/Being.java | 1 - .../org/hibernate/ejb/test/metadata/Cat.java | 1 - .../hibernate/ejb/test/metadata/Cattish.java | 1 - .../hibernate/ejb/test/metadata/Child.java | 1 - .../ejb/test/metadata/DeskWithRawType.java | 1 - .../org/hibernate/ejb/test/metadata/Dog.java | 1 - .../test/metadata/EmployeeWithRawType.java | 1 - .../hibernate/ejb/test/metadata/Feline.java | 1 - .../hibernate/ejb/test/metadata/Flower.java | 3 +- .../hibernate/ejb/test/metadata/FoodItem.java | 3 +- .../hibernate/ejb/test/metadata/Fridge.java | 7 +- .../hibernate/ejb/test/metadata/Garden.java | 3 +- .../hibernate/ejb/test/metadata/House.java | 8 +- .../test/metadata/JoinedManyToOneOwner.java | 1 - .../ejb/test/metadata/MetadataTest.java | 20 +- .../hibernate/ejb/test/metadata/Parent.java | 2 - .../hibernate/ejb/test/metadata/Person.java | 3 +- .../org/hibernate/ejb/test/metadata/Room.java | 1 - .../ejb/test/metadata/SecondMetadataTest.java | 2 - .../test/metadata/SimpleMedicalHistory.java | 1 - .../ejb/test/metadata/SimplePerson.java | 1 - .../ejb/test/metadata/StaticMetadataTest.java | 2 - .../hibernate/ejb/test/metadata/SubThing.java | 1 + .../hibernate/ejb/test/metadata/Thing.java | 1 - .../test/metadata/WithGenericCollection.java | 14 +- .../org/hibernate/ejb/test/ops/Animal.java | 3 +- .../org/hibernate/ejb/test/ops/Employee.java | 1 - .../org/hibernate/ejb/test/ops/Employer.java | 1 - .../org/hibernate/ejb/test/ops/FindTest.java | 2 - .../hibernate/ejb/test/ops/GetLoadTest.java | 2 - .../org/hibernate/ejb/test/ops/Mammal.java | 1 - .../hibernate/ejb/test/ops/MergeNewTest.java | 2 - .../org/hibernate/ejb/test/ops/MergeTest.java | 2 - .../java/org/hibernate/ejb/test/ops/Node.java | 1 - .../hibernate/ejb/test/ops/NumberedNode.java | 1 + .../hibernate/ejb/test/ops/PersistTest.java | 2 - .../org/hibernate/ejb/test/ops/Reptile.java | 1 - .../org/hibernate/ejb/test/ops/Workload.java | 1 - .../ejb/test/pack/cfgxmlpar/Morito.java | 1 - .../pack/defaultpar/ApplicationServer.java | 1 - .../pack/defaultpar/IncrementListener.java | 3 +- .../ejb/test/pack/defaultpar/Lighter.java | 3 +- .../ejb/test/pack/defaultpar/Money.java | 5 +- .../ejb/test/pack/defaultpar/Mouse.java | 1 - .../defaultpar/OtherIncrementListener.java | 3 +- .../ejb/test/pack/defaultpar/Version.java | 1 - .../test/pack/defaultpar/package-info.java | 1 - .../defaultpar_1_0/ApplicationServer1.java | 1 - .../defaultpar_1_0/IncrementListener1.java | 3 +- .../test/pack/defaultpar_1_0/Lighter1.java | 3 +- .../ejb/test/pack/defaultpar_1_0/Money1.java | 5 +- .../ejb/test/pack/defaultpar_1_0/Mouse1.java | 1 - .../OtherIncrementListener1.java | 3 +- .../test/pack/defaultpar_1_0/Version1.java | 1 - .../pack/defaultpar_1_0/package-info.java | 2 +- .../test/pack/excludehbmpar/Caipirinha.java | 1 - .../ejb/test/pack/explicitpar/Washer.java | 3 +- .../ejb/test/pack/explodedpar/Carpet.java | 1 - .../ejb/test/pack/explodedpar/Elephant.java | 1 + .../test/pack/explodedpar/package-info.java | 1 - .../ejb/test/pack/externaljar/Scooter.java | 1 - .../ejb/test/pack/overridenpar/Bug.java | 5 +- .../hibernate/ejb/test/pack/spacepar/Bug.java | 5 +- .../ejb/test/pack/various/Airplane.java | 1 + .../hibernate/ejb/test/pack/various/Seat.java | 1 + .../ejb/test/pack/war/ApplicationServer.java | 1 - .../ejb/test/pack/war/IncrementListener.java | 3 +- .../hibernate/ejb/test/pack/war/Lighter.java | 3 +- .../hibernate/ejb/test/pack/war/Money.java | 5 +- .../hibernate/ejb/test/pack/war/Mouse.java | 1 - .../test/pack/war/OtherIncrementListener.java | 3 +- .../hibernate/ejb/test/pack/war/Version.java | 1 - .../ejb/test/pack/war/package-info.java | 1 - .../ejb/test/packaging/CustomScanner.java | 2 - .../ejb/test/packaging/JarVisitorTest.java | 2 - .../packaging/PackagedEntityManagerTest.java | 2 - .../ejb/test/packaging/PackagingTestCase.java | 17 +- .../hibernate/ejb/test/packaging/Pasta.java | 1 - .../ejb/test/packaging/ScannerTest.java | 2 - .../ejb/test/query/ComponentJoinsTest.java | 4 +- .../hibernate/ejb/test/query/QueryTest.java | 8 +- .../hibernate/ejb/test/transaction/Book.java | 1 - .../transaction/FlushAndTransactionTest.java | 2 - .../org/hibernate/ejb/test/util/Author.java | 1 - .../org/hibernate/ejb/test/util/Book.java | 3 +- .../ejb/test/util/CopyrightableContent.java | 2 - .../ejb/test/util/GetIdentifierTest.java | 3 - .../hibernate/ejb/test/util/IsLoadedTest.java | 2 - .../test/util/PersistenceUtilHelperTest.java | 2 - .../org/hibernate/ejb/test/util/Sickness.java | 5 +- .../org/hibernate/ejb/test/util/Umbrella.java | 3 +- .../org/hibernate/ejb/test/xml/Address.java | 3 +- .../org/hibernate/ejb/test/xml/Article.java | 11 +- .../ejb/test/xml/CounterListener.java | 3 +- .../org/hibernate/ejb/test/xml/Employee.java | 3 +- .../org/hibernate/ejb/test/xml/Light.java | 3 +- .../org/hibernate/ejb/test/xml/Lighter.java | 3 +- .../test/xml/XmlAttributeOverrideTest.java | 4 +- .../org/hibernate/ejb/test/xml/XmlTest.java | 4 +- .../ejb/test/xml/sequences/Address.java | 3 +- .../ejb/test/xml/sequences/Article.java | 11 +- .../ejb/test/xml/sequences/Employee.java | 3 +- .../ejb/test/xml/sequences/Light.java | 3 +- .../ejb/test/xml/sequences/Lighter.java | 3 +- .../sequences/XmlAttributeOverrideTest.java | 4 +- .../ejb/test/xml/sequences/XmlTest.java | 4 +- .../org/hibernate/envers/demo/Address.java | 2 + .../org/hibernate/envers/demo/Person.java | 2 + .../hibernate/envers/demo/TestConsole.java | 2 + .../org/hibernate/envers/AuditJoinTable.java | 1 - .../org/hibernate/envers/AuditMappedBy.java | 3 +- .../org/hibernate/envers/AuditOverride.java | 9 +- .../org/hibernate/envers/AuditOverrides.java | 9 +- .../org/hibernate/envers/AuditReader.java | 2 - .../hibernate/envers/AuditReaderFactory.java | 9 +- .../java/org/hibernate/envers/AuditTable.java | 1 - .../java/org/hibernate/envers/Audited.java | 1 - .../envers/DefaultRevisionEntity.java | 3 +- .../org/hibernate/envers/EnversLogger.java | 12 +- .../hibernate/envers/ModificationStore.java | 1 + .../java/org/hibernate/envers/NotAudited.java | 1 - .../envers/RelationTargetAuditMode.java | 1 + .../org/hibernate/envers/RevisionEntity.java | 1 - .../hibernate/envers/RevisionListener.java | 1 + .../org/hibernate/envers/RevisionNumber.java | 1 - .../hibernate/envers/RevisionTimestamp.java | 1 - .../org/hibernate/envers/RevisionType.java | 1 + .../hibernate/envers/SecondaryAuditTable.java | 1 - .../envers/SecondaryAuditTables.java | 1 - ...AnnotationConfigurationTaskWithEnvers.java | 4 +- .../ant/ConfigurationTaskWithEnvers.java | 4 +- .../ant/JPAConfigurationTaskWithEnvers.java | 4 +- .../configuration/AuditConfiguration.java | 2 - .../AuditEntitiesConfiguration.java | 3 - .../configuration/ClassesAuditingData.java | 11 +- .../configuration/EntitiesConfigurator.java | 17 +- .../configuration/GlobalConfiguration.java | 2 - .../PersistentClassGraphDefiner.java | 5 +- .../RevisionInfoConfiguration.java | 27 +- .../metadata/AuditEntityNameRegister.java | 6 +- .../metadata/AuditMetadataGenerator.java | 13 +- .../metadata/AuditTableData.java | 1 + .../metadata/BasicMetadataGenerator.java | 7 +- .../metadata/CollectionMetadataGenerator.java | 33 +- .../metadata/ComponentMetadataGenerator.java | 12 +- .../metadata/EntityXmlMappingData.java | 2 - .../metadata/IdMetadataGenerator.java | 5 +- .../metadata/InheritanceType.java | 1 - .../configuration/metadata/MetadataTools.java | 3 - .../metadata/QueryGeneratorBuilder.java | 2 - .../ToOneRelationMetadataGenerator.java | 1 - .../reader/AnnotationsMetadataReader.java | 13 +- .../reader/AuditedPropertiesHolder.java | 1 + .../reader/AuditedPropertiesReader.java | 16 +- .../metadata/reader/ClassAuditingData.java | 4 +- .../ComponentAuditedPropertiesReader.java | 1 - .../reader/ComponentAuditingData.java | 4 +- .../reader/PersistentPropertiesSource.java | 6 +- .../metadata/reader/PropertyAuditingData.java | 6 +- .../entities/EntitiesConfigurations.java | 1 - .../envers/entities/EntityConfiguration.java | 2 - .../envers/entities/EntityInstantiator.java | 2 - .../envers/entities/IdMappingData.java | 1 - .../envers/entities/PropertyData.java | 1 - .../envers/entities/RelationDescription.java | 3 +- .../envers/entities/RelationType.java | 1 + .../envers/entities/RevisionTypeType.java | 5 +- .../mapper/ComponentPropertyMapper.java | 2 - .../mapper/CompositeMapperBuilder.java | 1 - .../mapper/ExtendedPropertyMapper.java | 4 +- .../entities/mapper/MultiPropertyMapper.java | 18 +- .../PersistentCollectionChangeData.java | 4 +- .../entities/mapper/PropertyMapper.java | 7 +- .../entities/mapper/SimpleMapperBuilder.java | 1 - .../entities/mapper/SinglePropertyMapper.java | 13 +- .../mapper/SubclassPropertyMapper.java | 9 +- .../mapper/id/AbstractCompositeIdMapper.java | 2 - .../entities/mapper/id/AbstractIdMapper.java | 2 - .../entities/mapper/id/EmbeddedIdMapper.java | 5 +- .../envers/entities/mapper/id/IdMapper.java | 2 - .../entities/mapper/id/MultipleIdMapper.java | 4 +- .../mapper/id/QueryParameterData.java | 1 - .../mapper/id/SimpleIdMapperBuilder.java | 1 - .../entities/mapper/id/SingleIdMapper.java | 3 - .../relation/AbstractCollectionMapper.java | 7 +- .../relation/BasicCollectionMapper.java | 5 +- .../relation/CommonCollectionMapperData.java | 3 +- .../mapper/relation/ListCollectionMapper.java | 5 +- .../mapper/relation/MapCollectionMapper.java | 5 +- .../mapper/relation/MiddleComponentData.java | 1 - .../mapper/relation/MiddleIdData.java | 1 - .../relation/OneToOneNotOwningMapper.java | 13 +- .../mapper/relation/ToOneIdMapper.java | 11 +- .../component/MiddleComponentMapper.java | 2 - .../component/MiddleDummyComponentMapper.java | 2 - .../MiddleMapKeyIdComponentMapper.java | 2 - .../MiddleMapKeyPropertyComponentMapper.java | 2 - .../MiddleRelatedComponentMapper.java | 2 - .../MiddleSimpleComponentMapper.java | 2 - .../MiddleStraightComponentMapper.java | 4 +- .../AbstractDelegateSessionImplementor.java | 4 +- .../lazy/ToOneDelegateSessionImplementor.java | 5 +- .../AbstractCollectionInitializor.java | 2 - .../ArrayCollectionInitializor.java | 2 - .../BasicCollectionInitializor.java | 2 - .../lazy/initializor/Initializor.java | 1 + .../ListCollectionInitializor.java | 8 +- .../initializor/MapCollectionInitializor.java | 2 - .../relation/lazy/proxy/CollectionProxy.java | 2 - .../mapper/relation/lazy/proxy/ListProxy.java | 4 - .../mapper/relation/lazy/proxy/MapProxy.java | 4 +- .../mapper/relation/lazy/proxy/SetProxy.java | 2 - .../relation/lazy/proxy/SortedMapProxy.java | 4 +- .../relation/lazy/proxy/SortedSetProxy.java | 1 - .../query/OneAuditEntityQueryGenerator.java | 2 - .../query/OneEntityQueryGenerator.java | 2 - .../query/RelationQueryGenerator.java | 4 +- .../query/ThreeEntityQueryGenerator.java | 2 - .../TwoEntityOneAuditedQueryGenerator.java | 7 +- .../query/TwoEntityQueryGenerator.java | 2 - .../envers/event/AuditEventListener.java | 23 +- .../envers/exception/AuditException.java | 1 - .../envers/exception/NotAuditedException.java | 1 + .../RevisionDoesNotExistException.java | 1 - .../hibernate/envers/query/AuditEntity.java | 11 +- .../hibernate/envers/query/AuditQuery.java | 9 +- .../envers/query/AuditQueryCreator.java | 5 +- .../criteria/AggregatedAuditExpression.java | 8 +- .../query/criteria/AuditConjunction.java | 2 - .../envers/query/criteria/AuditCriterion.java | 1 - .../query/criteria/AuditDisjunction.java | 2 - .../envers/query/criteria/AuditId.java | 1 - .../envers/query/criteria/AuditProperty.java | 10 +- .../envers/query/criteria/AuditRelatedId.java | 1 - .../criteria/BetweenAuditExpression.java | 3 +- .../envers/query/criteria/CriteriaTools.java | 1 - .../query/criteria/ExtendableCriterion.java | 1 + .../criteria/IdentifierEqAuditExpression.java | 1 - .../query/criteria/InAuditExpression.java | 3 +- .../criteria/LogicalAuditExpression.java | 1 - .../query/criteria/NotAuditExpression.java | 1 - .../criteria/NotNullAuditExpression.java | 3 +- .../query/criteria/NullAuditExpression.java | 3 +- .../criteria/PropertyAuditExpression.java | 3 +- .../criteria/RelatedAuditExpression.java | 3 +- .../criteria/RevisionTypeAuditExpression.java | 1 - .../query/criteria/SimpleAuditExpression.java | 3 +- .../envers/query/impl/AbstractAuditQuery.java | 13 +- .../query/impl/EntitiesAtRevisionQuery.java | 2 - .../query/impl/RevisionsOfEntityQuery.java | 2 - .../envers/query/order/AuditOrder.java | 1 - .../query/order/PropertyAuditOrder.java | 3 +- .../query/projection/AuditProjection.java | 1 - .../projection/PropertyAuditProjection.java | 3 +- .../query/property/EntityPropertyName.java | 1 - .../property/OriginalIdPropertyName.java | 1 - .../query/property/PropertyNameGetter.java | 1 - .../property/RevisionNumberPropertyName.java | 1 - .../RevisionPropertyPropertyName.java | 1 - .../property/RevisionTypePropertyName.java | 1 - .../envers/reader/AuditReaderImpl.java | 4 - .../envers/reader/AuditReaderImplementor.java | 4 +- .../envers/reader/FirstLevelCache.java | 24 +- .../DefaultRevisionInfoGenerator.java | 2 - .../revisioninfo/RevisionInfoGenerator.java | 1 - .../RevisionInfoNumberReader.java | 4 +- .../RevisionInfoQueryCreator.java | 2 - .../envers/strategy/AuditStrategy.java | 20 +- .../envers/strategy/DefaultAuditStrategy.java | 22 +- .../strategy/ValidTimeAuditStrategy.java | 9 +- .../strategy/ValidityAuditStrategy.java | 2 - .../envers/synchronization/AuditProcess.java | 7 +- .../synchronization/AuditProcessManager.java | 5 +- .../work/AbstractAuditWorkUnit.java | 7 +- .../synchronization/work/AddWorkUnit.java | 5 +- .../synchronization/work/AuditWorkUnit.java | 4 +- .../work/CollectionChangeWorkUnit.java | 5 +- .../synchronization/work/DelWorkUnit.java | 5 +- .../FakeBidirectionalRelationWorkUnit.java | 14 +- .../synchronization/work/ModWorkUnit.java | 5 +- .../PersistentCollectionChangeWorkUnit.java | 15 +- .../work/WorkUnitMergeDispatcher.java | 1 + .../work/WorkUnitMergeVisitor.java | 1 + .../envers/tools/ArgumentsTools.java | 1 + .../hibernate/envers/tools/ArraysTools.java | 1 + .../tools/ConcurrentReferenceHashMap.java | 1 - .../hibernate/envers/tools/MappingTools.java | 1 - .../envers/tools/MutableBoolean.java | 1 + .../envers/tools/MutableInteger.java | 1 + .../java/org/hibernate/envers/tools/Pair.java | 1 + .../hibernate/envers/tools/StringTools.java | 1 - .../org/hibernate/envers/tools/Tools.java | 18 +- .../org/hibernate/envers/tools/Triple.java | 1 + .../envers/tools/graph/GraphDefiner.java | 1 - .../tools/graph/GraphTopologicalSort.java | 1 - .../envers/tools/graph/TopologicalSort.java | 1 - .../hibernate/envers/tools/graph/Vertex.java | 1 - .../envers/tools/query/Parameters.java | 2 - .../envers/tools/query/QueryBuilder.java | 2 - .../tools/reflection/ReflectionTools.java | 12 +- .../tool/ant/EnversHibernateToolTask.java | 1 - .../hibernate/envers/TestEnversLogger.java | 21 - .../envers/test/AbstractEntityTest.java | 11 +- .../envers/test/AbstractOneSessionTest.java | 2 - .../envers/test/AbstractSessionTest.java | 9 +- .../test/entities/IntNoAutoIdTestEntity.java | 2 - .../envers/test/entities/IntTestEntity.java | 2 - .../test/entities/PrimitiveTestEntity.java | 2 - .../test/entities/StrIntTestEntity.java | 2 - .../envers/test/entities/StrTestEntity.java | 2 - .../test/entities/UnversionedEntity.java | 4 +- .../entities/UnversionedStrTestEntity.java | 1 - .../entities/collection/EnumSetEntity.java | 5 +- .../entities/collection/StringListEntity.java | 5 +- .../entities/collection/StringMapEntity.java | 5 +- .../entities/collection/StringSetEntity.java | 5 +- .../test/entities/components/Component1.java | 1 - .../test/entities/components/Component2.java | 1 - .../components/ComponentSetTestEntity.java | 7 +- .../components/ComponentTestEntity.java | 2 - .../components/DefaultValueComponent1.java | 1 - .../components/DefaultValueComponent2.java | 1 + .../DefaultValueComponentTestEntity.java | 2 - .../relations/ManyToOneComponent.java | 6 +- .../ManyToOneComponentTestEntity.java | 2 - .../NotAuditedManyToOneComponent.java | 8 +- ...otAuditedManyToOneComponentTestEntity.java | 2 - .../relations/OneToManyComponent.java | 10 +- .../OneToManyComponentTestEntity.java | 2 - .../test/entities/customtype/Component.java | 1 - .../customtype/CompositeCustomTypeEntity.java | 5 +- .../customtype/CompositeTestUserType.java | 2 - .../ParametrizedCustomTypeEntity.java | 5 +- .../customtype/ParametrizedTestUserType.java | 3 - .../ids/CompositeDateIdTestEntity.java | 4 +- .../envers/test/entities/ids/CustomEnum.java | 1 + .../test/entities/ids/CustomEnumUserType.java | 2 - .../envers/test/entities/ids/DateEmbId.java | 3 +- .../test/entities/ids/DateIdTestEntity.java | 6 +- .../envers/test/entities/ids/EmbId.java | 1 - .../test/entities/ids/EmbIdTestEntity.java | 2 - .../entities/ids/EmbIdWithCustomType.java | 2 - .../ids/EmbIdWithCustomTypeTestEntity.java | 2 - .../ids/ManyToOneIdNotAuditedTestEntity.java | 3 +- .../ids/ManyToOneNotAuditedEmbId.java | 6 +- .../envers/test/entities/ids/MulId.java | 1 - .../test/entities/ids/MulIdTestEntity.java | 2 - .../entities/manytomany/ListOwnedEntity.java | 2 - .../entities/manytomany/ListOwningEntity.java | 2 - .../entities/manytomany/MapOwnedEntity.java | 2 - .../entities/manytomany/MapOwningEntity.java | 2 - .../entities/manytomany/SetOwnedEntity.java | 2 - .../entities/manytomany/SetOwningEntity.java | 2 - .../manytomany/WhereJoinTableEntity.java | 13 +- .../biowned/ListBiowning1Entity.java | 11 +- .../biowned/ListBiowning2Entity.java | 11 +- .../manytomany/sametable/Child1Entity.java | 14 +- .../manytomany/sametable/Child2Entity.java | 14 +- .../manytomany/sametable/ParentEntity.java | 16 +- .../unidirectional/ListUniEntity.java | 2 - .../M2MIndexedListTargetNotAuditedEntity.java | 12 +- .../M2MTargetNotAuditedEntity.java | 10 +- .../unidirectional/MapUniEntity.java | 2 - .../unidirectional/SetUniEntity.java | 2 - .../TargetNotAuditedEntity.java | 2 - .../onetomany/CollectionRefEdEntity.java | 4 +- .../onetomany/CollectionRefIngEntity.java | 5 +- .../entities/onetomany/ListRefEdEntity.java | 2 - .../entities/onetomany/ListRefIngEntity.java | 2 - .../entities/onetomany/SetRefEdEntity.java | 2 - .../entities/onetomany/SetRefIngEntity.java | 2 - ...stJoinColumnBidirectionalRefEdEntity1.java | 8 +- ...stJoinColumnBidirectionalRefEdEntity2.java | 8 +- ...stJoinColumnBidirectionalRefIngEntity.java | 12 +- .../detached/DoubleSetRefCollEntity.java | 2 - ...istJoinColumnBidirectionalRefEdEntity.java | 9 +- ...stJoinColumnBidirectionalRefIngEntity.java | 16 +- ...irectionalInheritanceRefEdChildEntity.java | 5 +- ...rectionalInheritanceRefEdParentEntity.java | 13 +- ...nBidirectionalInheritanceRefIngEntity.java | 14 +- ...istJoinColumnBidirectionalRefEdEntity.java | 8 +- ...stJoinColumnBidirectionalRefIngEntity.java | 14 +- .../onetomany/detached/ListRefCollEntity.java | 2 - .../detached/SetJoinColumnRefCollEntity.java | 2 - .../onetomany/detached/SetRefCollEntity.java | 2 - .../detached/ids/SetRefCollEntityEmbId.java | 2 - .../detached/ids/SetRefCollEntityMulId.java | 2 - ...stJoinColumnBidirectionalRefIngEntity.java | 4 +- ...stJoinColumnBidirectionalRefIngEntity.java | 16 +- ...istJoinColumnBidirectionalRefEdEntity.java | 9 +- .../onetomany/ids/SetRefEdEmbIdEntity.java | 2 - .../onetomany/ids/SetRefEdMulIdEntity.java | 2 - .../onetomany/ids/SetRefIngEmbIdEntity.java | 2 - .../onetomany/ids/SetRefIngMulIdEntity.java | 2 - .../reventity/CustomDataRevEntity.java | 2 - .../reventity/CustomDateRevEntity.java | 5 +- .../CustomPropertyAccessRevEntity.java | 2 - .../entities/reventity/CustomRevEntity.java | 2 - .../CustomRevEntityColumnMapping.java | 4 +- .../test/integration/accesstype/Country.java | 4 +- .../accesstype/FieldAccessType.java | 5 +- .../accesstype/FieldAccessTypeEntity.java | 2 - .../accesstype/ImmutableClassAccessType.java | 5 +- .../accesstype/MixedAccessType.java | 5 +- .../accesstype/MixedAccessTypeEntity.java | 4 +- .../accesstype/PropertyAccessType.java | 5 +- .../accesstype/PropertyAccessTypeEntity.java | 2 - .../auditReader/AuditReaderAPITest.java | 3 - .../auditReader/AuditedTestEntity.java | 2 - .../auditReader/NotAuditedTestEntity.java | 1 - .../integration/basic/BasicTestEntity1.java | 2 - .../integration/basic/BasicTestEntity2.java | 2 - .../integration/basic/BasicTestEntity3.java | 1 - .../integration/basic/BasicTestEntity4.java | 2 - .../envers/test/integration/basic/Delete.java | 5 +- .../integration/basic/GlobalVersioned.java | 5 +- .../basic/ManyOperationsInTransaction.java | 5 +- .../test/integration/basic/NotVersioned.java | 5 +- .../integration/basic/NullProperties.java | 5 +- .../envers/test/integration/basic/Simple.java | 6 +- .../basic/SingleOperationInTransaction.java | 5 +- .../basic/UnversionedPropertiesChange.java | 5 +- .../basic/UnversionedProperty.java | 5 +- .../integration/cache/OneToManyCache.java | 5 +- .../test/integration/cache/OneToOneCache.java | 5 +- .../test/integration/cache/QueryCache.java | 5 +- .../test/integration/collection/EnumSet.java | 9 +- .../integration/collection/StringList.java | 5 +- .../integration/collection/StringMap.java | 5 +- .../integration/collection/StringSet.java | 5 +- .../collection/mapkey/ComponentMapKey.java | 5 +- .../mapkey/ComponentMapKeyEntity.java | 2 - .../collection/mapkey/IdMapKey.java | 5 +- .../collection/mapkey/IdMapKeyEntity.java | 2 - .../AbstractCollectionChangeTest.java | 6 +- .../CollectionChangeNoRevisionTest.java | 1 - .../CollectionChangeRevisionTest.java | 1 - .../collection/norevision/Name.java | 10 +- .../collection/norevision/Person.java | 13 +- .../integration/components/Components.java | 5 +- .../components/DefaultValueComponents.java | 3 +- .../collections/CollectionOfComponents.java | 5 +- .../relations/ManyToOneInComponent.java | 9 +- .../NotAuditedManyToOneInComponent.java | 9 +- .../relations/OneToManyInComponent.java | 15 +- .../customtype/CompositeCustom.java | 5 +- .../customtype/ParametrizedCustom.java | 5 +- .../test/integration/data/DateTestEntity.java | 2 - .../envers/test/integration/data/Dates.java | 5 +- .../test/integration/data/EnumTestEntity.java | 2 - .../envers/test/integration/data/Enums.java | 5 +- .../test/integration/data/LobTestEntity.java | 2 - .../envers/test/integration/data/Lobs.java | 5 +- .../test/integration/data/SerObject.java | 1 - .../data/SerializableTestEntity.java | 2 - .../test/integration/data/Serializables.java | 5 +- .../entityNames/auditedEntity/Person.java | 5 +- .../ReadEntityWhitEntityNameTest.java | 20 +- .../entityNames/manyToManyAudited/Car.java | 2 - .../entityNames/manyToManyAudited/Person.java | 2 - .../ReadEntityWithAuditedManyToManyTest.java | 22 +- .../entityNames/oneToManyAudited/Car.java | 8 +- .../entityNames/oneToManyAudited/Person.java | 5 +- .../ReadEntityWithAuditedCollectionTest.java | 22 +- .../entityNames/oneToManyNotAudited/Car.java | 10 +- .../oneToManyNotAudited/Person.java | 3 +- .../ReadEntityWithAuditedCollectionTest.java | 22 +- .../singleAssociatedAudited/Car.java | 5 +- .../singleAssociatedAudited/Person.java | 5 +- .../ReadEntityAssociatedAuditedTest.java | 18 +- .../singleAssociatedNotAudited/Car.java | 7 +- .../singleAssociatedNotAudited/Person.java | 3 +- .../ReadEntityAssociatedNotAuditedTest.java | 18 +- .../integration/flush/AbstractFlushTest.java | 9 +- .../integration/flush/DoubleFlushAddDel.java | 5 +- .../integration/flush/DoubleFlushAddMod.java | 11 +- .../integration/flush/DoubleFlushModDel.java | 11 +- .../integration/flush/DoubleFlushModMod.java | 11 +- .../test/integration/flush/ManualFlush.java | 11 +- .../hashcode/ChangingHashcode.java | 5 +- .../test/integration/hashcode/WikiImage.java | 10 +- .../test/integration/hashcode/WikiPage.java | 12 +- .../test/integration/ids/CompositeDateId.java | 8 +- .../test/integration/ids/CompositeIds.java | 13 +- .../envers/test/integration/ids/DateId.java | 14 +- .../ids/ManyToOneIdNotAudited.java | 4 +- .../inheritance/joined/ChildAuditing.java | 5 +- .../inheritance/joined/ChildEntity.java | 2 - .../inheritance/joined/ChildNullAuditing.java | 5 +- .../inheritance/joined/ParentAuditing.java | 5 +- .../inheritance/joined/ParentEntity.java | 2 - .../joined/childrelation/ChildIngEntity.java | 2 - .../childrelation/ChildReferencing.java | 5 +- .../childrelation/ParentNotIngEntity.java | 2 - .../childrelation/ReferencedEntity.java | 2 - .../joined/emptychild/EmptyChildAuditing.java | 5 +- .../joined/emptychild/EmptyChildEntity.java | 2 - .../joined/emptychild/ParentEntity.java | 2 - .../joined/notownedrelation/Address.java | 5 +- .../joined/notownedrelation/Contact.java | 3 - .../NotOwnedBidirectional.java | 5 +- .../notownedrelation/PersonalContact.java | 2 - .../ChildPrimaryKeyJoinAuditing.java | 9 +- .../ChildPrimaryKeyJoinEntity.java | 2 - .../joined/relation/ChildIngEntity.java | 2 - .../joined/relation/ParentIngEntity.java | 2 - .../relation/PolymorphicCollection.java | 5 +- .../joined/relation/ReferencedEntity.java | 2 - .../AbstractContainedEntity.java | 4 +- .../unidirectional/AbstractSetEntity.java | 9 +- .../unidirectional/ContainedEntity.java | 2 - .../relation/unidirectional/SetEntity.java | 2 - .../UnidirectionalDoubleAbstract.java | 10 +- .../inheritance/single/ChildAuditing.java | 5 +- .../inheritance/single/ChildEntity.java | 2 - .../inheritance/single/ParentAuditing.java | 5 +- .../inheritance/single/ParentEntity.java | 2 - .../single/childrelation/ChildIngEntity.java | 2 - .../childrelation/ChildReferencing.java | 5 +- .../childrelation/ParentNotIngEntity.java | 2 - .../childrelation/ReferencedEntity.java | 2 - .../single/notownedrelation/Address.java | 5 +- .../single/notownedrelation/Contact.java | 3 - .../NotOwnedBidirectional.java | 5 +- .../notownedrelation/PersonalContact.java | 2 - .../single/relation/ChildIngEntity.java | 2 - .../single/relation/ParentIngEntity.java | 2 - .../relation/PolymorphicCollection.java | 5 +- .../single/relation/ReferencedEntity.java | 2 - .../tableperclass/ChildAuditing.java | 5 +- .../tableperclass/ChildEntity.java | 2 - .../tableperclass/ParentAuditing.java | 5 +- .../tableperclass/ParentEntity.java | 3 - .../childrelation/ChildIngEntity.java | 2 - .../childrelation/ChildReferencing.java | 5 +- .../childrelation/ParentNotIngEntity.java | 2 - .../childrelation/ReferencedEntity.java | 2 - .../notownedrelation/Address.java | 5 +- .../notownedrelation/Contact.java | 3 - .../NotOwnedBidirectional.java | 5 +- .../notownedrelation/PersonalContact.java | 2 - .../relation/ChildIngEntity.java | 2 - .../relation/ParentIngEntity.java | 2 - .../relation/PolymorphicCollection.java | 5 +- .../relation/ReferencedEntity.java | 2 - .../interfaces/components/Component1.java | 1 - .../components/ComponentTestEntity.java | 4 +- .../interfaces/components/IComponent.java | 1 + .../components/InterfacesComponents.java | 5 +- .../allAudited/AbstractAllAuditedTest.java | 7 +- .../hbm/allAudited/AuditedImplementor.java | 1 - .../hbm/allAudited/NonAuditedImplementor.java | 1 + .../hbm/allAudited/SimpleInterface.java | 1 - .../joined/JoinedAllAuditedTest.java | 2 - .../subclass/SubclassAllAuditedTest.java | 2 - .../allAudited/union/UnionAllAuditedTest.java | 2 - .../AbstractPropertiesAuditedTest.java | 2 - .../propertiesAudited/AuditedImplementor.java | 1 - .../NonAuditedImplementor.java | 1 + .../propertiesAudited/SimpleInterface.java | 1 - .../joined/JoinedPropertiesAuditedTest.java | 2 - .../SubclassPropertiesAuditedTest.java | 2 - .../union/UnionPropertiesAuditedTest.java | 2 - .../AbstractPropertiesAudited2Test.java | 2 - .../AuditedImplementor.java | 1 - .../NonAuditedImplementor.java | 1 + .../propertiesAudited2/SimpleInterface.java | 1 - .../joined/JoinedPropertiesAudited2Test.java | 2 - .../SubclassPropertiesAudited2Test.java | 2 - .../union/UnionPropertiesAudited2Test.java | 2 - .../interfaces/relation/ISetRefEdEntity.java | 1 + .../relation/InterfacesRelation.java | 5 +- .../interfaces/relation/SetRefEdEntity.java | 2 - .../interfaces/relation/SetRefIngEntity.java | 2 - .../integration/jta/JtaExceptionListener.java | 4 +- .../test/integration/jta/JtaTransaction.java | 6 +- .../integration/manytomany/BasicList.java | 5 +- .../test/integration/manytomany/BasicMap.java | 5 +- .../test/integration/manytomany/BasicSet.java | 5 +- .../manytomany/BasicWhereJoinTable.java | 8 +- .../manytomany/biowned/BasicBiowned.java | 10 +- .../inverseToSuperclass/DetailSubclass.java | 5 - .../inverseToSuperclass/DetailSubclass2.java | 5 - .../inverseToSuperclass/DetailSuperclass.java | 6 - .../ManyToManyInverseToSuperclassTest.java | 3 - .../inverseToSuperclass/Master.java | 6 - .../manytomany/sametable/BasicSametable.java | 9 +- .../manytomany/ternary/TernaryMap.java | 5 +- .../manytomany/ternary/TernaryMapEntity.java | 5 +- .../manytomany/ternary/TernaryMapFlush.java | 10 +- .../unidirectional/BasicUniList.java | 5 +- .../unidirectional/BasicUniMap.java | 5 +- .../unidirectional/BasicUniSet.java | 5 +- .../M2MIndexedListNotAuditedTarget.java | 16 +- .../M2MRelationNotAuditedTarget.java | 10 +- .../RelationNotAuditedTarget.java | 7 +- .../test/integration/naming/BasicNaming.java | 5 +- .../naming/DetachedNamingTestEntity.java | 2 - .../test/integration/naming/JoinNaming.java | 7 +- .../naming/JoinNamingRefEdEntity.java | 2 - .../naming/JoinNamingRefIngEntity.java | 2 - .../integration/naming/NamingTestEntity1.java | 4 +- .../naming/OneToManyUnidirectionalNaming.java | 7 +- .../naming/VersionsJoinTableNaming.java | 7 +- .../VersionsJoinTableRangeComponent.java | 3 - ...ionsJoinTableRangeComponentNamingTest.java | 3 - ...ionsJoinTableRangeComponentTestEntity.java | 4 +- ...ionsJoinTableRangeTestAlternateEntity.java | 1 - .../VersionsJoinTableRangeTestEntity.java | 1 - ...onsJoinTableRangeTestEntitySuperClass.java | 1 - .../naming/VersionsJoinTableTestEntity.java | 4 +- .../integration/naming/ids/EmbIdNaming.java | 1 - .../naming/ids/JoinEmbIdNaming.java | 7 +- .../ids/JoinEmbIdNamingRefEdEntity.java | 2 - .../ids/JoinEmbIdNamingRefIngEntity.java | 2 - .../naming/ids/JoinMulIdNaming.java | 7 +- .../ids/JoinMulIdNamingRefEdEntity.java | 2 - .../ids/JoinMulIdNamingRefIngEntity.java | 2 - .../integration/naming/ids/MulIdNaming.java | 1 - .../notinsertable/NotInsertable.java | 5 +- .../NotInsertableTestEntity.java | 2 - .../manytoone/ManyToOneNotInsertable.java | 4 +- .../ManyToOneNotInsertableEntity.java | 9 +- .../manytoone/NotInsertableEntityType.java | 6 +- .../onetomany/BasicCollection.java | 5 +- .../test/integration/onetomany/BasicList.java | 5 +- .../test/integration/onetomany/BasicSet.java | 5 +- .../onetomany/BasicSetWithEmbId.java | 5 +- .../onetomany/BasicSetWithMulId.java | 5 +- .../onetomany/BasicSetWithNullsDelete.java | 5 +- .../onetomany/BidirectionalMapKey.java | 5 +- .../onetomany/InverseSideChanges.java | 6 +- .../onetomany/RefEdMapKeyEntity.java | 2 - .../onetomany/RefIngMapKeyEntity.java | 2 - .../onetomany/detached/BasicDetachedList.java | 5 +- .../onetomany/detached/BasicDetachedSet.java | 5 +- .../detached/BasicDetachedSetWithEmbId.java | 5 +- .../detached/BasicDetachedSetWithMulId.java | 5 +- .../detached/BasicJoinColumnSet.java | 5 +- .../detached/DataChangesDetachedSet.java | 5 +- .../onetomany/detached/DoubleDetachedSet.java | 5 +- .../DoubleJoinColumnBidirectionalList.java | 12 +- .../IndexedJoinColumnBidirectionalList.java | 14 +- ...nceIndexedJoinColumnBidirectionalList.java | 11 +- .../detached/JoinColumnBidirectionalList.java | 12 +- ...olumnBidirectionalListWithInheritance.java | 12 +- .../inverseToSuperclass/DetailSubclass.java | 5 - .../inverseToSuperclass/DetailSubclass2.java | 5 - .../inverseToSuperclass/DetailSuperclass.java | 5 - .../onetomany/inverseToSuperclass/Master.java | 6 - .../OneToManyInverseToSuperclassTest.java | 3 - .../onetoone/bidirectional/BiRefEdEntity.java | 2 - .../bidirectional/BiRefIngEntity.java | 2 - .../onetoone/bidirectional/Bidirectional.java | 5 +- .../bidirectional/Bidirectional2.java | 5 +- .../bidirectional/BidirectionalNoNulls.java | 5 +- .../bidirectional/ids/BiEmbIdRefEdEntity.java | 2 - .../ids/BiEmbIdRefIngEntity.java | 2 - .../bidirectional/ids/BiMulIdRefEdEntity.java | 2 - .../ids/BiMulIdRefIngEntity.java | 2 - .../bidirectional/ids/EmbIdBidirectional.java | 5 +- .../bidirectional/ids/MulIdBidirectional.java | 5 +- .../unidirectional/UniRefEdEntity.java | 2 - .../unidirectional/UniRefIngEntity.java | 2 - .../unidirectional/Unidirectional.java | 5 +- .../UnidirectionalWithNulls.java | 5 +- .../primitive/PrimitiveAddDelete.java | 5 +- .../properties/PropertiesTestEntity.java | 2 - .../UnversionedOptimisticLockingField.java | 9 +- ...versionedOptimisticLockingFieldEntity.java | 2 - .../properties/VersionsProperties.java | 5 +- .../proxy/AuditedCollectionProxyTest.java | 2 - .../integration/proxy/ProxyIdentifier.java | 7 +- .../integration/query/AggregateQuery.java | 7 +- .../query/CustomRevEntityQuery.java | 5 +- .../integration/query/DeletedEntities.java | 5 +- .../query/MaximalizePropertyQuery.java | 5 +- .../integration/query/OrderByLimitQuery.java | 7 +- .../query/RevisionConstraintQuery.java | 7 +- .../test/integration/query/SimpleQuery.java | 5 +- .../integration/query/StoreDeletedData.java | 6 +- .../query/ids/EmbIdOneToManyQuery.java | 5 +- .../query/ids/MulIdOneToManyQuery.java | 5 +- .../reference/BidirectionalReference.java | 6 +- .../integration/reference/GreetingPO.java | 2 - .../integration/reference/GreetingSetPO.java | 3 - .../test/integration/reventity/Custom.java | 3 - .../integration/reventity/CustomBoxed.java | 3 - .../reventity/CustomBoxedRevEntity.java | 2 - .../reventity/CustomColumnMapping.java | 5 +- .../integration/reventity/CustomDate.java | 5 +- .../reventity/CustomNoListener.java | 7 +- .../reventity/CustomPropertyAccess.java | 5 +- .../reventity/ExceptionListener.java | 5 +- .../reventity/ExceptionListenerRevEntity.java | 2 - .../test/integration/reventity/Inherited.java | 3 - .../reventity/InheritedRevEntity.java | 2 - .../test/integration/reventity/Listener.java | 3 - .../reventity/ListenerRevEntity.java | 2 - ...LongRevEntityInheritanceChildAuditing.java | 6 +- .../integration/reventity/LongRevNumber.java | 3 - .../reventity/LongRevNumberRevEntity.java | 4 +- .../TestExceptionRevisionListener.java | 1 - .../reventity/TestRevisionListener.java | 1 - .../revfordate/RevisionForDate.java | 5 +- .../sameids/SameIdTestEntity1.java | 2 - .../sameids/SameIdTestEntity2.java | 2 - .../test/integration/sameids/SameIds.java | 5 +- .../integration/secondary/BasicSecondary.java | 7 +- .../secondary/NamingSecondary.java | 7 +- .../secondary/SecondaryNamingTestEntity.java | 4 +- .../secondary/SecondaryTestEntity.java | 2 - .../secondary/ids/EmbIdSecondary.java | 7 +- .../secondary/ids/MulIdSecondary.java | 7 +- .../ids/SecondaryEmbIdTestEntity.java | 4 +- .../ids/SecondaryMulIdTestEntity.java | 4 +- .../serialization/SerializingCollection.java | 14 +- ...tyAuditStrategyRevEndTestCustomRevEnt.java | 3 - .../ValidityAuditStrategyRevEndTsTest.java | 3 - .../AuditedMethodMappedSuperclass.java | 2 - .../NotAuditedSubclassEntity.java | 1 - .../AuditedAllSubclassEntity.java | 2 - .../MappedSubclassingAllAuditedTest.java | 3 - .../AuditedMethodSubclassEntity.java | 2 - .../MappedSubclassingMethodAuditedTest.java | 3 - .../AuditedAllMappedSuperclass.java | 2 - .../NotAuditedSubclassEntity.java | 1 - .../AuditedAllSubclassEntity.java | 2 - .../MappedSubclassingAllAuditedTest.java | 3 - .../AuditedMethodSubclassEntity.java | 2 - .../MappedSubclassingMethodAuditedTest.java | 3 - .../performance/AbstractPerformanceTest.java | 6 +- .../test/performance/AllPerformance.java | 1 - .../performance/ComplexInsertPerformance.java | 9 +- .../InsertsOneTransactionPerformance.java | 5 +- .../test/performance/InsertsPerformance.java | 5 +- .../test/performance/UpdatesPerformance.java | 4 +- .../performance/complex/ChildEntity1.java | 6 +- .../performance/complex/ChildEntity2.java | 8 +- .../test/performance/complex/RootEntity.java | 11 +- .../envers/test/tools/TestTools.java | 1 - .../envers/test/various/Address.java | 2 - .../envers/test/various/HsqlTest.java | 2 - .../hibernate/envers/test/various/Person.java | 2 - .../infinispan/InfinispanRegionFactory.java | 6 +- .../JndiInfinispanRegionFactory.java | 5 +- .../cache/infinispan/TypeOverrides.java | 2 - .../access/PutFromLoadValidator.java | 3 - .../access/TransactionalAccessDelegate.java | 2 - .../collection/CollectionRegionImpl.java | 2 - .../infinispan/collection/ReadOnlyAccess.java | 1 - .../collection/TransactionalAccess.java | 1 - .../infinispan/entity/EntityRegionImpl.java | 2 - .../infinispan/entity/ReadOnlyAccess.java | 1 - .../entity/TransactionalAccess.java | 1 - .../impl/BaseGeneralDataRegion.java | 2 - .../cache/infinispan/impl/BaseRegion.java | 3 - .../impl/BaseTransactionalDataRegion.java | 2 - .../impl/ClassLoaderAwareCache.java | 2 - .../query/QueryResultsRegionImpl.java | 3 - .../timestamp/TimestampTypeOverrides.java | 1 - .../timestamp/TimestampsRegionImpl.java | 3 - .../tm/HibernateTransactionManagerLookup.java | 3 - .../cache/infinispan/util/AddressAdapter.java | 1 + .../infinispan/util/AddressAdapterImpl.java | 2 - .../cache/infinispan/util/CacheAdapter.java | 2 - .../infinispan/util/CacheAdapterImpl.java | 2 - .../cache/infinispan/util/CacheHelper.java | 2 - .../cache/infinispan/util/FlagAdapter.java | 1 - ...bstractEntityCollectionRegionTestCase.java | 2 - .../AbstractGeneralDataRegionTestCase.java | 4 +- .../AbstractNonFunctionalTestCase.java | 4 +- .../AbstractRegionImplTestCase.java | 2 - .../InfinispanRegionFactoryTestCase.java | 5 +- .../JndiInfinispanRegionFactoryTestCase.java | 4 +- .../infinispan/TestInfinispanLogger.java | 21 - .../PutFromLoadValidatorUnitTestCase.java | 6 +- ...ollectionRegionAccessStrategyTestCase.java | 5 +- .../AbstractReadOnlyAccessTestCase.java | 1 - .../AbstractTransactionalAccessTestCase.java | 1 - .../CollectionRegionImplTestCase.java | 2 - .../InvalidatedTransactionalTestCase.java | 4 +- .../collection/ReadOnlyExtraAPITestCase.java | 1 - .../collection/ReadOnlyTestCase.java | 4 +- .../TransactionalExtraAPITestCase.java | 1 - ...actEntityRegionAccessStrategyTestCase.java | 5 +- .../AbstractReadOnlyAccessTestCase.java | 1 - .../AbstractTransactionalAccessTestCase.java | 5 +- .../entity/EntityRegionImplTestCase.java | 2 - .../InvalidatedTransactionalTestCase.java | 4 +- .../entity/ReadOnlyExtraAPITestCase.java | 1 - .../infinispan/entity/ReadOnlyTestCase.java | 4 +- .../entity/TransactionalExtraAPITestCase.java | 1 - .../BasicJdbcTransactionalTestCase.java | 2 - .../functional/BasicReadOnlyTestCase.java | 4 +- .../BasicTransactionalTestCase.java | 2 - .../functional/ConcurrentWriteTest.java | 5 +- .../cache/infinispan/functional/Contact.java | 3 +- .../cache/infinispan/functional/Customer.java | 3 +- .../cache/infinispan/functional/Item.java | 1 - .../functional/JndiRegionFactoryTestCase.java | 18 +- .../functional/SingleNodeTestCase.java | 4 - .../infinispan/functional/VersionedItem.java | 1 + .../bulk/BulkOperationsTestCase.java | 5 +- .../functional/classloader/Account.java | 3 +- .../functional/classloader/AccountHolder.java | 3 +- .../classloader/CacheAccessListener.java | 3 +- .../classloader/ClassLoaderTestDAO.java | 5 +- .../classloader/IsolatedCacheTestSetup.java | 4 +- .../classloader/IsolatedClassLoaderTest.java | 5 +- .../SelectedClassnameClassLoader.java | 3 +- ...SelectedClassnameClassLoaderTestSetup.java | 1 - .../cluster/ClusterAwareRegionFactory.java | 3 - .../DualNodeConnectionProviderImpl.java | 3 - .../cluster/DualNodeJtaTransactionImpl.java | 3 - .../DualNodeJtaTransactionManagerImpl.java | 3 - .../functional/cluster/DualNodeTestCase.java | 2 - .../DualNodeTransactionManagerLookup.java | 6 +- .../EntityCollectionInvalidationTestCase.java | 5 +- .../cluster/RepeatableSessionRefreshTest.java | 1 + .../cluster/SessionRefreshTestCase.java | 5 +- .../query/QueryRegionImplTestCase.java | 5 +- .../TimestampsRegionImplTestCase.java | 6 - .../tm/JBossStandaloneJtaExampleTest.java | 29 +- .../infinispan/tm/XaConnectionProvider.java | 2 - .../infinispan/tm/XaTransactionImpl.java | 3 - .../tm/XaTransactionManagerImpl.java | 1 - .../tm/XaTransactionManagerLookup.java | 3 - .../BatchModeTransactionManagerLookup.java | 5 +- .../infinispan/util/CacheTestSupport.java | 3 +- .../cache/infinispan/util/CacheTestUtil.java | 5 - .../java/org/hibernate/cache/OSCache.java | 2 - .../org/hibernate/cache/OSCacheProvider.java | 3 - .../internal/ProxoolConnectionProvider.java | 5 +- .../connections/internal/ProxoolLogger.java | 34 +- .../ProxoolConnectionProviderTest.java | 5 +- .../java/org/hibernate/cache/SwarmCache.java | 4 +- .../hibernate/cache/SwarmCacheProvider.java | 4 +- 4820 files changed, 6436 insertions(+), 14368 deletions(-) delete mode 100644 hibernate-core/src/main/java/org/hibernate/Logger.java delete mode 100644 hibernate-entitymanager/src/test/java/org/hibernate/ejb/TestEntityManagerLogger.java delete mode 100644 hibernate-envers/src/test/java/org/hibernate/envers/TestEnversLogger.java delete mode 100644 hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/TestInfinispanLogger.java diff --git a/build.gradle b/build.gradle index c3ed562a58..d4eea059f4 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ libraries = [ // logging logging: 'org.jboss.logging:jboss-logging:3.0.0.Beta4', - // logging_tools: 'org.jboss.logging:jboss-logging-tools:1.0.0.Beta2', + logging_tools: 'org.jboss.logging:jboss-logging-tools:1.0.0.Beta3', slf4j_api: 'org.slf4j:slf4j-api:' + slf4jVersion, slf4j_simple: 'org.slf4j:slf4j-simple:' + slf4jVersion, jcl_slf4j: 'org.slf4j:jcl-over-slf4j:' + slf4jVersion, @@ -107,7 +107,7 @@ subprojects { subProject -> // appropriately inject the common dependencies into each sub-project dependencies { - compile(libraries.logging) + // compile(libraries.logging) // compile(libraries.logging_tools) compile( libraries.slf4j_api ) testCompile( libraries.junit ) diff --git a/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java b/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java index ed62de1989..ddd89d2725 100644 --- a/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java +++ b/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.service.jdbc.connections.internal; - import java.sql.Connection; import java.sql.SQLException; import java.util.Iterator; @@ -33,6 +32,7 @@ import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; import com.mchange.v2.c3p0.DataSources; /** @@ -44,7 +44,7 @@ */ public class C3P0ConnectionProvider implements ConnectionProvider { - private static final C3P0Logger LOG = org.jboss.logging.Logger.getMessageLogger(C3P0Logger.class, C3P0Logger.class.getPackage().getName()); + private static final C3P0Logger LOG = Logger.getMessageLogger(C3P0Logger.class, C3P0ConnectionProvider.class.getName()); //swaldman 2006-08-28: define c3p0-style configuration parameters for properties with // hibernate-specific overrides to detect and warn about conflicting @@ -196,7 +196,7 @@ public void close() { DataSources.destroy( ds ); } catch ( SQLException sqle ) { - LOG.warn(LOG.unableToDestroyC3p0ConnectionPool(), sqle); + LOG.unableToDestroyC3p0ConnectionPool(sqle); } } diff --git a/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0Logger.java b/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0Logger.java index b611be4791..aede761c97 100644 --- a/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0Logger.java +++ b/hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0Logger.java @@ -9,53 +9,55 @@ import static org.jboss.logging.Logger.Level.INFO; import static org.jboss.logging.Logger.Level.WARN; +import java.sql.SQLException; import java.util.Properties; -import org.jboss.logging.BasicLogger; +import org.hibernate.HibernateLogger; +import org.jboss.logging.Cause; import org.jboss.logging.LogMessage; import org.jboss.logging.Message; -import org.jboss.logging.MessageLogger; /** - * Interface defining messages that may be logged by the outer class + * Defines internationalized messages for this hibernate-c3p0, with IDs ranging from 10001 to 15000 inclusively. New messages must + * be added after the last message defined to ensure message codes are unique. */ -@MessageLogger -public interface C3P0Logger extends BasicLogger { +public interface C3P0Logger extends HibernateLogger { @LogMessage( level = INFO ) - @Message( value = "Autocommit mode: %s" ) + @Message( value = "Autocommit mode: %s", id = 10001 ) void autoCommitMode( boolean autocommit ); @LogMessage( level = WARN ) @Message( value = "Both hibernate-style property '%s' and c3p0-style property '%s' have been set in hibernate.properties. " - + "Hibernate-style property '%s' will be used and c3p0-style property '%s' will be ignored!" ) + + "Hibernate-style property '%s' will be used and c3p0-style property '%s' will be ignored!", id = 10002 ) void bothHibernateAndC3p0StylesSet( String hibernateStyle, String c3p0Style, String hibernateStyle2, String c3p0Style2 ); @LogMessage( level = INFO ) - @Message( value = "C3P0 using driver: %s at URL: %s" ) + @Message( value = "C3P0 using driver: %s at URL: %s", id = 10003 ) void c3p0UsingDriver( String jdbcDriverClass, String jdbcUrl ); @LogMessage( level = INFO ) - @Message( value = "Connection properties: %s" ) + @Message( value = "Connection properties: %s", id = 10004 ) void connectionProperties( Properties maskOut ); - @Message( value = "JDBC Driver class not found: %s" ) + @Message( value = "JDBC Driver class not found: %s", id = 10005 ) String jdbcDriverNotFound( String jdbcDriverClass ); @LogMessage( level = WARN ) - @Message( value = "No JDBC Driver class was specified by property %s" ) + @Message( value = "No JDBC Driver class was specified by property %s", id = 10006 ) void jdbcDriverNotSpecified( String driver ); @LogMessage( level = INFO ) - @Message( value = "JDBC isolation level: %s" ) + @Message( value = "JDBC isolation level: %s", id = 10007 ) void jdbcIsolationLevel( String isolationLevelToString ); - @Message( value = "Could not destroy C3P0 connection pool" ) - Object unableToDestroyC3p0ConnectionPool(); + @LogMessage( level = WARN ) + @Message( value = "Could not destroy C3P0 connection pool", id = 10008 ) + void unableToDestroyC3p0ConnectionPool( @Cause SQLException e ); - @Message( value = "Could not instantiate C3P0 connection pool" ) + @Message( value = "Could not instantiate C3P0 connection pool", id = 10009 ) String unableToInstantiateC3p0ConnectionPool(); } diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index ab006a8b17..4eaf9fa505 100644 --- a/hibernate-core/hibernate-core.gradle +++ b/hibernate-core/hibernate-core.gradle @@ -4,7 +4,8 @@ apply plugin: 'antlr' // todo : we need to jar up hibernate-testing.jar from here dependencies { - compile( libraries.commons_collections ) + compile fileTree(dir: 'lib', includes: ['*.jar']) + compile( libraries.commons_collections ) compile( libraries.jta ) compile( libraries.dom4j ) { transitive = false diff --git a/hibernate-core/src/main/antlr/hql-sql.g b/hibernate-core/src/main/antlr/hql-sql.g index 92cf78b4ae..23e23b10e6 100644 --- a/hibernate-core/src/main/antlr/hql-sql.g +++ b/hibernate-core/src/main/antlr/hql-sql.g @@ -3,8 +3,8 @@ header // $Id: hql-sql.g 10001 2006-06-08 21:08:04Z steve.ebersole@jboss.com $ package org.hibernate.hql.antlr; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.hibernate.HibernateLogger; +import org.jboss.logging.Logger; } /** @@ -56,7 +56,7 @@ tokens // -- Declarations -- { - private static Logger log = LoggerFactory.getLogger( HqlSqlBaseWalker.class ); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, HqlSqlBaseWalker.class.getName()); private int level = 0; private boolean inSelect = false; @@ -129,21 +129,15 @@ tokens this.statementType = statementType; } currentStatementType = statementType; - if ( log.isDebugEnabled() ) { - log.debug( statementName + " << begin [level=" + level + ", statement=" + this.statementTypeName + "]" ); - } + LOG.debugf("%s << begin [level=%s, statement=%s]", statementName, level, this.statementTypeName); } private void beforeStatementCompletion(String statementName) { - if ( log.isDebugEnabled() ) { - log.debug( statementName + " : finishing up [level=" + level + ", statement=" + statementTypeName + "]" ); - } + LOG.debugf("%s : finishing up [level=%s, statement=%s]", statementName, level, this.statementTypeName); } private void afterStatementCompletion(String statementName) { - if ( log.isDebugEnabled() ) { - log.debug( statementName + " >> end [level=" + level + ", statement=" + statementTypeName + "]" ); - } + LOG.debugf("%s >> end [level=%s, statement=%s]", statementName, level, this.statementTypeName); level--; } diff --git a/hibernate-core/src/main/antlr/sql-gen.g b/hibernate-core/src/main/antlr/sql-gen.g index 19be42df84..8def60e6b5 100644 --- a/hibernate-core/src/main/antlr/sql-gen.g +++ b/hibernate-core/src/main/antlr/sql-gen.g @@ -3,9 +3,6 @@ header // $Id: sql-gen.g 10001 2006-06-08 21:08:04Z steve.ebersole@jboss.com $ package org.hibernate.hql.antlr; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - } /** * SQL Generator Tree Parser, providing SQL rendering of SQL ASTs produced by the previous phase, HqlSqlWalker. All @@ -28,7 +25,6 @@ options { } { - private static Logger log = LoggerFactory.getLogger(SqlGeneratorBase.class); /** the buffer resulting SQL statement is written to */ private StringBuffer buf = new StringBuffer(); diff --git a/hibernate-core/src/main/java/org/hibernate/AnnotationException.java b/hibernate-core/src/main/java/org/hibernate/AnnotationException.java index 876ee7cce1..d371dc58ca 100644 --- a/hibernate-core/src/main/java/org/hibernate/AnnotationException.java +++ b/hibernate-core/src/main/java/org/hibernate/AnnotationException.java @@ -23,6 +23,7 @@ */ package org.hibernate; + /** * Annotation related exception. * The EJB3 EG will probably set a generic exception. diff --git a/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java b/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java index 30a1c7044b..931c524709 100644 --- a/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java +++ b/hibernate-core/src/main/java/org/hibernate/AssertionFailure.java @@ -23,6 +23,7 @@ * */ package org.hibernate; +import org.jboss.logging.Logger; /** * Indicates failure of an assertion: a possible bug in Hibernate. @@ -33,7 +34,7 @@ public class AssertionFailure extends RuntimeException { private static final long serialVersionUID = 1L; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, AssertionFailure.class.getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, AssertionFailure.class.getName()); public AssertionFailure( String s ) { super(s); diff --git a/hibernate-core/src/main/java/org/hibernate/Cache.java b/hibernate-core/src/main/java/org/hibernate/Cache.java index e3f952c4f6..4f0d5eb3d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/Cache.java +++ b/hibernate-core/src/main/java/org/hibernate/Cache.java @@ -20,7 +20,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/CacheMode.java b/hibernate-core/src/main/java/org/hibernate/CacheMode.java index 3431e638bd..488e927299 100755 --- a/hibernate-core/src/main/java/org/hibernate/CacheMode.java +++ b/hibernate-core/src/main/java/org/hibernate/CacheMode.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/main/java/org/hibernate/CallbackException.java b/hibernate-core/src/main/java/org/hibernate/CallbackException.java index 49195eafa9..c28a401f56 100644 --- a/hibernate-core/src/main/java/org/hibernate/CallbackException.java +++ b/hibernate-core/src/main/java/org/hibernate/CallbackException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Should be thrown by persistent objects from Lifecycle * or Interceptor callbacks. diff --git a/hibernate-core/src/main/java/org/hibernate/ConnectionReleaseMode.java b/hibernate-core/src/main/java/org/hibernate/ConnectionReleaseMode.java index bce150d5d4..5d19a0a6aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/ConnectionReleaseMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ConnectionReleaseMode.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/Criteria.java b/hibernate-core/src/main/java/org/hibernate/Criteria.java index 3aae6a5cfc..c7e234e5fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/Criteria.java +++ b/hibernate-core/src/main/java/org/hibernate/Criteria.java @@ -23,9 +23,7 @@ * */ package org.hibernate; - import java.util.List; - import org.hibernate.criterion.CriteriaSpecification; import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Order; diff --git a/hibernate-core/src/main/java/org/hibernate/DuplicateMappingException.java b/hibernate-core/src/main/java/org/hibernate/DuplicateMappingException.java index 29f78f945c..d0200ea6a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/DuplicateMappingException.java +++ b/hibernate-core/src/main/java/org/hibernate/DuplicateMappingException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Raised whenever a duplicate for a certain type occurs. * Duplicate class, table, property name etc. diff --git a/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java b/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java index 80f9995e92..93a6089c48 100755 --- a/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java +++ b/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java @@ -23,10 +23,8 @@ * */ package org.hibernate; - import java.io.Serializable; import java.util.Iterator; - import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/EntityMode.java b/hibernate-core/src/main/java/org/hibernate/EntityMode.java index 93700ad6cd..a25e65bf29 100644 --- a/hibernate-core/src/main/java/org/hibernate/EntityMode.java +++ b/hibernate-core/src/main/java/org/hibernate/EntityMode.java @@ -23,10 +23,9 @@ * */ package org.hibernate; - -import java.util.Map; -import java.util.HashMap; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; /** * Defines the representation modes available for entities. diff --git a/hibernate-core/src/main/java/org/hibernate/EntityNameResolver.java b/hibernate-core/src/main/java/org/hibernate/EntityNameResolver.java index 8f9a94b3a9..d43cf2daff 100644 --- a/hibernate-core/src/main/java/org/hibernate/EntityNameResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/EntityNameResolver.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Contract for resolving an entity-name from a given entity instance. * diff --git a/hibernate-core/src/main/java/org/hibernate/FetchMode.java b/hibernate-core/src/main/java/org/hibernate/FetchMode.java index 365aeb484e..a528438df5 100644 --- a/hibernate-core/src/main/java/org/hibernate/FetchMode.java +++ b/hibernate-core/src/main/java/org/hibernate/FetchMode.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/main/java/org/hibernate/Filter.java b/hibernate-core/src/main/java/org/hibernate/Filter.java index 74466d1456..17b51889db 100644 --- a/hibernate-core/src/main/java/org/hibernate/Filter.java +++ b/hibernate-core/src/main/java/org/hibernate/Filter.java @@ -23,10 +23,8 @@ * */ package org.hibernate; - -import org.hibernate.engine.FilterDefinition; - import java.util.Collection; +import org.hibernate.engine.FilterDefinition; /** * Type definition of Filter. Filter defines the user's view into enabled dynamic filters, diff --git a/hibernate-core/src/main/java/org/hibernate/FlushMode.java b/hibernate-core/src/main/java/org/hibernate/FlushMode.java index 1f1248fca1..7ba069cbd0 100644 --- a/hibernate-core/src/main/java/org/hibernate/FlushMode.java +++ b/hibernate-core/src/main/java/org/hibernate/FlushMode.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/main/java/org/hibernate/Hibernate.java b/hibernate-core/src/main/java/org/hibernate/Hibernate.java index a9fde91cf5..87591f8076 100644 --- a/hibernate-core/src/main/java/org/hibernate/Hibernate.java +++ b/hibernate-core/src/main/java/org/hibernate/Hibernate.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate; - import java.util.Iterator; import java.util.Properties; - import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.HibernateIterator; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/HibernateException.java b/hibernate-core/src/main/java/org/hibernate/HibernateException.java index 4699d28dc7..ed540255d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/HibernateException.java +++ b/hibernate-core/src/main/java/org/hibernate/HibernateException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * The base {@link Throwable} type for Hibernate. *

diff --git a/hibernate-core/src/main/java/org/hibernate/InstantiationException.java b/hibernate-core/src/main/java/org/hibernate/InstantiationException.java index 2b9cbb4b23..9a1c668964 100644 --- a/hibernate-core/src/main/java/org/hibernate/InstantiationException.java +++ b/hibernate-core/src/main/java/org/hibernate/InstantiationException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Thrown if Hibernate can't instantiate an entity or component * class at runtime. diff --git a/hibernate-core/src/main/java/org/hibernate/Interceptor.java b/hibernate-core/src/main/java/org/hibernate/Interceptor.java index 359114b331..94532f9189 100644 --- a/hibernate-core/src/main/java/org/hibernate/Interceptor.java +++ b/hibernate-core/src/main/java/org/hibernate/Interceptor.java @@ -23,10 +23,8 @@ * */ package org.hibernate; - import java.io.Serializable; import java.util.Iterator; - 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 005bdddbd2..3ca9e5d661 100644 --- a/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java +++ b/hibernate-core/src/main/java/org/hibernate/InvalidMappingException.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate; +package org.hibernate; + /** * Thrown when a mapping is found to be invalid. diff --git a/hibernate-core/src/main/java/org/hibernate/JDBCException.java b/hibernate-core/src/main/java/org/hibernate/JDBCException.java index 03c0bbd894..c02305e29e 100644 --- a/hibernate-core/src/main/java/org/hibernate/JDBCException.java +++ b/hibernate-core/src/main/java/org/hibernate/JDBCException.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.sql.SQLException; diff --git a/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java b/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java index 28a53c2737..5238066dfd 100644 --- a/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java +++ b/hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java @@ -23,12 +23,11 @@ * */ package org.hibernate; - -import org.slf4j.LoggerFactory; +import org.jboss.logging.Logger; /** * Indicates access to unfetched data outside of a session context. - * For example, when an uninitialized proxy or collection is accessed + * For example, when an uninitialized proxy or collection is accessed * after the session was closed. * * @see Hibernate#initialize(java.lang.Object) @@ -37,9 +36,12 @@ */ public class LazyInitializationException extends HibernateException { + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + LazyInitializationException.class.getName()); + public LazyInitializationException(String msg) { super(msg); - LoggerFactory.getLogger( LazyInitializationException.class ).error( msg, this ); + LOG.error(msg, this); } } diff --git a/hibernate-core/src/main/java/org/hibernate/LobHelper.java b/hibernate-core/src/main/java/org/hibernate/LobHelper.java index 3bcac1342d..2264230d76 100644 --- a/hibernate-core/src/main/java/org/hibernate/LobHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/LobHelper.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate; - import java.io.InputStream; import java.io.Reader; import java.sql.Blob; diff --git a/hibernate-core/src/main/java/org/hibernate/LockMode.java b/hibernate-core/src/main/java/org/hibernate/LockMode.java index 1d27f3dea2..aa5b15ee4b 100644 --- a/hibernate-core/src/main/java/org/hibernate/LockMode.java +++ b/hibernate-core/src/main/java/org/hibernate/LockMode.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/main/java/org/hibernate/LockOptions.java b/hibernate-core/src/main/java/org/hibernate/LockOptions.java index ccebb87874..a7daeb1aa7 100644 --- a/hibernate-core/src/main/java/org/hibernate/LockOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/LockOptions.java @@ -23,11 +23,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate; - import java.io.Serializable; import java.util.HashMap; -import java.util.Map; import java.util.Iterator; +import java.util.Map; /** diff --git a/hibernate-core/src/main/java/org/hibernate/Logger.java b/hibernate-core/src/main/java/org/hibernate/Logger.java deleted file mode 100644 index 3d498b4f48..0000000000 --- a/hibernate-core/src/main/java/org/hibernate/Logger.java +++ /dev/null @@ -1,1818 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * - * See the LEGAL.txt file distributed with this work for information regarding copyright ownership and licensing. - * - * See the AUTHORS.txt file distributed with this work for a full listing of individual contributors. - */ -package org.hibernate; - -import static org.jboss.logging.Logger.Level.ERROR; -import static org.jboss.logging.Logger.Level.INFO; -import static org.jboss.logging.Logger.Level.TRACE; -import static org.jboss.logging.Logger.Level.WARN; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.util.Hashtable; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import javax.naming.InvalidNameException; -import javax.naming.NameNotFoundException; -import javax.naming.NamingException; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import org.hibernate.cache.CacheException; -import org.hibernate.cfg.AccessType; -import org.hibernate.dialect.Dialect; -import org.hibernate.engine.CollectionKey; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.engine.loading.CollectionLoadContext; -import org.hibernate.engine.loading.EntityLoadContext; -import org.hibernate.id.IntegralDataTypeHolder; -import org.hibernate.service.jdbc.dialect.internal.AbstractDialectResolver; -import org.hibernate.type.BasicType; -import org.hibernate.type.SerializationException; -import org.hibernate.type.Type; -import org.jboss.logging.BasicLogger; -import org.jboss.logging.Cause; -import org.jboss.logging.LogMessage; -import org.jboss.logging.Message; -import org.jboss.logging.MessageLogger; - -/** - * Defines internationalized messages for hibernate-core. New messages must be added after the last message defined to ensure - * message codes are unique. - */ -// TODO: @cause, errorv because of var args and reordering of parameters, combine loggers in hibernate-core, -// formattable, message codes, register project code, category=class, rename Log -@MessageLogger( projectCode = "HHH" ) -public interface Logger extends BasicLogger { - - @LogMessage( level = INFO ) - @Message( "Adding secondary table to entity %s -> %s" ) - void addingSecondaryTableToEntity( String entity, - String table ); - - @LogMessage( level = WARN ) - @Message( value = "Already session bound on call to bind(); make sure you clean up your sessions!" ) - void alreadySessionBound(); - - @LogMessage( level = WARN ) - @Message( value = "Placing @Access(AccessType.%s) on a field does not have any effect." ) - void annotationHasNoEffect( AccessType type ); - - @LogMessage( level = WARN ) - @Message( value = "Attempt to map column [%s] to no target column after explicit target column(s) named for FK [name=%s]" ) - void attemptToMapColumnToNoTargetColumn( String loggableString, - String name ); - - @LogMessage( level = WARN ) - @Message( value = "Attribute \"order-by\" ignored in JDK1.3 or less" ) - void attributeIgnored(); - - @LogMessage( level = INFO ) - @Message( value = "Autocommit mode: %s" ) - void autoCommitMode( boolean autocommit ); - - @LogMessage( level = INFO ) - @Message( value = "Automatic flush during beforeCompletion(): %s" ) - void autoFlush( String enabledDisabled ); - - @LogMessage( level = WARN ) - @Message( value = "JTASessionContext being used with JDBCTransactionFactory; auto-flush will not operate correctly with getCurrentSession()" ) - void autoFlushWillNotWork(); - - @LogMessage( level = INFO ) - @Message( value = "Automatic session close at end of transaction: %s" ) - void autoSessionClose( String enabledDisabled ); - - @LogMessage( level = INFO ) - @Message( value = "On release of batch it still contained JDBC statements" ) - void batchContainedStatementsOnRelease(); - - @LogMessage( level = INFO ) - @Message( value = "Batcher factory: %s" ) - void batcherFactory( String batcherClass ); - - @LogMessage( level = INFO ) - @Message( value = "Bind entity %s on table %s" ) - void bindEntityOnTable( String entity, - String table ); - - @LogMessage( level = INFO ) - @Message( value = "Binding Any Meta definition: %s" ) - void bindingAnyMetaDefinition( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Binding entity from annotated class: %s" ) - void bindingEntityFromClass( String className ); - - @LogMessage( level = INFO ) - @Message( value = "Binding filter definition: %s" ) - void bindingFilterDefinition( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Binding named native query: %s => %s" ) - void bindingNamedNativeQuery( String name, - String query ); - - @LogMessage( level = INFO ) - @Message( value = "Binding named query: %s => %s" ) - void bindingNamedQuery( String name, - String query ); - - @LogMessage( level = INFO ) - @Message( value = "Binding result set mapping: %s" ) - void bindingResultSetMapping( String mapping ); - - @LogMessage( level = INFO ) - @Message( value = "Binding type definition: %s" ) - void bindingTypeDefinition( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Bound Ejb3Configuration to JNDI name: %s" ) - void boundEjb3ConfigurationToJndiName( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Building session factory" ) - void buildingSessionFactory(); - - @LogMessage( level = INFO ) - @Message( value = "Bytecode provider name : %s" ) - void bytecodeProvider( String provider ); - - @LogMessage( level = WARN ) - @Message( value = "c3p0 properties were encountered, but the %s provider class was not found on the classpath; these properties are going to be ignored." ) - void c3p0ProviderClassNotFound( String c3p0ProviderClassName ); - - @LogMessage( level = WARN ) - @Message( value = "I/O reported cached file could not be found : %s : %s" ) - void cachedFileNotFound( String path, - FileNotFoundException error ); - - @LogMessage( level = INFO ) - @Message( value = "Cache provider: %s" ) - void cacheProvider( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Cache region factory : %s" ) - void cacheRegionFactory( String regionFactoryClassName ); - - @LogMessage( level = INFO ) - @Message( value = "Cache region prefix: %s" ) - void cacheRegionPrefix( String prefix ); - - @LogMessage( level = WARN ) - @Message( value = "Calling joinTransaction() on a non JTA EntityManager" ) - void callingJoinTransactionOnNonJtaEntityManager(); - - @LogMessage( level = INFO ) - @Message( value = "Check Nullability in Core (should be disabled when Bean Validation is on): %s" ) - void checkNullability( String enabledDisabled ); - - @LogMessage( level = INFO ) - @Message( value = "Cleaning up connection pool [%s]" ) - void cleaningUpConnectionPool( String url ); - - @LogMessage( level = INFO ) - @Message( value = "Closing" ) - void closing(); - - @LogMessage( level = INFO ) - @Message( value = "Collections fetched (minimize this): %ld" ) - void collectionsFetched( long collectionFetchCount ); - - @LogMessage( level = INFO ) - @Message( value = "Collections loaded: %ld" ) - void collectionsLoaded( long collectionLoadCount ); - - @LogMessage( level = INFO ) - @Message( value = "Collections recreated: %ld" ) - void collectionsRecreated( long collectionRecreateCount ); - - @LogMessage( level = INFO ) - @Message( value = "Collections removed: %ld" ) - void collectionsRemoved( long collectionRemoveCount ); - - @LogMessage( level = INFO ) - @Message( value = "Collections updated: %ld" ) - void collectionsUpdated( long collectionUpdateCount ); - - @LogMessage( level = INFO ) - @Message( value = "Columns: %s" ) - void columns( Set keySet ); - - @LogMessage( level = INFO ) - @Message( value = "Configuration resource: %s" ) - void configurationResource( String resource ); - - @LogMessage( level = INFO ) - @Message( value = "Configured SessionFactory: %s" ) - void configuredSessionFactory( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Configuring from file: %s" ) - void configuringFromFile( String file ); - - @LogMessage( level = INFO ) - @Message( value = "Configuring from resource: %s" ) - void configuringFromResource( String resource ); - - @LogMessage( level = INFO ) - @Message( value = "Configuring from URL: %s" ) - void configuringFromUrl( URL url ); - - @LogMessage( level = INFO ) - @Message( value = "Configuring from XML document" ) - void configuringFromXmlDocument(); - - @LogMessage( level = INFO ) - @Message( value = "Connection properties: %s" ) - void connectionProperties( Properties connectionProps ); - - @LogMessage( level = INFO ) - @Message( value = "Connection release mode: %s" ) - void connectionReleaseMode( String releaseModeName ); - - @LogMessage( level = INFO ) - @Message( value = "Connections obtained: %ld" ) - void connectionsObtained( long connectCount ); - - @LogMessage( level = INFO ) - @Message( value = "%s did not provide constructor accepting java.util.Properties; attempting no-arg constructor." ) - void constructorWithPropertiesNotFound( String regionFactoryClassName ); - - @LogMessage( level = ERROR ) - @Message( value = "Container is providing a null PersistenceUnitRootUrl: discovery impossible" ) - void containerProvidingNullPersistenceUnitRootUrl(); - - @LogMessage( level = WARN ) - @Message( value = "Ignoring bag join fetch [%s] due to prior collection join fetch" ) - void containsJoinFetchedCollection( String role ); - - @Message( value = "Could not close connection" ) - Object couldNotCloseConnection(); - - @LogMessage( level = INFO ) - @Message( value = "Creating subcontext: %s" ) - void creatingSubcontextInfo( String intermediateContextName ); - - @LogMessage( level = INFO ) - @Message( value = "Database ->\n" + " name : %s\n" + " version : %s\n" + " major : %s\n" + " minor : %s" ) - void database( String databaseProductName, - String databaseProductVersion, - int databaseMajorVersion, - int databaseMinorVersion ); - - @LogMessage( level = INFO ) - @Message( value = "Default batch fetch size: %s" ) - void defaultBatchFetchSize( int batchFetchSize ); - - @LogMessage( level = INFO ) - @Message( value = "Default catalog: %s" ) - void defaultCatalog( String defaultCatalog ); - - @LogMessage( level = INFO ) - @Message( value = "Default entity-mode: %s" ) - void defaultEntityMode( EntityMode defaultEntityMode ); - - @LogMessage( level = INFO ) - @Message( value = "Default schema: %s" ) - void defaultSchema( String defaultSchema ); - - @LogMessage( level = WARN ) - @Message( value = "Defining %s=true ignored in HEM" ) - void definingFlushBeforeCompletionIgnoredInHem( String flushBeforeCompletion ); - - @LogMessage( level = INFO ) - @Message( value = "Deleted entity synthetic identifier rollback: %s" ) - void deletedEntitySyntheticIdentifierRollback( String enabledDisabled ); - - @LogMessage( level = WARN ) - @Message( value = "Per HHH-5451 support for cglib as a bytecode provider has been deprecated." ) - void deprecated(); - - @LogMessage( level = WARN ) - @Message( value = "@ForceDiscriminator is deprecated use @DiscriminatorOptions instead." ) - void deprecatedForceDescriminatorAnnotation(); - - @LogMessage( level = WARN ) - @Message( value = "The Oracle9Dialect dialect has been deprecated; use either Oracle9iDialect or Oracle10gDialect instead" ) - void deprecatedOracle9Dialect(); - - @LogMessage( level = WARN ) - @Message( value = "The OracleDialect dialect has been deprecated; use Oracle8iDialect instead" ) - void deprecatedOracleDialect(); - - @LogMessage( level = WARN ) - @Message( value = "DEPRECATED : use {} instead with custom {} implementation" ) - void deprecatedUuidGenerator( String name, - String name2 ); - - @LogMessage( level = WARN ) - @Message( value = "Dialect resolver class not found: %s" ) - void dialectResolverNotFound( String resolverName ); - - @LogMessage( level = INFO ) - @Message( value = "Disallowing insert statement comment for select-identity due to Oracle driver bug" ) - void disallowingInsertStatementComment(); - - @LogMessage( level = INFO ) - @Message( value = "Driver ->\n" + " name : %s\n" + " version : %s\n" + " major : %s\n" + " minor : %s" ) - void driver( String driverProductName, - String driverProductVersion, - int driverMajorVersion, - int driverMinorVersion ); - - @LogMessage( level = WARN ) - @Message( value = "Duplicate generator name %s" ) - void duplicateGeneratorName( String name ); - - @LogMessage( level = WARN ) - @Message( value = "Duplicate generator table: %s" ) - void duplicateGeneratorTable( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Duplicate import: %s -> %s" ) - void duplicateImport( String entityName, - String rename ); - - @LogMessage( level = WARN ) - @Message( value = "Duplicate joins for class: %s" ) - void duplicateJoins( String entityName ); - - @LogMessage( level = INFO ) - @Message( value = "entity-listener duplication, first event definition will be used: %s" ) - void duplicateListener( String className ); - - @LogMessage( level = WARN ) - @Message( value = "Found more than one , subsequent ignored" ) - void duplicateMetadata(); - - @LogMessage( level = INFO ) - @Message( value = "Echoing all SQL to stdout" ) - void echoingSql(); - - @LogMessage( level = INFO ) - @Message( value = "Ejb3Configuration name: %s" ) - void ejb3ConfigurationName( String name ); - - @LogMessage( level = INFO ) - @Message( value = "An Ejb3Configuration was renamed from name: %s" ) - void ejb3ConfigurationRenamedFromName( String name ); - - @LogMessage( level = INFO ) - @Message( value = "An Ejb3Configuration was unbound from name: %s" ) - void ejb3ConfigurationUnboundFromName( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Entities deleted: %ld" ) - void entitiesDeleted( long entityDeleteCount ); - - @LogMessage( level = INFO ) - @Message( value = "Entities fetched (minimize this): %ld" ) - void entitiesFetched( long entityFetchCount ); - - @LogMessage( level = INFO ) - @Message( value = "Entities inserted: %ld" ) - void entitiesInserted( long entityInsertCount ); - - @LogMessage( level = INFO ) - @Message( value = "Entities loaded: %ld" ) - void entitiesLoaded( long entityLoadCount ); - - @LogMessage( level = INFO ) - @Message( value = "Entities updated: %ld" ) - void entitiesUpdated( long entityUpdateCount ); - - @LogMessage( level = WARN ) - @Message( value = "@org.hibernate.annotations.Entity used on a non root entity: ignored for %s" ) - void entityAnnotationOnNonRoot( String className ); - - @LogMessage( level = WARN ) - @Message( value = "Entity Manager closed by someone else (%s must not be used)" ) - void entityManagerClosedBySomeoneElse( String autoCloseSession ); - - @LogMessage( level = INFO ) - @Message( value = "Hibernate EntityManager %s" ) - void entityManagerVersion( String versionString ); - - @LogMessage( level = WARN ) - @Message( value = "Entity [%s] is abstract-class/interface explicitly mapped as non-abstract; be sure to supply entity-names" ) - void entityMappedAsNonAbstract( String name ); - - @LogMessage( level = INFO ) - @Message( value = "%s %s found" ) - void exceptionHeaderFound( String exceptionHeader, - String metaInfOrmXml ); - - @LogMessage( level = INFO ) - @Message( value = "%s No %s found" ) - void exceptionHeaderNotFound( String exceptionHeader, - String metaInfOrmXml ); - - @LogMessage( level = ERROR ) - @Message( value = "Exception in interceptor afterTransactionCompletion()" ) - void exceptionInAfterTransactionCompletionInterceptor( @Cause Throwable e ); - - @LogMessage( level = ERROR ) - @Message( value = "Exception in interceptor beforeTransactionCompletion()" ) - void exceptionInBeforeTransactionCompletionInterceptor( @Cause Throwable e ); - - @LogMessage( level = INFO ) - @Message( value = "Sub-resolver threw unexpected exception, continuing to next : %s" ) - void exceptionInSubResolver( String message ); - - @LogMessage( level = INFO ) - @Message( value = "Executing import script: %s" ) - void executingImportScript( String name ); - - @LogMessage( level = ERROR ) - @Message( value = "Expected type: %s, actual value: %s" ) - void expectedType( String name, - String string ); - - @LogMessage( level = WARN ) - @Message( value = "An item was expired by the cache while it was locked (increase your cache timeout): %s" ) - void expired( Object key ); - - @LogMessage( level = WARN ) - @Message( value = "Exploded jar file does not exist (ignored): %s" ) - void explodedJarDoesNotExist( URL jarUrl ); - - @LogMessage( level = WARN ) - @Message( value = "Exploded jar file not a directory (ignored): %s" ) - void explodedJarNotDirectory( URL jarUrl ); - - @LogMessage( level = INFO ) - @Message( value = "Exporting generated schema to database" ) - void exportingGeneratedSchemaToDatabase(); - - @LogMessage( level = INFO ) - @Message( value = "Bound factory to JNDI name: %s" ) - void factoryBoundToJndiName( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Factory name: %s" ) - void factoryName( String name ); - - @LogMessage( level = INFO ) - @Message( value = "A factory was renamed from name: %s" ) - void factoryRenamedFromName( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Unbound factory from JNDI name: %s" ) - void factoryUnboundFromJndiName( String name ); - - @LogMessage( level = INFO ) - @Message( value = "A factory was unbound from name: %s" ) - void factoryUnboundFromName( String name ); - - @LogMessage( level = ERROR ) - @Message( value = "an assertion failure occured" + " (this may indicate a bug in Hibernate, but is more likely due" - + " to unsafe use of the session): %s" ) - void failed( Throwable throwable ); - - @LogMessage( level = WARN ) - @Message( value = "Fail-safe cleanup (collections) : %s" ) - void failSafeCollectionsCleanup( CollectionLoadContext collectionLoadContext ); - - @LogMessage( level = WARN ) - @Message( value = "Fail-safe cleanup (entities) : %s" ) - void failSafeEntitiesCleanup( EntityLoadContext entityLoadContext ); - - @LogMessage( level = INFO ) - @Message( value = "Fetching database metadata" ) - void fetchingDatabaseMetadata(); - - @LogMessage( level = WARN ) - @Message( value = "@Filter not allowed on subclasses (ignored): %s" ) - void filterAnnotationOnSubclass( String className ); - - @LogMessage( level = WARN ) - @Message( value = "firstResult/maxResults specified with collection fetch; applying in memory!" ) - void firstOrMaxResultsSpecifiedWithCollectionFetch(); - - @LogMessage( level = INFO ) - @Message( value = "Flushes: %ld" ) - void flushes( long flushCount ); - - @LogMessage( level = INFO ) - @Message( value = "Forcing container resource cleanup on transaction completion" ) - void forcingContainerResourceCleanup(); - - @LogMessage( level = INFO ) - @Message( value = "Forcing table use for sequence-style generator due to pooled optimizer selection where db does not support pooled sequences" ) - void forcingTableUse(); - - @LogMessage( level = INFO ) - @Message( value = "Foreign keys: %s" ) - void foreignKeys( Set keySet ); - - @LogMessage( level = INFO ) - @Message( value = "Found mapping document in jar: %s" ) - void foundMappingDocument( String name ); - - @LogMessage( level = INFO ) - @Message( value = "JVM does not support Statement.getGeneratedKeys()" ) - void generatedKeysNotSupported(); - - @LogMessage( level = INFO ) - @Message( value = "Generate SQL with comments: %s" ) - void generateSqlWithComments( String enabledDisabled ); - - @LogMessage( level = ERROR ) - @Message( value = "Getters of lazy classes cannot be final: %s.%s" ) - void gettersOfLazyClassesCannotBeFinal( String entityName, - String name ); - - @LogMessage( level = WARN ) - @Message( value = "GUID identifier generated: %s" ) - void guidGenerated( String result ); - - @LogMessage( level = INFO ) - @Message( value = "Handling transient entity in delete processing" ) - void handlingTransientEntity(); - - @LogMessage( level = INFO ) - @Message( value = "Hibernate connection pool size: %d" ) - void hibernateConnectionPoolSize( int poolSize ); - - @LogMessage( level = WARN ) - @Message( value = "Config specified explicit optimizer of [%s], but [%s=%d; honoring optimizer setting" ) - void honoringOptimizerSetting( String none, - String incrementParam, - int incrementSize ); - - @LogMessage( level = INFO ) - @Message( value = "HQL: %s, time: %sms, rows: %s" ) - void hql( String hql, - Long valueOf, - Long valueOf2 ); - - @LogMessage( level = WARN ) - @Message( value = "HSQLDB supports only READ_UNCOMMITTED isolation" ) - void hsqldbSupportsOnlyReadCommittedIsolation(); - - @LogMessage( level = WARN ) - @Message( value = "On EntityLoadContext#clear, hydratingEntities contained [%d] entries" ) - void hydratingEntitiesCount( int size ); - - @LogMessage( level = WARN ) - @Message( value = "Ignoring unique constraints specified on table generator [%s]" ) - void ignoringTableGeneratorConstraints( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Ignoring unrecognized query hint [%s]" ) - void ignoringUnrecognizedQueryHint( String hintName ); - - @LogMessage( level = ERROR ) - @Message( value = "Illegal argument on static metamodel field injection : %s#%s; expected type : %s; encountered type : %s" ) - void illegalArgumentOnStaticMetamodelFieldInjection( String name, - String name2, - String name3, - String name4 ); - - @LogMessage( level = ERROR ) - @Message( value = "IllegalArgumentException in class: %s, getter method of property: %s" ) - void illegalPropertyGetterArgument( String name, - String propertyName ); - - @LogMessage( level = ERROR ) - @Message( value = "IllegalArgumentException in class: %s, setter method of property: %s" ) - void illegalPropertySetterArgument( String name, - String propertyName ); - - @LogMessage( level = WARN ) - @Message( value = "@Immutable used on a non root entity: ignored for %s" ) - void immutableAnnotationOnNonRoot( String className ); - - @LogMessage( level = WARN ) - @Message( value = "Mapping metadata cache was not completely processed" ) - void incompleteMappingMetadataCacheProcessing(); - - @LogMessage( level = INFO ) - @Message( value = "Indexes: %s" ) - void indexes( Set keySet ); - - @LogMessage( level = WARN ) - @Message( value = "InitialContext did not implement EventContext" ) - void initialContextDidNotImplementEventContext(); - - @LogMessage( level = WARN ) - @Message( value = "InitialContext did not implement EventContext" ) - void initialContextDoesNotImplementEventContext(); - - @LogMessage( level = INFO ) - @Message( value = "Instantiated TransactionManagerLookup" ) - void instantiatedTransactionManagerLookup(); - - @LogMessage( level = INFO ) - @Message( value = "Instantiating explicit connection provider: %s" ) - void instantiatingExplicitConnectinProvider( String providerClassName ); - - @LogMessage( level = INFO ) - @Message( value = "Instantiating TransactionManagerLookup: %s" ) - void instantiatingTransactionManagerLookup( String tmLookupClass ); - - @LogMessage( level = ERROR ) - @Message( value = "Array element type error\n%s" ) - void invalidArrayElementType( String message ); - - @LogMessage( level = WARN ) - @Message( value = "Discriminator column has to be defined in the root entity, it will be ignored in subclass: %s" ) - void invalidDescriminatorAnnotation( String className ); - - @LogMessage( level = ERROR ) - @Message( value = "Application attempted to edit read only item: %s" ) - void invalidEditOfReadOnlyItem( Object key ); - - @LogMessage( level = ERROR ) - @Message( value = "Invalid JNDI name: %s" ) - void invalidJndiName( String name, - @Cause InvalidNameException e ); - - @LogMessage( level = WARN ) - @Message( value = "Inapropriate use of @OnDelete on entity, annotation ignored: %s" ) - void invalidOnDeleteAnnotation( String entityName ); - - @LogMessage( level = WARN ) - @Message( value = "Root entity should not hold an PrimaryKeyJoinColum(s), will be ignored" ) - void invalidPrimaryKeyJoinColumnAnnotation(); - - @LogMessage( level = WARN ) - @Message( value = "Mixing inheritance strategy in a entity hierarchy is not allowed, ignoring sub strategy in: %s" ) - void invalidSubStrategy( String className ); - - @LogMessage( level = WARN ) - @Message( value = "Illegal use of @Table in a subclass of a SINGLE_TABLE hierarchy: %s" ) - void invalidTableAnnotation( String className ); - - @LogMessage( level = INFO ) - @Message( value = "JACC contextID: %s" ) - void jaccContextId( String contextId ); - - @LogMessage( level = INFO ) - @Message( value = "java.sql.Types mapped the same code [%d] multiple times; was [%s]; now [%s]" ) - void JavaSqlTypesMappedSameCodeMultipleTimes( int code, - String old, - String name ); - - @LogMessage( level = INFO ) - @Message( value = "JDBC3 getGeneratedKeys(): %s" ) - void jdbc3GeneratedKeys( String enabledDisabled ); - - @LogMessage( level = WARN ) - @Message( value = "%s = false break the EJB3 specification" ) - void jdbcAutoCommitFalseBreaksEjb3Spec( String autocommit ); - - @LogMessage( level = INFO ) - @Message( value = "JDBC batch size: %s" ) - void jdbcBatchSize( int batchSize ); - - @LogMessage( level = INFO ) - @Message( value = "JDBC batch updates for versioned data: %s" ) - void jdbcBatchUpdates( String enabledDisabled ); - - @Message( value = "JDBC begin failed" ) - String jdbcBeginFailed(); - - @LogMessage( level = WARN ) - @Message( value = "no JDBC Driver class was specified by property %s" ) - void jdbcDriverNotSpecified( String driver ); - - @LogMessage( level = INFO ) - @Message( value = "JDBC isolation level: %s" ) - void jdbcIsolationLevel( String isolationLevelToString ); - - @LogMessage( level = INFO ) - @Message( value = "JDBC result set fetch size: %s" ) - void jdbcResultSetFetchSize( Integer statementFetchSize ); - - @Message( value = "JDBC rollback failed" ) - String jdbcRollbackFailed(); - - @Message( value = "JDBC URL was not specified by property %s" ) - String jdbcUrlNotSpecified( String url ); - - @LogMessage( level = INFO ) - @Message( value = "JDBC version : %d.%d" ) - void jdbcVersion( int jdbcMajorVersion, - int jdbcMinorVersion ); - - @LogMessage( level = INFO ) - @Message( value = "JNDI InitialContext properties:%s" ) - void jndiInitialContextProperties( Hashtable hash ); - - @LogMessage( level = ERROR ) - @Message( value = "JNDI name %s does not handle a session factory reference" ) - void jndiNameDoesNotHandleSessionFactoryReference( String sfJNDIName, - @Cause ClassCastException e ); - - @LogMessage( level = INFO ) - @Message( value = "JPA-QL strict compliance: %s" ) - void jpaQlStrictCompliance( String enabledDisabled ); - - @LogMessage( level = INFO ) - @Message( value = "Lazy property fetching available for: %s" ) - void lazyPropertyFetchingAvailable( String name ); - - @LogMessage( level = INFO ) - @Message( value = "JVM does not support LinkedHashMap, LinkedHashSet - ordered maps and sets disabled" ) - void linkedMapsAndSetsNotSupported(); - - @LogMessage( level = WARN ) - @Message( value = "In CollectionLoadContext#endLoadingCollections, localLoadingCollectionKeys contained [%s], but no LoadingCollectionEntry was found in loadContexts" ) - void loadingCollectionKeyNotFound( CollectionKey collectionKey ); - - @LogMessage( level = WARN ) - @Message( value = "On CollectionLoadContext#cleanup, localLoadingCollectionKeys contained [%d] entries" ) - void localLoadingCollectionKeysCount( int size ); - - @LogMessage( level = INFO ) - @Message( value = "Logging statistics...." ) - void loggingStatistics(); - - @LogMessage( level = INFO ) - @Message( value = "*** Logical connection closed ***" ) - void logicalConnectionClosed(); - - @LogMessage( level = INFO ) - @Message( value = "Logical connection releasing its physical connection" ) - void logicalConnectionReleasingPhysicalConnection(); - - @LogMessage( level = ERROR ) - @Message( value = "Malformed URL: %s" ) - void malformedUrl( URL jarUrl, - @Cause URISyntaxException e ); - - @LogMessage( level = WARN ) - @Message( value = "Malformed URL: %s" ) - void malformedUrlWarning( URL jarUrl, - @Cause URISyntaxException e ); - - @LogMessage( level = WARN ) - @Message( value = "You should set hibernate.transaction.manager_lookup_class if cache is enabled" ) - void managerLookupClassShouldBeSet(); - - @LogMessage( level = INFO ) - @Message( value = "Mapping class: %s -> %s" ) - void mappingClass( String entityName, - String name ); - - @LogMessage( level = INFO ) - @Message( value = "Mapping class join: %s -> %s" ) - void mappingClassJoin( String entityName, - String name ); - - @LogMessage( level = INFO ) - @Message( value = "Mapping collection: %s -> %s" ) - void mappingCollection( String name1, - String name2 ); - - @LogMessage( level = INFO ) - @Message( value = "Mapping joined-subclass: %s -> %s" ) - void mappingJoinedSubclass( String entityName, - String name ); - - @LogMessage( level = INFO ) - @Message( value = "Mapping Package %s" ) - void mappingPackage( String packageName ); - - @LogMessage( level = INFO ) - @Message( value = "Mapping subclass: %s -> %s" ) - void mappingSubclass( String entityName, - String name ); - - @LogMessage( level = INFO ) - @Message( value = "Mapping union-subclass: %s -> %s" ) - void mappingUnionSubclass( String entityName, - String name ); - - @LogMessage( level = INFO ) - @Message( value = "Maximum outer join fetch depth: %s" ) - void maxOuterJoinFetchDepth( Integer maxFetchDepth ); - - @LogMessage( level = INFO ) - @Message( value = "Max query time: %ldms" ) - void maxQueryTime( long queryExecutionMaxTime ); - - @LogMessage( level = WARN ) - @Message( value = "Function template anticipated %d arguments, but %d arguments encountered" ) - void missingArguments( int anticipatedNumberOfArguments, - int numberOfArguments ); - - @LogMessage( level = WARN ) - @Message( value = "Class annotated @org.hibernate.annotations.Entity but not javax.persistence.Entity (most likely a user error): %s" ) - void missingEntityAnnotation( String className ); - - @LogMessage( level = INFO ) - @Message( value = "Named query checking : %s" ) - void namedQueryChecking( String enabledDisabled ); - - @LogMessage( level = ERROR ) - @Message( value = "Error in named query: %s" ) - void namedQueryError( String queryName, - @Cause HibernateException e ); - - @LogMessage( level = WARN ) - @Message( value = "Naming exception occurred accessing factory: %s" ) - void namingExceptionAccessingFactory( NamingException exception ); - - @LogMessage( level = WARN ) - @Message( value = "Narrowing proxy to %s - this operation breaks ==" ) - void narrowingProxy( Class concreteProxyClass ); - - @LogMessage( level = WARN ) - @Message( value = "FirstResult/maxResults specified on polymorphic query; applying in memory!" ) - void needsLimit(); - - @LogMessage( level = WARN ) - @Message( value = "No appropriate connection provider encountered, assuming application will be supplying connections" ) - void noAppropriateConnectionProvider(); - - @LogMessage( level = INFO ) - @Message( value = "No default (no-argument) constructor for class: %s (class must be instantiated by Interceptor)" ) - void noDefaultConstructor( String name ); - - @LogMessage( level = WARN ) - @Message( value = "no persistent classes found for query class: %s" ) - void noPersistentClassesFound( String query ); - - @LogMessage( level = ERROR ) - @Message( value = "No session factory with JNDI name %s" ) - void noSessionFactoryWithJndiName( String sfJNDIName, - @Cause NameNotFoundException e ); - - @LogMessage( level = INFO ) - @Message( value = "Not binding factory to JNDI, no JNDI name configured" ) - void notBindingFactoryToJndi(); - - @LogMessage( level = INFO ) - @Message( value = "Obtaining TransactionManager" ) - void obtainingTransactionManager(); - - @LogMessage( level = INFO ) - @Message( value = "Optimistic lock failures: %ld" ) - void optimisticLockFailures( long optimisticFailureCount ); - - @LogMessage( level = INFO ) - @Message( value = "Optimize cache for minimal puts: %s" ) - void optimizeCacheForMinimalInputs( String enabledDisabled ); - - @LogMessage( level = WARN ) - @Message( value = "@OrderBy not allowed for an indexed collection, annotation ignored." ) - void orderByAnnotationIndexedCollection(); - - @LogMessage( level = WARN ) - @Message( value = "Attribute \"order-by\" ignored in JDK1.3 or less" ) - void orderByAttributeIgnored(); - - @LogMessage( level = INFO ) - @Message( value = "Order SQL inserts for batching: %s" ) - void orderSqlInsertsForBatching( String enabledDisabled ); - - @LogMessage( level = INFO ) - @Message( value = "Order SQL updates by primary key: %s" ) - void orderSqlUpdatesByPrimaryKey( String enabledDisabled ); - - @LogMessage( level = WARN ) - @Message( value = "Overriding %s is dangerous, this might break the EJB3 specification implementation" ) - void overridingTransactionStrategyDangerous( String transactionStrategy ); - - @LogMessage( level = WARN ) - @Message( value = "Package not found or wo package-info.java: %s" ) - void packageNotFound( String packageName ); - - @LogMessage( level = WARN ) - @Message( value = "Parameter position [%s] occurred as both JPA and Hibernate positional parameter" ) - void parameterPositionOccurredAsBothJpaAndHibernatePositionalParameter( Integer position ); - - @LogMessage( level = ERROR ) - @Message( value = "Error parsing XML (%d) : %s" ) - void parsingXmlError( int lineNumber, - String message ); - - @LogMessage( level = ERROR ) - @Message( value = "Error parsing XML: %s(%d) %s" ) - void parsingXmlErrorForFile( String file, - int lineNumber, - String message ); - - @LogMessage( level = ERROR ) - @Message( value = "Warning parsing XML (%d) : %s" ) - void parsingXmlWarning( int lineNumber, - String message ); - - @LogMessage( level = WARN ) - @Message( value = "Warning parsing XML: %s(%d) %s" ) - void parsingXmlWarningForFile( String file, - int lineNumber, - String message ); - - @LogMessage( level = WARN ) - @Message( value = "Persistence provider caller does not implement the EJB3 spec correctly." - + "PersistenceUnitInfo.getNewTempClassLoader() is null." ) - void persistenceProviderCallerDoesNotImplementEjb3SpecCorrectly(); - - @LogMessage( level = INFO ) - @Message( value = "Pooled optimizer source reported [%s] as the initial value; use of 1 or greater highly recommended" ) - void pooledOptimizerReportedInitialValue( IntegralDataTypeHolder value ); - - @LogMessage( level = ERROR ) - @Message( value = "PreparedStatement was already in the batch, [%s]." ) - void preparedStatementAlreadyInBatch( String sql ); - - @LogMessage( level = WARN ) - @Message( value = "processEqualityExpression() : No expression to process!" ) - void processEqualityExpression(); - - @LogMessage( level = INFO ) - @Message( value = "Processing PersistenceUnitInfo [\n\tname: %s\n\t...]" ) - void processingPersistenceUnitInfoName( String persistenceUnitName ); - - @LogMessage( level = INFO ) - @Message( value = "Loaded properties from resource hibernate.properties: %s" ) - void propertiesLoaded( Properties maskOut ); - - @LogMessage( level = INFO ) - @Message( value = "hibernate.properties not found" ) - void propertiesNotFound(); - - @LogMessage( level = WARN ) - @Message( value = "Property %s not found in class but described in (possible typo error)" ) - void propertyNotFound( String property ); - - @LogMessage( level = WARN ) - @Message( value = "%s has been deprecated in favor of %s; that provider will be used instead." ) - void providerClassDeprecated( String providerClassName, - String actualProviderClassName ); - - @LogMessage( level = WARN ) - @Message( value = "proxool properties were encountered, but the %s provider class was not found on the classpath; these properties are going to be ignored." ) - void proxoolProviderClassNotFound( String proxoolProviderClassName ); - - @LogMessage( level = INFO ) - @Message( value = "Queries executed to database: %ld" ) - void queriesExecuted( long queryExecutionCount ); - - @LogMessage( level = INFO ) - @Message( value = "Query cache: %s" ) - void queryCache( String enabledDisabled ); - - @LogMessage( level = INFO ) - @Message( value = "Query cache factory: %s" ) - void queryCacheFactory( String queryCacheFactoryClassName ); - - @LogMessage( level = INFO ) - @Message( value = "Query cache hits: %ld" ) - void queryCacheHits( long queryCacheHitCount ); - - @LogMessage( level = INFO ) - @Message( value = "Query cache misses: %ld" ) - void queryCacheMisses( long queryCacheMissCount ); - - @LogMessage( level = INFO ) - @Message( value = "Query cache puts: %ld" ) - void queryCachePuts( long queryCachePutCount ); - - @LogMessage( level = INFO ) - @Message( value = "Query language substitutions: %s" ) - void queryLanguageSubstitutions( Map querySubstitutions ); - - @LogMessage( level = INFO ) - @Message( value = "Query translator: %s" ) - void queryTranslator( String className ); - - @LogMessage( level = INFO ) - @Message( value = "RDMSOS2200Dialect version: 1.0" ) - void rdmsOs2200Dialect(); - - @LogMessage( level = INFO ) - @Message( value = "Reading mappings from cache file: %s" ) - void readingCachedMappings( File cachedFile ); - - @LogMessage( level = INFO ) - @Message( value = "Reading mappings from file: %s" ) - void readingMappingsFromFile( String path ); - - @LogMessage( level = INFO ) - @Message( value = "Reading mappings from resource: %s" ) - void readingMappingsFromResource( String resourceName ); - - @LogMessage( level = WARN ) - @Message( value = "read-only cache configured for mutable collection [%s]" ) - void readOnlyCacheConfiguredForMutableCollection( String name ); - - @LogMessage( level = WARN ) - @Message( value = "Recognized obsolete hibernate namespace %s. Use namespace %s instead. Refer to Hibernate 3.6 Migration Guide!" ) - void recognizedObsoleteHibernateNamespace( String oldHibernateNamespace, - String hibernateNamespace ); - - @LogMessage( level = WARN ) - @Message( value = "Reconnecting the same connection that is already connected; should this connection have been disconnected?" ) - void reconnectingConnectedConnection(); - - @LogMessage( level = WARN ) - @Message( value = "Property [%s] has been renamed to [%s]; update your properties appropriately" ) - void renamedProperty( Object propertyName, - Object newPropertyName ); - - @LogMessage( level = INFO ) - @Message( value = "Required a different provider: %s" ) - void requiredDifferentProvider( String provider ); - - @LogMessage( level = INFO ) - @Message( value = "Running hbm2ddl schema export" ) - void runningHbm2ddlSchemaExport(); - - @LogMessage( level = INFO ) - @Message( value = "Running hbm2ddl schema update" ) - void runningHbm2ddlSchemaUpdate(); - - @LogMessage( level = INFO ) - @Message( value = "Running schema validator" ) - void runningSchemaValidator(); - - @LogMessage( level = INFO ) - @Message( value = "Schema export complete" ) - void schemaExportComplete(); - - @LogMessage( level = ERROR ) - @Message( value = "Schema export unsuccessful" ) - void schemaExportUnsuccessful( @Cause Exception e ); - - @LogMessage( level = INFO ) - @Message( value = "Schema update complete" ) - void schemaUpdateComplete(); - - @LogMessage( level = WARN ) - @Message( value = "Scoping types to session factory %s after already scoped %s" ) - void scopingTypesToSessionFactoryAfterAlreadyScoped( SessionFactoryImplementor factory, - SessionFactoryImplementor factory2 ); - - @LogMessage( level = INFO ) - @Message( value = "Scrollable result sets: %s" ) - void scrollabelResultSets( String enabledDisabled ); - - @LogMessage( level = INFO ) - @Message( value = "Searching for mapping documents in jar: %s" ) - void searchingForMappingDocuments( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Second-level cache: %s" ) - void secondLevelCache( String enabledDisabled ); - - @LogMessage( level = INFO ) - @Message( value = "Second level cache hits: %ld" ) - void secondLevelCacheHits( long secondLevelCacheHitCount ); - - @LogMessage( level = INFO ) - @Message( value = "Second level cache misses: %ld" ) - void secondLevelCacheMisses( long secondLevelCacheMissCount ); - - @LogMessage( level = INFO ) - @Message( value = "Second level cache puts: %ld" ) - void secondLevelCachePuts( long secondLevelCachePutCount ); - - @LogMessage( level = INFO ) - @Message( value = "Service properties: %s" ) - void serviceProperties( Properties properties ); - - @LogMessage( level = INFO ) - @Message( value = "Sessions closed: %ld" ) - void sessionsClosed( long sessionCloseCount ); - - @LogMessage( level = INFO ) - @Message( value = "Sessions opened: %ld" ) - void sessionsOpened( long sessionOpenCount ); - - @LogMessage( level = ERROR ) - @Message( value = "Setters of lazy classes cannot be final: %s.%s" ) - void settersOfLazyClassesCannotBeFinal( String entityName, - String name ); - - @LogMessage( level = WARN ) - @Message( value = "@Sort not allowed for an indexed collection, annotation ignored." ) - void sortAnnotationIndexedCollection(); - - @LogMessage( level = WARN ) - @Message( value = "Manipulation query [%s] resulted in [%d] split queries" ) - void splitQueries( String sourceQuery, - int length ); - - @LogMessage( level = WARN ) - @Message( value = "SQL Error: %d, SQLState: %s" ) - void sqlError( int errorCode, - String sqlState ); - - @LogMessage( level = WARN ) - @Message( value = "SQL Error: %d, SQLState: %s" ) - void sqlException( int errorCode, - String sqlState ); - - @LogMessage( level = ERROR ) - @Message( value = "SQLException escaped proxy" ) - void sqlExceptionEscapedProxy( @Cause SQLException e ); - - @LogMessage( level = INFO ) - @Message( value = "Starting query cache at region: %s" ) - void startingQueryCache( String region ); - - @LogMessage( level = INFO ) - @Message( value = "Starting service at JNDI name: %s" ) - void startingServiceAtJndiName( String boundName ); - - @LogMessage( level = INFO ) - @Message( value = "Starting update timestamps cache at region: %s" ) - void startingUpdateTimestampsCache( String region ); - - @LogMessage( level = INFO ) - @Message( value = "Start time: %s" ) - void startTime( long startTime ); - - @LogMessage( level = INFO ) - @Message( value = "Statements closed: %ld" ) - void statementsClosed( long closeStatementCount ); - - @LogMessage( level = INFO ) - @Message( value = "Statements prepared: %ld" ) - void statementsPrepared( long prepareStatementCount ); - - @LogMessage( level = INFO ) - @Message( value = "Statistics: %s" ) - void statistics( String enabledDisabled ); - - @LogMessage( level = INFO ) - @Message( value = "Stopping service" ) - void stoppingService(); - - @LogMessage( level = INFO ) - @Message( value = "Structured second-level cache entries: %s" ) - void structuredSecondLevelCacheEntries( String enabledDisabled ); - - @LogMessage( level = INFO ) - @Message( value = "sub-resolver threw unexpected exception, continuing to next : %s" ) - void subResolverException( String message ); - - @LogMessage( level = INFO ) - @Message( value = "Successful transactions: %ld" ) - void successfulTransactions( long committedTransactionCount ); - - @LogMessage( level = INFO ) - @Message( value = "Synchronization [%s] was already registered" ) - void synchronizationAlreadyRegistered( Synchronization synchronization ); - - @LogMessage( level = ERROR ) - @Message( value = "Exception calling user Synchronization [%s] : %s" ) - void synchronizationFailed( Synchronization synchronization, - Throwable t ); - - @LogMessage( level = INFO ) - @Message( value = "Table found: %s" ) - void tableFound( String string ); - - @LogMessage( level = INFO ) - @Message( value = "Table not found: %s" ) - void tableNotFound( String name ); - - @Message( value = "TransactionFactory class not found: %s" ) - String transactionFactoryClassNotFound( String strategyClassName ); - - @LogMessage( level = INFO ) - @Message( value = "No TransactionManagerLookup configured (in JTA environment, use of read-write or transactional second-level cache is not recommended)" ) - void transactionManagerLookupNotConfigured(); - - @LogMessage( level = WARN ) - @Message( value = "Transaction not available on beforeCompletion: assuming valid" ) - void transactionNotAvailableOnBeforeCompletion(); - - @LogMessage( level = INFO ) - @Message( value = "Transactions: %ld" ) - void transactions( long transactionCount ); - - @LogMessage( level = WARN ) - @Message( value = "Transaction started on non-root session" ) - void transactionStartedOnNonRootSession(); - - @LogMessage( level = INFO ) - @Message( value = "Transaction strategy: %s" ) - void transactionStrategy( String strategyClassName ); - - @LogMessage( level = WARN ) - @Message( value = "Type [%s] defined no registration keys; ignoring" ) - void typeDefinedNoRegistrationKeys( BasicType type ); - - @LogMessage( level = INFO ) - @Message( value = "Type registration [%s] overrides previous : %s" ) - void typeRegistrationOverridesPrevious( String key, - Type old ); - - @Message( value = "Naming exception occurred accessing Ejb3Configuration" ) - Object unableToAccessEjb3Configuration(); - - @LogMessage( level = ERROR ) - @Message( value = "Error while accessing session factory with JNDI name %s" ) - void unableToAccessSessionFactory( String sfJNDIName, - @Cause NamingException e ); - - @LogMessage( level = WARN ) - @Message( value = "Error accessing type info result set : %s" ) - void unableToAccessTypeInfoResultSet( String string ); - - @Message( value = "Unable to apply constraints on DDL for %s" ) - Object unableToApplyConstraints( String className ); - - @Message( value = "JTA transaction begin failed" ) - String unableToBeginJtaTransaction(); - - @Message( value = "Could not bind Ejb3Configuration to JNDI" ) - Object unableToBindEjb3ConfigurationToJndi(); - - @Message( value = "Could not bind factory to JNDI" ) - Object unableToBindFactoryToJndi(); - - @LogMessage( level = INFO ) - @Message( value = "Could not bind value '%s' to parameter: %d; %s" ) - void unableToBindValueToParameter( String nullSafeToString, - int index, - String message ); - - @LogMessage( level = ERROR ) - @Message( value = "Unable to build enhancement metamodel for %s" ) - void unableToBuildEnhancementMetamodel( String className ); - - @LogMessage( level = INFO ) - @Message( value = "Could not build SessionFactory using the MBean classpath - will try again using client classpath: %s" ) - void unableToBuildSessionFactoryUsingMBeanClasspath( String message ); - - @Message( value = "Unable to clean up callable statement" ) - Object unableToCleanUpCallableStatement(); - - @Message( value = "Unable to clean up prepared statement" ) - Object unableToCleanUpPreparedStatement(); - - @LogMessage( level = WARN ) - @Message( value = "Unable to cleanup temporary id table after use [%s]" ) - void unableToCleanupTemporaryIdTable( Throwable t ); - - @Message( value = "Could not clear warnings" ) - Object unableToClearWarnings(); - - @LogMessage( level = ERROR ) - @Message( value = "Error closing connection" ) - void unableToCloseConnection( @Cause Exception e ); - - @LogMessage( level = INFO ) - @Message( value = "Error closing InitialContext [%s]" ) - void unableToCloseInitialContext( String string ); - - @LogMessage( level = ERROR ) - @Message( value = "Error closing imput files: %s" ) - Object unableToCloseInputFiles( String name, - @Cause IOException e ); - - @Message( value = "Could not close input stream" ) - Object unableToCloseInputStream(); - - @Message( value = "Could not close input stream for %s" ) - Object unableToCloseInputStreamForResource( String resourceName ); - - @Message( value = "Unable to close iterator" ) - Object unableToCloseIterator(); - - @LogMessage( level = ERROR ) - @Message( value = "Could not close jar: %s" ) - void unableToCloseJar( String message ); - - @LogMessage( level = ERROR ) - @Message( value = "Error closing output file: %s" ) - void unableToCloseOutputFile( String outputFile, - @Cause IOException e ); - - @Message( value = "IOException occurred closing output stream" ) - Object unableToCloseOutputStream(); - - @Message( value = "Problem closing pooled connection" ) - Object unableToClosePooledConnection(); - - @LogMessage( level = ERROR ) - @Message( value = "Could not close session" ) - void unableToCloseSession( @Cause HibernateException e ); - - @LogMessage( level = ERROR ) - @Message( value = "Could not close session during rollback" ) - void unableToCloseSessionDuringRollback( @Cause Exception e ); - - @Message( value = "IOException occurred closing stream" ) - Object unableToCloseStream(); - - @LogMessage( level = ERROR ) - @Message( value = "Could not close stream on hibernate.properties: %s" ) - void unableToCloseStreamError( IOException error ); - - @Message( value = "JTA commit failed" ) - String unableToCommitJta(); - - @LogMessage( level = ERROR ) - @Message( value = "Could not complete schema update" ) - void unableToCompleteSchemaUpdate( @Cause Exception e ); - - @LogMessage( level = ERROR ) - @Message( value = "Could not complete schema validation" ) - void unableToCompleteSchemaValidation( @Cause SQLException e ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to configure SQLExceptionConverter : %s" ) - void unableToConfigureSqlExceptionConverter( HibernateException e ); - - @LogMessage( level = ERROR ) - @Message( value = "Unable to construct current session context [%s]" ) - void unableToConstructCurrentSessionContext( String impl, - @Cause Throwable e ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to construct instance of specified SQLExceptionConverter : %s" ) - void unableToConstructSqlExceptionConverter( Throwable t ); - - @LogMessage( level = WARN ) - @Message( value = "Could not copy system properties, system properties will be ignored" ) - void unableToCopySystemProperties(); - - @Message( value = "Could not create proxy factory for:%s" ) - Object unableToCreateProxyFactory( String entityName ); - - @LogMessage( level = ERROR ) - @Message( value = "Error creating schema " ) - void unableToCreateSchema( @Cause Exception e ); - - @LogMessage( level = WARN ) - @Message( value = "Could not deserialize cache file: %s : %s" ) - void unableToDeserializeCache( String path, - SerializationException error ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to destroy cache: %s" ) - void unableToDestroyCache( String message ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to destroy query cache: %s: %s" ) - void unableToDestroyQueryCache( String region, - String message ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to destroy update timestamps cache: %s: %s" ) - void unableToDestroyUpdateTimestampsCache( String region, - String message ); - - @LogMessage( level = INFO ) - @Message( value = "Unable to determine lock mode value : %s -> %s" ) - void unableToDetermineLockModeValue( String hintName, - Object value ); - - @Message( value = "Could not determine transaction status" ) - String unableToDetermineTransactionStatus(); - - @Message( value = "Could not determine transaction status after commit" ) - String unableToDetermineTransactionStatusAfterCommit(); - - @LogMessage( level = WARN ) - @Message( value = "Unable to drop temporary id table after use [%s]" ) - void unableToDropTemporaryIdTable( String message ); - - @LogMessage( level = ERROR ) - @Message( value = "Exception executing batch [%s]" ) - void unableToExecuteBatch( String message ); - - @LogMessage( level = WARN ) - @Message( value = "Error executing resolver [%s] : %s" ) - void unableToExecuteResolver( AbstractDialectResolver abstractDialectResolver, - String message ); - - @Message( value = "Unable to find file (ignored): %s" ) - Object unableToFindFile( URL jarUrl ); - - @LogMessage( level = INFO ) - @Message( value = "Unable to find %s on the classpath. Hibernate Search is not enabled." ) - void unableToFindListenerClass( String className ); - - @LogMessage( level = INFO ) - @Message( value = "Could not find any META-INF/persistence.xml file in the classpath" ) - void unableToFindPersistenceXmlInClasspath(); - - @LogMessage( level = ERROR ) - @Message( value = "Could not get database metadata" ) - void unableToGetDatabaseMetadata( @Cause SQLException e ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to instantiate configured schema name resolver [%s] %s" ) - void unableToInstantiateConfiguredSchemaNameResolver( String resolverClassName, - String message ); - - @LogMessage( level = WARN ) - @Message( value = "Could not instantiate dialect resolver class : %s" ) - void unableToInstantiateDialectResolver( String message ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to instantiate specified optimizer [%s], falling back to noop" ) - void unableToInstantiateOptimizer( String type ); - - @Message( value = "Failed to instantiate TransactionFactory" ) - String unableToInstantiateTransactionFactory(); - - @Message( value = "Failed to instantiate TransactionManagerLookup '%s'" ) - String unableToInstantiateTransactionManagerLookup( String tmLookupClass ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to instantiate UUID generation strategy class : %s" ) - void unableToInstantiateUuidGenerationStrategy( Exception ignore ); - - @LogMessage( level = WARN ) - @Message( value = "Cannot join transaction: do not override %s" ) - void unableToJoinTransaction( String transactionStrategy ); - - @LogMessage( level = INFO ) - @Message( value = "Error performing load command : %s" ) - void unableToLoadCommand( HibernateException e ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to load/access derby driver class sysinfo to check versions : %s" ) - void unableToLoadDerbyDriver( String message ); - - @LogMessage( level = ERROR ) - @Message( value = "Problem loading properties from hibernate.properties" ) - void unableToloadProperties(); - - @Message( value = "Unable to locate config file: %s" ) - String unableToLocateConfigFile( String path ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to locate configured schema name resolver class [%s] %s" ) - void unableToLocateConfiguredSchemaNameResolver( String resolverClassName, - String message ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to locate MBeanServer on JMX service shutdown" ) - void unableToLocateMBeanServer(); - - @LogMessage( level = INFO ) - @Message( value = "Could not locate 'java.sql.NClob' class; assuming JDBC 3" ) - void unableToLocateNClobClass(); - - @LogMessage( level = ERROR ) - @Message( value = "Unable to locate static metamodel field : %s#%s" ) - void unableToLocateStaticMetamodelField( String name, - String name2 ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to locate requested UUID generation strategy class : %s" ) - void unableToLocateUuidGenerationStrategy( String strategyClassName ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to log SQLWarnings : %s" ) - void unableToLogSqlWarnings( SQLException sqle ); - - @Message( value = "Could not log warnings" ) - Object unableToLogWarnings(); - - @LogMessage( level = ERROR ) - @Message( value = "Unable to mark for rollback on PersistenceException: " ) - void unableToMarkForRollbackOnPersistenceException( @Cause Exception e ); - - @LogMessage( level = ERROR ) - @Message( value = "Unable to mark for rollback on TransientObjectException: " ) - void unableToMarkForRollbackOnTransientObjectException( @Cause Exception e ); - - @LogMessage( level = WARN ) - @Message( value = "Could not obtain connection metadata: %s" ) - void unableToObjectConnectionMetadata( SQLException error ); - - @LogMessage( level = WARN ) - @Message( value = "Could not obtain connection to query metadata: %s" ) - void unableToObjectConnectionToQueryMetadata( SQLException error ); - - @LogMessage( level = WARN ) - @Message( value = "Could not obtain connection metadata : %s" ) - void unableToObtainConnectionMetadata( String message ); - - @LogMessage( level = WARN ) - @Message( value = "Could not obtain connection to query metadata : %s" ) - void unableToObtainConnectionToQueryMetadata( String message ); - - @LogMessage( level = ERROR ) - @Message( value = "Could not obtain initial context" ) - void unableToObtainInitialContext( @Cause NamingException e ); - - @LogMessage( level = ERROR ) - @Message( value = "Could not parse the package-level metadata [%s]" ) - void unableToParseMetadata( String packageName ); - - @Message( value = "JDBC commit failed" ) - String unableToPerformJdbcCommit(); - - @LogMessage( level = ERROR ) - @Message( value = "Error during managed flush [%s]" ) - void unableToPerformManagedFlush( String message ); - - @Message( value = "Unable to query java.sql.DatabaseMetaData" ) - String unableToQueryDatabaseMetadata(); - - @LogMessage( level = ERROR ) - @Message( value = "Unable to read class: %s" ) - void unableToReadClass( String message ); - - @LogMessage( level = INFO ) - @Message( value = "Could not read column value from result set: %s; %s" ) - void unableToReadColumnValueFromResultSet( String name, - String message ); - - @Message( value = "Could not read a hi value - you need to populate the table: %s" ) - String unableToReadHiValue( String tableName ); - - @LogMessage( level = ERROR ) - @Message( value = "Could not read or init a hi value" ) - void unableToReadOrInitHiValue( @Cause SQLException e ); - - @LogMessage( level = ERROR ) - @Message( value = "Unable to release batch statement..." ) - void unableToReleaseBatchStatement(); - - @LogMessage( level = ERROR ) - @Message( value = "Could not release a cache lock : %s" ) - void unableToReleaseCacheLock( CacheException ce ); - - @LogMessage( level = INFO ) - @Message( value = "Unable to release initial context: %s" ) - void unableToReleaseContext( String message ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to release created MBeanServer : %s" ) - void unableToReleaseCreatedMBeanServer( String string ); - - @LogMessage( level = INFO ) - @Message( value = "Unable to release isolated connection [%s]" ) - void unableToReleaseIsolatedConnection( Throwable ignore ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to release type info result set" ) - void unableToReleaseTypeInfoResultSet(); - - @LogMessage( level = WARN ) - @Message( value = "Unable to erase previously added bag join fetch" ) - void unableToRemoveBagJoinFetch(); - - @LogMessage( level = TRACE ) - @Message( value = "Unable to reset connection back to auto-commit" ) - void unableToResetConnectionToAutoCommit(); - - @LogMessage( level = INFO ) - @Message( value = "Could not resolve aggregate function {}; using standard definition" ) - void unableToResolveAggregateFunction( String name ); - - @LogMessage( level = INFO ) - @Message( value = "Unable to resolve mapping file [%s]" ) - void unableToResolveMappingFile( String xmlFile ); - - @LogMessage( level = INFO ) - @Message( value = "Unable to retreive cache from JNDI [%s]: %s" ) - void unableToRetrieveCache( String namespace, - String message ); - - @LogMessage( level = WARN ) - @Message( value = "Unable to retrieve type info result set : %s" ) - void unableToRetrieveTypeInfoResultSet( String string ); - - @LogMessage( level = INFO ) - @Message( value = "Unable to rollback connection on exception [%s]" ) - void unableToRollbackConnection( Exception ignore ); - - @LogMessage( level = INFO ) - @Message( value = "Unable to rollback isolated transaction on error [%s] : [%s]" ) - void unableToRollbackIsolatedTransaction( Exception e, - Exception ignore ); - - @Message( value = "JTA rollback failed" ) - String unableToRollbackJta(); - - @LogMessage( level = ERROR ) - @Message( value = "Error running schema update" ) - void unableToRunSchemaUpdate( @Cause Exception e ); - - @LogMessage( level = ERROR ) - @Message( value = "Could not set transaction to rollback only" ) - void unableToSetTransactionToRollbackOnly( @Cause SystemException e ); - - @Message( value = "Exception while stopping service" ) - Object unableToStopHibernateService(); - - @LogMessage( level = INFO ) - @Message( value = "Error stopping service [%s] : %s" ) - void unableToStopService( Class class1, - String string ); - - @LogMessage( level = ERROR ) - @Message( value = "Could not synchronize database state with session: %s" ) - void unableToSynchronizeDatabaseStateWithSession( HibernateException he ); - - @LogMessage( level = ERROR ) - @Message( value = "Could not toggle autocommit" ) - void unableToToggleAutoCommit( @Cause Exception e ); - - @LogMessage( level = ERROR ) - @Message( value = "Unable to transform class: %s" ) - void unableToTransformClass( String message ); - - @Message( value = "Could not unbind factory from JNDI" ) - Object unableToUnbindFactoryFromJndi(); - - @Message( value = "Could not update hi value in: %s" ) - Object unableToUpdateHiValue( String tableName ); - - @LogMessage( level = ERROR ) - @Message( value = "Could not updateQuery hi value in: %s" ) - void unableToUpdateQueryHiValue( String tableName, - @Cause SQLException error ); - - @Message( value = "Error wrapping result set" ) - Object unableToWrapResultSet(); - - @LogMessage( level = WARN ) - @Message( value = "I/O reported error writing cached file : %s: %s" ) - void unableToWriteCachedFile( String path, - String message ); - - @LogMessage( level = INFO ) - @Message( value = "Unbinding factory from JNDI name: %s" ) - void unbindingFactoryFromJndiName( String name ); - - @LogMessage( level = WARN ) - @Message( value = "Unexpected literal token type [%d] passed for numeric processing" ) - void unexpectedLiteralTokenType( int type ); - - @LogMessage( level = WARN ) - @Message( value = "JDBC driver did not return the expected number of row counts" ) - void unexpectedRowCounts(); - - @LogMessage( level = WARN ) - @Message( value = "unrecognized bytecode provider [%s], using javassist by default" ) - void unknownBytecodeProvider( String providerName ); - - @LogMessage( level = WARN ) - @Message( value = "Unknown Ingres major version [%d]; using Ingres 9.2 dialect" ) - void unknownIngresVersion( int databaseMajorVersion ); - - @LogMessage( level = WARN ) - @Message( value = "Unknown Oracle major version [%d]" ) - void unknownOracleVersion( int databaseMajorVersion ); - - @LogMessage( level = WARN ) - @Message( value = "Unknown Microsoft SQL Server major version [%d] using SQL Server 2000 dialect" ) - void unknownSqlServerVersion( int databaseMajorVersion ); - - @LogMessage( level = WARN ) - @Message( value = "ResultSet had no statement associated with it, but was not yet registered" ) - void unregisteredResultSetWithoutStatement(); - - @LogMessage( level = WARN ) - @Message( value = "ResultSet's statement was not registered" ) - void unregisteredStatement(); - - @LogMessage( level = ERROR ) - @Message( value = "Unsuccessful: %s" ) - void unsuccessful( String sql ); - - @LogMessage( level = ERROR ) - @Message( value = "Unsuccessful: %s" ) - void unsuccessfulCreate( String string ); - - @LogMessage( level = WARN ) - @Message( value = "Overriding release mode as connection provider does not support 'after_statement'" ) - void unsupportedAfterStatement(); - - @LogMessage( level = WARN ) - @Message( value = "Ingres 10 is not yet fully supported; using Ingres 9.3 dialect" ) - void unsupportedIngresVersion(); - - @LogMessage( level = WARN ) - @Message( value = "Hibernate does not support SequenceGenerator.initialValue() unless '%s' set" ) - void unsupportedInitialValue( String propertyName ); - - @LogMessage( level = WARN ) - @Message( value = "The %d.%d.%d version of H2 implements temporary table creation such that it commits current transaction; multi-table, bulk hql/jpaql will not work properly" ) - void unsupportedMultiTableBulkHqlJpaql( int majorVersion, - int minorVersion, - int buildId ); - - @LogMessage( level = WARN ) - @Message( value = "Oracle 11g is not yet fully supported; using Oracle 10g dialect" ) - void unsupportedOracleVersion(); - - @LogMessage( level = WARN ) - @Message( value = "Usage of obsolete property: %s no longer supported, use: %s" ) - void unsupportedProperty( Object propertyName, - Object newPropertyName ); - - @LogMessage( level = INFO ) - @Message( value = "Updating schema" ) - void updatingSchema(); - - @LogMessage( level = INFO ) - @Message( value = "Using ASTQueryTranslatorFactory" ) - void usingAstQueryTranslatorFactory(); - - @LogMessage( level = INFO ) - @Message( value = "Explicit segment value for id generator [%s.%s] suggested; using default [%s]" ) - void usingDefaultIdGeneratorSegmentValue( String tableName, - String segmentColumnName, - String defaultToUse ); - - @LogMessage( level = INFO ) - @Message( value = "Using default transaction strategy (direct JDBC transactions)" ) - void usingDefaultTransactionStrategy(); - - @LogMessage( level = INFO ) - @Message( value = "Using dialect: %s" ) - void usingDialect( Dialect dialect ); - - @LogMessage( level = INFO ) - @Message( value = "using driver [%s] at URL [%s]" ) - void usingDriver( String driverClassName, - String url ); - - @LogMessage( level = INFO ) - @Message( value = "Using Hibernate built-in connection pool (not for production use!)" ) - void usingHibernateBuiltInConnectionPool(); - - @LogMessage( level = INFO ) - @Message( value = "Using JDK 1.4 java.sql.Timestamp handling" ) - void usingJdk14TimestampHandling(); - - @LogMessage( level = ERROR ) - @Message( value = "Don't use old DTDs, read the Hibernate 3.x Migration Guide!" ) - void usingOldDtd(); - - @LogMessage( level = INFO ) - @Message( value = "Using pre JDK 1.4 java.sql.Timestamp handling" ) - void usingPreJdk14TimestampHandling(); - - @LogMessage( level = INFO ) - @Message( value = "Using provided datasource" ) - void usingProvidedDataSource(); - - @LogMessage( level = INFO ) - @Message( value = "Using bytecode reflection optimizer" ) - void usingReflectionOptimizer(); - - @LogMessage( level = INFO ) - @Message( value = "Using java.io streams to persist binary types" ) - void usingStreams(); - - @LogMessage( level = INFO ) - @Message( value = "Using workaround for JVM bug in java.sql.Timestamp" ) - void usingTimestampWorkaround(); - - @LogMessage( level = WARN ) - @Message( value = "Using %s which does not generate IETF RFC 4122 compliant UUID values; consider using %s instead" ) - void usingUuidHexGenerator( String name, - String name2 ); - - @LogMessage( level = INFO ) - @Message( value = "Hibernate Validator not found: ignoring" ) - void validatorNotFound(); - - @LogMessage( level = WARN ) - @Message( value = "Value mapping mismatch as part of FK [table=%s, name=%s] while adding source column [%s]" ) - void valueMappingMismatch( String loggableString, - String name, - String loggableString2 ); - - @LogMessage( level = INFO ) - @Message( value = "Hibernate %s" ) - void version( String versionString ); - - @LogMessage( level = WARN ) - @Message( value = "Warnings creating temp table : %s" ) - void warningsCreatingTempTable( SQLWarning warning ); - - @LogMessage( level = INFO ) - @Message( value = "Property hibernate.search.autoregister_listeners is set to false. No attempt will be made to register Hibernate Search event listeners." ) - void willNotRegisterListeners(); - - @LogMessage( level = INFO ) - @Message( value = "Wrap result sets: %s" ) - void wrapResultSets( String enabledDisabled ); - - @LogMessage( level = WARN ) - @Message( value = "Write locks via update not supported for non-versioned entities [%s]" ) - void writeLocksNotSupported( String entityName ); - - @LogMessage( level = INFO ) - @Message( value = "Writing generated schema to file: %s" ) - void writingGeneratedSchemaToFile( String outputFile ); -} diff --git a/hibernate-core/src/main/java/org/hibernate/MappingException.java b/hibernate-core/src/main/java/org/hibernate/MappingException.java index fa1652c8ad..5ce3469f67 100644 --- a/hibernate-core/src/main/java/org/hibernate/MappingException.java +++ b/hibernate-core/src/main/java/org/hibernate/MappingException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * An exception that usually occurs at configuration time, rather * than runtime, as a result of something screwy in the O-R mappings. diff --git a/hibernate-core/src/main/java/org/hibernate/MappingNotFoundException.java b/hibernate-core/src/main/java/org/hibernate/MappingNotFoundException.java index cffb0dd856..30c17fc54e 100644 --- a/hibernate-core/src/main/java/org/hibernate/MappingNotFoundException.java +++ b/hibernate-core/src/main/java/org/hibernate/MappingNotFoundException.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate; +package org.hibernate; + /** * Thrown when a resource for a mapping could not be found. diff --git a/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java b/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java index d15eb0528a..7d87399797 100644 --- a/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java +++ b/hibernate-core/src/main/java/org/hibernate/NonUniqueObjectException.java @@ -23,9 +23,7 @@ * */ package org.hibernate; - import java.io.Serializable; - import org.hibernate.pretty.MessageHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java b/hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java index adbecc9c2b..12630e2c42 100644 --- a/hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java +++ b/hibernate-core/src/main/java/org/hibernate/NonUniqueResultException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Thrown when the application calls Query.uniqueResult() and * the query returned more than one result. Unlike all other Hibernate diff --git a/hibernate-core/src/main/java/org/hibernate/ObjectDeletedException.java b/hibernate-core/src/main/java/org/hibernate/ObjectDeletedException.java index bfea3aa397..766fb4e86e 100644 --- a/hibernate-core/src/main/java/org/hibernate/ObjectDeletedException.java +++ b/hibernate-core/src/main/java/org/hibernate/ObjectDeletedException.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/ObjectNotFoundException.java b/hibernate-core/src/main/java/org/hibernate/ObjectNotFoundException.java index abcce72209..06a945cda0 100644 --- a/hibernate-core/src/main/java/org/hibernate/ObjectNotFoundException.java +++ b/hibernate-core/src/main/java/org/hibernate/ObjectNotFoundException.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/OptimisticLockException.java b/hibernate-core/src/main/java/org/hibernate/OptimisticLockException.java index 30e564e11b..1184860db4 100644 --- a/hibernate-core/src/main/java/org/hibernate/OptimisticLockException.java +++ b/hibernate-core/src/main/java/org/hibernate/OptimisticLockException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * * Throw when an optimistic locking conflict occurs. diff --git a/hibernate-core/src/main/java/org/hibernate/PersistentObjectException.java b/hibernate-core/src/main/java/org/hibernate/PersistentObjectException.java index da5a932ed5..3d0f4b0142 100644 --- a/hibernate-core/src/main/java/org/hibernate/PersistentObjectException.java +++ b/hibernate-core/src/main/java/org/hibernate/PersistentObjectException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Thrown when the user passes a persistent instance to a Session * method that expects a transient instance. diff --git a/hibernate-core/src/main/java/org/hibernate/PessimisticLockException.java b/hibernate-core/src/main/java/org/hibernate/PessimisticLockException.java index 8c3742ef35..bbb43ff106 100644 --- a/hibernate-core/src/main/java/org/hibernate/PessimisticLockException.java +++ b/hibernate-core/src/main/java/org/hibernate/PessimisticLockException.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.sql.SQLException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/PropertyAccessException.java b/hibernate-core/src/main/java/org/hibernate/PropertyAccessException.java index 47f583eca9..2fb4d13758 100644 --- a/hibernate-core/src/main/java/org/hibernate/PropertyAccessException.java +++ b/hibernate-core/src/main/java/org/hibernate/PropertyAccessException.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import org.hibernate.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/PropertyNotFoundException.java b/hibernate-core/src/main/java/org/hibernate/PropertyNotFoundException.java index 064a510486..1ac945f77f 100644 --- a/hibernate-core/src/main/java/org/hibernate/PropertyNotFoundException.java +++ b/hibernate-core/src/main/java/org/hibernate/PropertyNotFoundException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Indicates that an expected getter or setter method could not be * found on a class. diff --git a/hibernate-core/src/main/java/org/hibernate/PropertyValueException.java b/hibernate-core/src/main/java/org/hibernate/PropertyValueException.java index f22937e3b4..7e9e8b6a00 100644 --- a/hibernate-core/src/main/java/org/hibernate/PropertyValueException.java +++ b/hibernate-core/src/main/java/org/hibernate/PropertyValueException.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import org.hibernate.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/Query.java b/hibernate-core/src/main/java/org/hibernate/Query.java index 9c5d72ff4a..0eb9096464 100644 --- a/hibernate-core/src/main/java/org/hibernate/Query.java +++ b/hibernate-core/src/main/java/org/hibernate/Query.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; @@ -34,7 +33,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; - import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/QueryException.java b/hibernate-core/src/main/java/org/hibernate/QueryException.java index cd6fc4d553..c6658b81fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/QueryException.java +++ b/hibernate-core/src/main/java/org/hibernate/QueryException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * A problem occurred translating a Hibernate query to SQL * due to invalid query syntax, etc. diff --git a/hibernate-core/src/main/java/org/hibernate/QueryParameterException.java b/hibernate-core/src/main/java/org/hibernate/QueryParameterException.java index b075a60326..72d08eae15 100644 --- a/hibernate-core/src/main/java/org/hibernate/QueryParameterException.java +++ b/hibernate-core/src/main/java/org/hibernate/QueryParameterException.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate; +package org.hibernate; + /** * Parameter invalid or not found in the query diff --git a/hibernate-core/src/main/java/org/hibernate/QueryTimeoutException.java b/hibernate-core/src/main/java/org/hibernate/QueryTimeoutException.java index efb26bfa75..cc65680f0b 100644 --- a/hibernate-core/src/main/java/org/hibernate/QueryTimeoutException.java +++ b/hibernate-core/src/main/java/org/hibernate/QueryTimeoutException.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.sql.SQLException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/ReplicationMode.java b/hibernate-core/src/main/java/org/hibernate/ReplicationMode.java index d1807d77d5..33584f4010 100644 --- a/hibernate-core/src/main/java/org/hibernate/ReplicationMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ReplicationMode.java @@ -23,11 +23,9 @@ * */ package org.hibernate; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; - import org.hibernate.type.VersionType; /** diff --git a/hibernate-core/src/main/java/org/hibernate/SQLQuery.java b/hibernate-core/src/main/java/org/hibernate/SQLQuery.java index 9ea8c0d3db..361c37eb54 100755 --- a/hibernate-core/src/main/java/org/hibernate/SQLQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/SQLQuery.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate; - import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/SQLQueryResultMappingBuilder.java b/hibernate-core/src/main/java/org/hibernate/SQLQueryResultMappingBuilder.java index c6937681f5..6426dfcf3f 100644 --- a/hibernate-core/src/main/java/org/hibernate/SQLQueryResultMappingBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/SQLQueryResultMappingBuilder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate; - import org.hibernate.engine.query.sql.NativeSQLQueryReturn; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/ScrollMode.java b/hibernate-core/src/main/java/org/hibernate/ScrollMode.java index 9819ff1529..66b539c194 100755 --- a/hibernate-core/src/main/java/org/hibernate/ScrollMode.java +++ b/hibernate-core/src/main/java/org/hibernate/ScrollMode.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; import java.sql.ResultSet; import java.util.HashMap; diff --git a/hibernate-core/src/main/java/org/hibernate/ScrollableResults.java b/hibernate-core/src/main/java/org/hibernate/ScrollableResults.java index ff8dd78de1..f483197f99 100644 --- a/hibernate-core/src/main/java/org/hibernate/ScrollableResults.java +++ b/hibernate-core/src/main/java/org/hibernate/ScrollableResults.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Blob; @@ -32,7 +31,6 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; - import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/Session.java b/hibernate-core/src/main/java/org/hibernate/Session.java index 003c55764f..db27048ad4 100644 --- a/hibernate-core/src/main/java/org/hibernate/Session.java +++ b/hibernate-core/src/main/java/org/hibernate/Session.java @@ -23,10 +23,8 @@ * */ package org.hibernate; - import java.io.Serializable; import java.sql.Connection; - import org.hibernate.jdbc.Work; import org.hibernate.stat.SessionStatistics; diff --git a/hibernate-core/src/main/java/org/hibernate/SessionException.java b/hibernate-core/src/main/java/org/hibernate/SessionException.java index 793c94cc39..ba1727b89a 100755 --- a/hibernate-core/src/main/java/org/hibernate/SessionException.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Thrown when the user calls a method of a {@link Session} that is in an * inappropropriate state for the given call (for example, the the session diff --git a/hibernate-core/src/main/java/org/hibernate/SessionFactory.java b/hibernate-core/src/main/java/org/hibernate/SessionFactory.java index af193fc35e..f64b14704a 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionFactory.java @@ -23,18 +23,15 @@ * */ package org.hibernate; - import java.io.Serializable; import java.sql.Connection; import java.util.Map; import java.util.Set; - import javax.naming.Referenceable; - +import org.hibernate.engine.FilterDefinition; import org.hibernate.metadata.ClassMetadata; import org.hibernate.metadata.CollectionMetadata; import org.hibernate.stat.Statistics; -import org.hibernate.engine.FilterDefinition; /** * The main contract here is the creation of {@link Session} instances. Usually diff --git a/hibernate-core/src/main/java/org/hibernate/SessionFactoryObserver.java b/hibernate-core/src/main/java/org/hibernate/SessionFactoryObserver.java index 9c42956538..2ccfefad38 100644 --- a/hibernate-core/src/main/java/org/hibernate/SessionFactoryObserver.java +++ b/hibernate-core/src/main/java/org/hibernate/SessionFactoryObserver.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/StaleObjectStateException.java b/hibernate-core/src/main/java/org/hibernate/StaleObjectStateException.java index d50aec0ee7..e193ca21b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/StaleObjectStateException.java +++ b/hibernate-core/src/main/java/org/hibernate/StaleObjectStateException.java @@ -23,9 +23,7 @@ * */ package org.hibernate; - import java.io.Serializable; - import org.hibernate.pretty.MessageHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/StaleStateException.java b/hibernate-core/src/main/java/org/hibernate/StaleStateException.java index fa63a441d2..43ecebae72 100755 --- a/hibernate-core/src/main/java/org/hibernate/StaleStateException.java +++ b/hibernate-core/src/main/java/org/hibernate/StaleStateException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Thrown when a version number or timestamp check failed, indicating that the * Session contained stale data (when using long transactions diff --git a/hibernate-core/src/main/java/org/hibernate/StatelessSession.java b/hibernate-core/src/main/java/org/hibernate/StatelessSession.java index 00854f4ec2..62d69ae400 100755 --- a/hibernate-core/src/main/java/org/hibernate/StatelessSession.java +++ b/hibernate-core/src/main/java/org/hibernate/StatelessSession.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; import java.sql.Connection; diff --git a/hibernate-core/src/main/java/org/hibernate/Transaction.java b/hibernate-core/src/main/java/org/hibernate/Transaction.java index 38635007c1..99576b3625 100644 --- a/hibernate-core/src/main/java/org/hibernate/Transaction.java +++ b/hibernate-core/src/main/java/org/hibernate/Transaction.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import javax.transaction.Synchronization; /** diff --git a/hibernate-core/src/main/java/org/hibernate/TransactionException.java b/hibernate-core/src/main/java/org/hibernate/TransactionException.java index 056ce35875..6982d8ae06 100644 --- a/hibernate-core/src/main/java/org/hibernate/TransactionException.java +++ b/hibernate-core/src/main/java/org/hibernate/TransactionException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Indicates that a transaction could not be begun, committed * or rolled back. diff --git a/hibernate-core/src/main/java/org/hibernate/TransientObjectException.java b/hibernate-core/src/main/java/org/hibernate/TransientObjectException.java index 4714facbdd..c20a7ce20a 100644 --- a/hibernate-core/src/main/java/org/hibernate/TransientObjectException.java +++ b/hibernate-core/src/main/java/org/hibernate/TransientObjectException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Thrown when the user passes a transient instance to a Session * method that expects a persistent instance. diff --git a/hibernate-core/src/main/java/org/hibernate/TypeHelper.java b/hibernate-core/src/main/java/org/hibernate/TypeHelper.java index 67aec575b5..1d8ccd4b3a 100644 --- a/hibernate-core/src/main/java/org/hibernate/TypeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/TypeHelper.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate; - import java.util.Properties; - import org.hibernate.type.BasicType; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/TypeMismatchException.java b/hibernate-core/src/main/java/org/hibernate/TypeMismatchException.java index 595f41e599..a72fe40d60 100644 --- a/hibernate-core/src/main/java/org/hibernate/TypeMismatchException.java +++ b/hibernate-core/src/main/java/org/hibernate/TypeMismatchException.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate; +package org.hibernate; + /** * Used when a user provided type does not match the expected one diff --git a/hibernate-core/src/main/java/org/hibernate/UnknownProfileException.java b/hibernate-core/src/main/java/org/hibernate/UnknownProfileException.java index 59291a1dd7..20cf6cc02b 100644 --- a/hibernate-core/src/main/java/org/hibernate/UnknownProfileException.java +++ b/hibernate-core/src/main/java/org/hibernate/UnknownProfileException.java @@ -24,6 +24,7 @@ */ package org.hibernate; + /** * Used to indicate a request against an unknown profile name. * diff --git a/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java b/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java index 1e7aaefed8..f98d71876a 100644 --- a/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java +++ b/hibernate-core/src/main/java/org/hibernate/UnresolvableObjectException.java @@ -23,9 +23,7 @@ * */ package org.hibernate; - import java.io.Serializable; - import org.hibernate.pretty.MessageHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/Version.java b/hibernate-core/src/main/java/org/hibernate/Version.java index efd9c113b6..aa9729a2f8 100644 --- a/hibernate-core/src/main/java/org/hibernate/Version.java +++ b/hibernate-core/src/main/java/org/hibernate/Version.java @@ -23,6 +23,7 @@ */ package org.hibernate; + /** * Information about the Hibernate version. * diff --git a/hibernate-core/src/main/java/org/hibernate/WrongClassException.java b/hibernate-core/src/main/java/org/hibernate/WrongClassException.java index 3046f913c2..6946fea3b2 100644 --- a/hibernate-core/src/main/java/org/hibernate/WrongClassException.java +++ b/hibernate-core/src/main/java/org/hibernate/WrongClassException.java @@ -23,7 +23,6 @@ * */ package org.hibernate; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/action/AfterTransactionCompletionProcess.java b/hibernate-core/src/main/java/org/hibernate/action/AfterTransactionCompletionProcess.java index 4b001f4c73..342c1829de 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/AfterTransactionCompletionProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/action/AfterTransactionCompletionProcess.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.action; - import org.hibernate.engine.SessionImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/action/BeforeTransactionCompletionProcess.java b/hibernate-core/src/main/java/org/hibernate/action/BeforeTransactionCompletionProcess.java index b8a0c87779..12ab2194ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/BeforeTransactionCompletionProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/action/BeforeTransactionCompletionProcess.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.action; - import org.hibernate.engine.SessionImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java b/hibernate-core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java index 6106438f44..e08b51fb0e 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/BulkOperationCleanupAction.java @@ -22,14 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.action; - import java.io.Serializable; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Set; - import org.hibernate.HibernateException; import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cache.access.EntityRegionAccessStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/action/CollectionAction.java b/hibernate-core/src/main/java/org/hibernate/action/CollectionAction.java index e8dbca63d8..581866a54f 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/CollectionAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/CollectionAction.java @@ -23,20 +23,18 @@ * */ package org.hibernate.action; - -import org.hibernate.cache.access.SoftLock; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.Serializable; import org.hibernate.cache.CacheException; import org.hibernate.cache.CacheKey; +import org.hibernate.cache.access.SoftLock; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.util.StringHelper; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.Serializable; - /** * Any action relating to insert/update/delete of a collection * diff --git a/hibernate-core/src/main/java/org/hibernate/action/CollectionRecreateAction.java b/hibernate-core/src/main/java/org/hibernate/action/CollectionRecreateAction.java index 9edcc78f2b..fa05ca6903 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/CollectionRecreateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/CollectionRecreateAction.java @@ -23,20 +23,18 @@ * */ package org.hibernate.action; - +import java.io.Serializable; import org.hibernate.HibernateException; -import org.hibernate.event.PostCollectionRecreateEventListener; -import org.hibernate.event.PostCollectionRecreateEvent; -import org.hibernate.event.EventSource; -import org.hibernate.event.PreCollectionRecreateEvent; -import org.hibernate.event.PreCollectionRecreateEventListener; import org.hibernate.cache.CacheException; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.SessionImplementor; +import org.hibernate.event.EventSource; +import org.hibernate.event.PostCollectionRecreateEvent; +import org.hibernate.event.PostCollectionRecreateEventListener; +import org.hibernate.event.PreCollectionRecreateEvent; +import org.hibernate.event.PreCollectionRecreateEventListener; import org.hibernate.persister.collection.CollectionPersister; -import java.io.Serializable; - public final class CollectionRecreateAction extends CollectionAction { public CollectionRecreateAction( diff --git a/hibernate-core/src/main/java/org/hibernate/action/CollectionRemoveAction.java b/hibernate-core/src/main/java/org/hibernate/action/CollectionRemoveAction.java index 06762d03ec..b346251e5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/CollectionRemoveAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/CollectionRemoveAction.java @@ -23,21 +23,19 @@ * */ package org.hibernate.action; - -import org.hibernate.HibernateException; +import java.io.Serializable; import org.hibernate.AssertionFailure; -import org.hibernate.event.PostCollectionRemoveEvent; -import org.hibernate.event.PreCollectionRemoveEvent; -import org.hibernate.event.PreCollectionRemoveEventListener; -import org.hibernate.event.EventSource; -import org.hibernate.event.PostCollectionRemoveEventListener; +import org.hibernate.HibernateException; import org.hibernate.cache.CacheException; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.SessionImplementor; +import org.hibernate.event.EventSource; +import org.hibernate.event.PostCollectionRemoveEvent; +import org.hibernate.event.PostCollectionRemoveEventListener; +import org.hibernate.event.PreCollectionRemoveEvent; +import org.hibernate.event.PreCollectionRemoveEventListener; import org.hibernate.persister.collection.CollectionPersister; -import java.io.Serializable; - public final class CollectionRemoveAction extends CollectionAction { private boolean emptySnapshot; diff --git a/hibernate-core/src/main/java/org/hibernate/action/CollectionUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/action/CollectionUpdateAction.java index e9902dba2d..2a559c00ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/CollectionUpdateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/CollectionUpdateAction.java @@ -23,22 +23,20 @@ * */ package org.hibernate.action; - +import java.io.Serializable; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.event.PostCollectionUpdateEvent; -import org.hibernate.event.PreCollectionUpdateEvent; -import org.hibernate.event.PreCollectionUpdateEventListener; -import org.hibernate.event.EventSource; -import org.hibernate.event.PostCollectionUpdateEventListener; import org.hibernate.cache.CacheException; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.SessionImplementor; +import org.hibernate.event.EventSource; +import org.hibernate.event.PostCollectionUpdateEvent; +import org.hibernate.event.PostCollectionUpdateEventListener; +import org.hibernate.event.PreCollectionUpdateEvent; +import org.hibernate.event.PreCollectionUpdateEventListener; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; -import java.io.Serializable; - public final class CollectionUpdateAction extends CollectionAction { private final boolean emptySnapshot; diff --git a/hibernate-core/src/main/java/org/hibernate/action/DelayedPostInsertIdentifier.java b/hibernate-core/src/main/java/org/hibernate/action/DelayedPostInsertIdentifier.java index fa0c8d3013..e6c2bb2dfb 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/DelayedPostInsertIdentifier.java +++ b/hibernate-core/src/main/java/org/hibernate/action/DelayedPostInsertIdentifier.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.action; - +package org.hibernate.action; import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/action/EntityAction.java b/hibernate-core/src/main/java/org/hibernate/action/EntityAction.java index e3520fd12b..e7b2a29679 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/EntityAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/EntityAction.java @@ -23,17 +23,15 @@ * */ package org.hibernate.action; - +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.Serializable; import org.hibernate.AssertionFailure; import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.util.StringHelper; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.Serializable; - /** * Base class for actions relating to insert/update/delete of an entity * instance. diff --git a/hibernate-core/src/main/java/org/hibernate/action/EntityDeleteAction.java b/hibernate-core/src/main/java/org/hibernate/action/EntityDeleteAction.java index 77838cc304..35b5d3063c 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/EntityDeleteAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/EntityDeleteAction.java @@ -23,22 +23,19 @@ * */ package org.hibernate.action; - import java.io.Serializable; - import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.cache.CacheKey; import org.hibernate.cache.access.SoftLock; import org.hibernate.engine.EntityEntry; -import org.hibernate.engine.EntityKey; import org.hibernate.engine.PersistenceContext; import org.hibernate.engine.SessionImplementor; +import org.hibernate.event.EventSource; import org.hibernate.event.PostDeleteEvent; import org.hibernate.event.PostDeleteEventListener; import org.hibernate.event.PreDeleteEvent; import org.hibernate.event.PreDeleteEventListener; -import org.hibernate.event.EventSource; import org.hibernate.persister.entity.EntityPersister; public final class EntityDeleteAction extends EntityAction { diff --git a/hibernate-core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java b/hibernate-core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java index d9ab6cd914..dbb509841d 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java @@ -23,18 +23,16 @@ * */ package org.hibernate.action; - import java.io.Serializable; - -import org.hibernate.HibernateException; import org.hibernate.AssertionFailure; -import org.hibernate.engine.SessionImplementor; +import org.hibernate.HibernateException; import org.hibernate.engine.EntityKey; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.event.EventSource; import org.hibernate.event.PostInsertEvent; import org.hibernate.event.PostInsertEventListener; import org.hibernate.event.PreInsertEvent; import org.hibernate.event.PreInsertEventListener; -import org.hibernate.event.EventSource; import org.hibernate.persister.entity.EntityPersister; public final class EntityIdentityInsertAction extends EntityAction { diff --git a/hibernate-core/src/main/java/org/hibernate/action/EntityIncrementVersionProcess.java b/hibernate-core/src/main/java/org/hibernate/action/EntityIncrementVersionProcess.java index 1f8c0ec0a5..a25c2462df 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/EntityIncrementVersionProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/action/EntityIncrementVersionProcess.java @@ -22,9 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.action; - -import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.EntityEntry; +import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/action/EntityInsertAction.java b/hibernate-core/src/main/java/org/hibernate/action/EntityInsertAction.java index b97ac23b4b..3d6f39ce38 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/EntityInsertAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/EntityInsertAction.java @@ -23,9 +23,7 @@ * */ package org.hibernate.action; - import java.io.Serializable; - import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.cache.CacheKey; @@ -34,11 +32,11 @@ import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.Versioning; +import org.hibernate.event.EventSource; import org.hibernate.event.PostInsertEvent; import org.hibernate.event.PostInsertEventListener; import org.hibernate.event.PreInsertEvent; import org.hibernate.event.PreInsertEventListener; -import org.hibernate.event.EventSource; import org.hibernate.persister.entity.EntityPersister; public final class EntityInsertAction extends EntityAction { diff --git a/hibernate-core/src/main/java/org/hibernate/action/EntityUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/action/EntityUpdateAction.java index b4de6b09b4..9caa6978fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/EntityUpdateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/EntityUpdateAction.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.action; - import java.io.Serializable; - import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.cache.CacheException; @@ -36,11 +34,11 @@ import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.Status; import org.hibernate.engine.Versioning; +import org.hibernate.event.EventSource; import org.hibernate.event.PostUpdateEvent; import org.hibernate.event.PostUpdateEventListener; import org.hibernate.event.PreUpdateEvent; import org.hibernate.event.PreUpdateEventListener; -import org.hibernate.event.EventSource; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.TypeHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/action/EntityVerifyVersionProcess.java b/hibernate-core/src/main/java/org/hibernate/action/EntityVerifyVersionProcess.java index 150beb6313..f98949f06a 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/EntityVerifyVersionProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/action/EntityVerifyVersionProcess.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.action; - import org.hibernate.OptimisticLockException; import org.hibernate.engine.EntityEntry; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/action/Executable.java b/hibernate-core/src/main/java/org/hibernate/action/Executable.java index 7e7d8f4c8a..e76b1b4cdf 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/Executable.java +++ b/hibernate-core/src/main/java/org/hibernate/action/Executable.java @@ -23,10 +23,8 @@ * */ package org.hibernate.action; - -import org.hibernate.HibernateException; - import java.io.Serializable; +import org.hibernate.HibernateException; /** * An operation which may be scheduled for later execution. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AccessType.java b/hibernate-core/src/main/java/org/hibernate/annotations/AccessType.java index dbe399ed33..c2788ad972 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AccessType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AccessType.java @@ -22,14 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; /** * Property Access type diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Any.java b/hibernate-core/src/main/java/org/hibernate/annotations/Any.java index 01444e0be2..fc704413d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Any.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Any.java @@ -22,14 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import javax.persistence.Column; import javax.persistence.FetchType; -import static javax.persistence.FetchType.EAGER; /** * Define a ToOne association pointing to several entity types. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AnyMetaDef.java b/hibernate-core/src/main/java/org/hibernate/annotations/AnyMetaDef.java index e02d93b84f..6b98bc2ceb 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AnyMetaDef.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AnyMetaDef.java @@ -22,13 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; /** * Defines @Any and @manyToAny metadata diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/AnyMetaDefs.java b/hibernate-core/src/main/java/org/hibernate/annotations/AnyMetaDefs.java index 822d176131..b073779f1c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/AnyMetaDefs.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/AnyMetaDefs.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; /** * Defines @Any and @ManyToAny set of metadata. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java b/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java index 86686ca43d..5dab771680 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/BatchSize.java @@ -22,10 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.*; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java b/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java index c66764a344..6c4919607d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Cache.java @@ -22,10 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.*; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java b/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java index 015ea24a11..5a17cb737e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CacheConcurrencyStrategy.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import org.hibernate.cache.access.AccessType; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CacheModeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/CacheModeType.java index f364f36adf..4d346c8a61 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CacheModeType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CacheModeType.java @@ -23,6 +23,7 @@ */ package org.hibernate.annotations; + /** * Enumeration for the different interaction modes between the session and * the Level 2 Cache. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java b/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java index 892cff394e..e416224caf 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Cascade.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java index ecf7683970..0cf7b204fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CascadeType.java @@ -23,6 +23,7 @@ */ package org.hibernate.annotations; + /** * Cascade types (can override default EJB3 cascades */ diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Check.java b/hibernate-core/src/main/java/org/hibernate/annotations/Check.java index ca52611429..5c0c1f3373 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Check.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Check.java @@ -22,10 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.*; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java index 44add36425..87017960f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionId.java @@ -21,13 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.METHOD; +package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; import javax.persistence.Column; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionOfElements.java b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionOfElements.java index 758cd78025..e967b364ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/CollectionOfElements.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/CollectionOfElements.java @@ -22,14 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; import javax.persistence.FetchType; -import static javax.persistence.FetchType.LAZY; /** * Annotation used to mark a collection as a collection of elements or diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformer.java b/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformer.java index e37a8b11d4..c27af7f937 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformer.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import java.lang.annotation.Retention; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; /** * Custom SQL expression used to read the value from and write a value to a column. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformers.java b/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformers.java index 7793a9278b..216e9f3622 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformers.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ColumnTransformers.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import java.lang.annotation.Retention; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; /** * Plural annotation for @ColumnTransformer. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java b/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java index 3a180e59fe..4beb7496d1 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Columns.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; import javax.persistence.Column; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java index 6bb8954281..951d5ed6af 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorFormula.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java index fc58a751bd..7433f12553 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java @@ -23,12 +23,10 @@ */ // $Id$ package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; /** * Optional annotation to express Hibernate specific discrimintor properties. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Entity.java b/hibernate-core/src/main/java/org/hibernate/annotations/Entity.java index 4c32019092..19e277ec5a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Entity.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Entity.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Fetch.java b/hibernate-core/src/main/java/org/hibernate/annotations/Fetch.java index b811d6e434..afbeaa5ec6 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Fetch.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Fetch.java @@ -21,12 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - -import java.lang.annotation.Target; +package org.hibernate.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Define the fetching strategy used for the given association diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java b/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java index a6477b7ce1..703e8ecdc0 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FetchMode.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; +package org.hibernate.annotations; + /** * Fetch options on associations diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfile.java b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfile.java index f93d1022c7..67bfea9797 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfile.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfile.java @@ -24,14 +24,12 @@ // $Id$ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - +package org.hibernate.annotations; import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; /** * Define the fetching strategy profile. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfiles.java b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfiles.java index 70662a4ccd..f1109a10a9 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfiles.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FetchProfiles.java @@ -25,13 +25,11 @@ // $Id$ package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java b/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java index 3b9d3b8f49..443bedc6c3 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Filter.java @@ -22,10 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.*; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FilterDef.java b/hibernate-core/src/main/java/org/hibernate/annotations/FilterDef.java index 2db4ade40b..c84b106fc1 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FilterDef.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FilterDef.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FilterDefs.java b/hibernate-core/src/main/java/org/hibernate/annotations/FilterDefs.java index 996d6c633b..cb47b4bbbc 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FilterDefs.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FilterDefs.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTable.java b/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTable.java index c223ad5d40..599cb54872 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTable.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTable.java @@ -23,12 +23,11 @@ */ //$Id$ -package org.hibernate.annotations; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; +package org.hibernate.annotations; import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Add filters to a join table collection diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTables.java b/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTables.java index 299a04364d..568a37783e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTables.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FilterJoinTables.java @@ -21,12 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; +package org.hibernate.annotations; import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Add multiple @FilterJoinTable to a collection diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Filters.java b/hibernate-core/src/main/java/org/hibernate/annotations/Filters.java index 99567d7a76..10cabdcb62 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Filters.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Filters.java @@ -22,10 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.*; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java b/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java index c17c19358d..c50190b8b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java @@ -23,6 +23,7 @@ */ package org.hibernate.annotations; + /** * Enumeration extending javax.persistence flush modes. * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ForceDiscriminator.java b/hibernate-core/src/main/java/org/hibernate/annotations/ForceDiscriminator.java index 1e03fe26c6..ec9c7c3e3b 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ForceDiscriminator.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ForceDiscriminator.java @@ -21,8 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - +package org.hibernate.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java b/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java index 5234018a06..43b21f8692 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java @@ -21,13 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - +package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; @Target({FIELD, METHOD, TYPE}) diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java b/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java index 774dca5bab..2d566ad122 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Formula.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Generated.java b/hibernate-core/src/main/java/org/hibernate/annotations/Generated.java index 5f941e9bb1..0899c5f059 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Generated.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Generated.java @@ -21,12 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; +package org.hibernate.annotations; import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * The annotated property is generated by the database diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/GenerationTime.java b/hibernate-core/src/main/java/org/hibernate/annotations/GenerationTime.java index fee1690cd2..bf54b0ba6e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/GenerationTime.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/GenerationTime.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; +package org.hibernate.annotations; + /** * When should the generation occurs diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java b/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java index bc67710384..ced261ba14 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerator.java @@ -22,10 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.*; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PACKAGE; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerators.java b/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerators.java index 9c7e316e8e..786504ee71 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerators.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/GenericGenerators.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java b/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java index 6b138625a8..b3b100d07d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Immutable.java @@ -22,8 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** * Mark an Entity or a Collection as immutable. No annotation means the element is mutable. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Index.java b/hibernate-core/src/main/java/org/hibernate/annotations/Index.java index 971f25a58e..ea31cbe198 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Index.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Index.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java b/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java index 1e124b85cc..9fd5d1f26b 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/IndexColumn.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java index 035d39f016..1af8a72e67 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnOrFormula.java @@ -24,14 +24,11 @@ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; - import javax.persistence.JoinColumn; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java index ad8376514b..96e6316342 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JoinColumnsOrFormulas.java @@ -23,7 +23,6 @@ */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JoinFormula.java b/hibernate-core/src/main/java/org/hibernate/annotations/JoinFormula.java index 77e8db0c5e..80f2637c56 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/JoinFormula.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/JoinFormula.java @@ -23,11 +23,10 @@ */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/LazyCollection.java b/hibernate-core/src/main/java/org/hibernate/annotations/LazyCollection.java index 7a75d0949b..685edced72 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/LazyCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/LazyCollection.java @@ -21,12 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; +package org.hibernate.annotations; import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Define the lazy status of a collection diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/LazyCollectionOption.java b/hibernate-core/src/main/java/org/hibernate/annotations/LazyCollectionOption.java index 774aa78cf9..da06858880 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/LazyCollectionOption.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/LazyCollectionOption.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; +package org.hibernate.annotations; + /** * Lazy options available for a collection diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/LazyToOne.java b/hibernate-core/src/main/java/org/hibernate/annotations/LazyToOne.java index ca0cc5a191..a41e2ac4c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/LazyToOne.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/LazyToOne.java @@ -21,12 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - -import java.lang.annotation.Target; +package org.hibernate.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Define the lazy status of a ToOne association diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/LazyToOneOption.java b/hibernate-core/src/main/java/org/hibernate/annotations/LazyToOneOption.java index 7b36e8d8ea..b7b8df229b 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/LazyToOneOption.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/LazyToOneOption.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; +package org.hibernate.annotations; + /** * Lazy options available for a ToOne association diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Loader.java b/hibernate-core/src/main/java/org/hibernate/annotations/Loader.java index 799a8a9028..a18699414a 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Loader.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Loader.java @@ -22,12 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java b/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java index 3a08e5b92c..34c196f1da 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ManyToAny.java @@ -22,14 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.FIELD; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import javax.persistence.Column; import javax.persistence.FetchType; -import static javax.persistence.FetchType.EAGER; /** * Defined a ToMany association pointing to different entity types. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/MapKey.java b/hibernate-core/src/main/java/org/hibernate/annotations/MapKey.java index 6aa42dbf69..271119ba31 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/MapKey.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/MapKey.java @@ -21,13 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.METHOD; +package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; import javax.persistence.Column; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java index 50a998a3bf..b3582e65f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyManyToMany.java @@ -21,8 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - +package org.hibernate.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyType.java b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyType.java index 9bed4d8633..d1a04ef71e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/MapKeyType.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import java.lang.annotation.*; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; /** * Allows defining the type of the key of a persistent map. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/MetaValue.java b/hibernate-core/src/main/java/org/hibernate/annotations/MetaValue.java index dc07e0b5eb..d6fa60c89e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/MetaValue.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/MetaValue.java @@ -23,6 +23,7 @@ */ package org.hibernate.annotations; + /** * Represent a discriminator value associated to a given entity type * @author Emmanuel Bernard diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java index eaf240faf3..de31df87d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQueries.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java index 9ec2940c3d..2ac4110a2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedNativeQuery.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java index d83716d836..8f662481a9 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java index 84895b4690..3e1199cc12 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NamedQuery.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java index 9c4812d1e8..7a443e4131 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NotFound.java b/hibernate-core/src/main/java/org/hibernate/annotations/NotFound.java index f99f050e5e..91ddb81a45 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NotFound.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NotFound.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/NotFoundAction.java b/hibernate-core/src/main/java/org/hibernate/annotations/NotFoundAction.java index 1ce8838b57..c2fbb985f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/NotFoundAction.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/NotFoundAction.java @@ -23,6 +23,7 @@ */ package org.hibernate.annotations; + /** * Actoin to use when an element is not found in DB while beeing expected * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OnDelete.java b/hibernate-core/src/main/java/org/hibernate/annotations/OnDelete.java index 94c768f9e3..c1b09c7a14 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OnDelete.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OnDelete.java @@ -22,10 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.*; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OnDeleteAction.java b/hibernate-core/src/main/java/org/hibernate/annotations/OnDeleteAction.java index 7e806ad9d1..af53d0077d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OnDeleteAction.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OnDeleteAction.java @@ -23,6 +23,7 @@ */ package org.hibernate.annotations; + /** * Possible actions on deletes * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLock.java b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLock.java index acbcdcca66..407426008c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLock.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLock.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java index c75efc25f4..956148bf29 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OptimisticLockType.java @@ -23,6 +23,7 @@ */ package org.hibernate.annotations; + /** * Optimistic locking strategy * VERSION is the default and recommanded one diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java b/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java index 1e2cf4ff3c..63a0a56772 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/OrderBy.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ParamDef.java b/hibernate-core/src/main/java/org/hibernate/annotations/ParamDef.java index ac99188b4a..eac45018a9 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ParamDef.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ParamDef.java @@ -22,9 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Parameter.java b/hibernate-core/src/main/java/org/hibernate/annotations/Parameter.java index 4e0d527c38..a67c82be1d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Parameter.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Parameter.java @@ -22,9 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Parent.java b/hibernate-core/src/main/java/org/hibernate/annotations/Parent.java index 4fec66de8d..312f28183f 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Parent.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Parent.java @@ -21,12 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - +package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Persister.java b/hibernate-core/src/main/java/org/hibernate/annotations/Persister.java index 2cd0b60633..301fd14dfe 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Persister.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Persister.java @@ -22,8 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** * Specify a custom persister. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/PolymorphismType.java b/hibernate-core/src/main/java/org/hibernate/annotations/PolymorphismType.java index f671c25b30..3b59889690 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/PolymorphismType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/PolymorphismType.java @@ -23,6 +23,7 @@ */ package org.hibernate.annotations; + /** * Type of available polymorphism for a particular entity * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Proxy.java b/hibernate-core/src/main/java/org/hibernate/annotations/Proxy.java index 818e9564bf..c477054832 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Proxy.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Proxy.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java b/hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java index 25313bb84f..f0667636a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java @@ -23,6 +23,7 @@ */ package org.hibernate.annotations; + /** * Possible checks on Sql Insert, Delete, Update * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLDelete.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLDelete.java index 40a09c2e83..5cf0894c52 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLDelete.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLDelete.java @@ -22,12 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java index 7b8707e32f..5824e74702 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java @@ -21,12 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - +package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLInsert.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLInsert.java index 56ede9c2eb..0d1c54af69 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLInsert.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLInsert.java @@ -22,12 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdate.java b/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdate.java index cfa2989060..cbd7170f17 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdate.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdate.java @@ -22,12 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Sort.java b/hibernate-core/src/main/java/org/hibernate/annotations/Sort.java index 3224a7d3b8..32601a4318 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Sort.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Sort.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SortType.java b/hibernate-core/src/main/java/org/hibernate/annotations/SortType.java index 95aa59dbcf..b33c772189 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SortType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SortType.java @@ -23,6 +23,7 @@ */ package org.hibernate.annotations; + /** * Sort strategies * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Source.java b/hibernate-core/src/main/java/org/hibernate/annotations/Source.java index 30c8b64bb8..29ad68f924 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Source.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Source.java @@ -23,13 +23,11 @@ */ package org.hibernate.annotations; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; /** * Optional annotation in conjunction with {@link javax.persistence.Version} and timestamp version properties. diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/SourceType.java b/hibernate-core/src/main/java/org/hibernate/annotations/SourceType.java index 9bab2753da..0b3ea2fa70 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/SourceType.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/SourceType.java @@ -24,6 +24,7 @@ package org.hibernate.annotations; + /** * Where should Hibernate retrieve the value from? From the database, or from the current JVM? * diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Subselect.java b/hibernate-core/src/main/java/org/hibernate/annotations/Subselect.java index 493688930a..bb3979fd16 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Subselect.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Subselect.java @@ -21,11 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - +package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Synchronize.java b/hibernate-core/src/main/java/org/hibernate/annotations/Synchronize.java index 34528521a7..08c1a0d3a0 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Synchronize.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Synchronize.java @@ -21,11 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - +package org.hibernate.annotations; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Table.java b/hibernate-core/src/main/java/org/hibernate/annotations/Table.java index 49112871fe..59eceb365e 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Table.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Table.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Tables.java b/hibernate-core/src/main/java/org/hibernate/annotations/Tables.java index 4117944a8e..3dd44514ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Tables.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Tables.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Target.java b/hibernate-core/src/main/java/org/hibernate/annotations/Target.java index 59cefaa018..480b273161 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Target.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Target.java @@ -21,10 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; +package org.hibernate.annotations; import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizer.java b/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizer.java index 9629f6322f..740ae04229 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizer.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizer.java @@ -21,13 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - -import java.lang.annotation.*; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.TYPE; +package org.hibernate.annotations; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; /** * Define a tuplizer for an entity or a component diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizers.java b/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizers.java index b8357a708a..78924b842d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizers.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizers.java @@ -21,10 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - -import java.lang.annotation.Retention; +package org.hibernate.annotations; import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Type.java b/hibernate-core/src/main/java/org/hibernate/annotations/Type.java index 29e36c700d..9abfd8a03c 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Type.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Type.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/TypeDef.java b/hibernate-core/src/main/java/org/hibernate/annotations/TypeDef.java index 6333887b80..fbf28add8f 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/TypeDef.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/TypeDef.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/TypeDefs.java b/hibernate-core/src/main/java/org/hibernate/annotations/TypeDefs.java index 0174176df4..b735e79ffd 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/TypeDefs.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/TypeDefs.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; -import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Where.java b/hibernate-core/src/main/java/org/hibernate/annotations/Where.java index d4ded6e1f7..13d955a58d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Where.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/Where.java @@ -22,10 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.annotations; - -import static java.lang.annotation.ElementType.*; -import java.lang.annotation.Retention; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import java.lang.annotation.Retention; import java.lang.annotation.Target; /** diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/WhereJoinTable.java b/hibernate-core/src/main/java/org/hibernate/annotations/WhereJoinTable.java index 8fdd709d53..9b9adf3d7d 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/WhereJoinTable.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/WhereJoinTable.java @@ -21,12 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.annotations; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; +package org.hibernate.annotations; import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Where clause to add to the colleciton join table diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/AbstractClassTransformerImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/AbstractClassTransformerImpl.java index ae40f842a9..3068cb1794 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/AbstractClassTransformerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/AbstractClassTransformerImpl.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.bytecode; - +package org.hibernate.bytecode; +import java.security.ProtectionDomain; import org.hibernate.bytecode.util.ClassFilter; import org.hibernate.bytecode.util.FieldFilter; -import java.security.ProtectionDomain; - /** * Basic implementation of the {@link ClassTransformer} contract. * diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/BasicProxyFactory.java b/hibernate-core/src/main/java/org/hibernate/bytecode/BasicProxyFactory.java index a8b19d0b1c..f2668cd909 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/BasicProxyFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/BasicProxyFactory.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.bytecode; +package org.hibernate.bytecode; + /** * A proxy factory for "basic proxy" generation diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/BytecodeProvider.java b/hibernate-core/src/main/java/org/hibernate/bytecode/BytecodeProvider.java index 2ad9a349e7..df3ebcb881 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/BytecodeProvider.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/BytecodeProvider.java @@ -23,7 +23,6 @@ * */ package org.hibernate.bytecode; - import org.hibernate.bytecode.util.ClassFilter; import org.hibernate.bytecode.util.FieldFilter; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/ClassTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/ClassTransformer.java index 638f1ff5e2..e0831b61ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/ClassTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/ClassTransformer.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.bytecode; - +package org.hibernate.bytecode; import java.security.ProtectionDomain; /** diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/InstrumentedClassLoader.java b/hibernate-core/src/main/java/org/hibernate/bytecode/InstrumentedClassLoader.java index a04b2b07ab..b4a4948067 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/InstrumentedClassLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/InstrumentedClassLoader.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.bytecode; - -import org.hibernate.bytecode.util.ByteCodeHelper; - +package org.hibernate.bytecode; import java.io.InputStream; +import org.hibernate.bytecode.util.ByteCodeHelper; /** * A specialized classloader which performs bytecode enhancement on class diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/ProxyFactoryFactory.java b/hibernate-core/src/main/java/org/hibernate/bytecode/ProxyFactoryFactory.java index fed4288e76..600e1219c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/ProxyFactoryFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/ProxyFactoryFactory.java @@ -23,7 +23,6 @@ * */ package org.hibernate.bytecode; - import org.hibernate.proxy.ProxyFactory; /** diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/ReflectionOptimizer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/ReflectionOptimizer.java index 986bab152f..1cf3cc1370 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/ReflectionOptimizer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/ReflectionOptimizer.java @@ -24,6 +24,7 @@ */ package org.hibernate.bytecode; + /** * Represents reflection optimization for a particular class. * diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java index 0e7e4ecc95..b982e60173 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/AbstractInstrumenter.java @@ -23,25 +23,24 @@ */ package org.hibernate.bytecode.buildtime; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import java.util.HashSet; +import java.util.zip.CRC32; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; -import java.util.zip.CRC32; -import java.io.File; -import java.io.DataInputStream; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.FileInputStream; -import java.io.OutputStream; -import java.io.FileOutputStream; - +import org.hibernate.bytecode.ClassTransformer; import org.hibernate.bytecode.util.ByteCodeHelper; import org.hibernate.bytecode.util.ClassDescriptor; import org.hibernate.bytecode.util.FieldFilter; -import org.hibernate.bytecode.ClassTransformer; /** * Provides the basic templating of how instrumentation should occur. diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java index 4c79c84b19..42b8e6cabe 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/CGLIBInstrumenter.java @@ -23,16 +23,15 @@ */ package org.hibernate.bytecode.buildtime; -import java.util.Set; import java.io.ByteArrayInputStream; - -import org.hibernate.bytecode.util.ClassDescriptor; -import org.hibernate.bytecode.util.BasicClassFilter; -import org.hibernate.bytecode.ClassTransformer; -import org.hibernate.bytecode.cglib.BytecodeProviderImpl; -import org.objectweb.asm.ClassReader; +import java.util.Set; import net.sf.cglib.core.ClassNameReader; import net.sf.cglib.transform.impl.InterceptFieldEnabled; +import org.hibernate.bytecode.ClassTransformer; +import org.hibernate.bytecode.cglib.BytecodeProviderImpl; +import org.hibernate.bytecode.util.BasicClassFilter; +import org.hibernate.bytecode.util.ClassDescriptor; +import org.objectweb.asm.ClassReader; /** * Strategy for performing build-time instrumentation of persistent classes in order to enable @@ -50,11 +49,13 @@ public CGLIBInstrumenter(Logger logger, Options options) { super( logger, options ); } - protected ClassDescriptor getClassDescriptor(byte[] byecode) throws Exception { + @Override + protected ClassDescriptor getClassDescriptor(byte[] byecode) throws Exception { return new CustomClassDescriptor( byecode ); } - protected ClassTransformer getClassTransformer(ClassDescriptor descriptor, Set classNames) { + @Override + protected ClassTransformer getClassTransformer(ClassDescriptor descriptor, Set classNames) { if ( descriptor.isInstrumented() ) { logger.debug( "class [" + descriptor.getName() + "] already instrumented" ); return null; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/ExecutionException.java b/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/ExecutionException.java index 014c3133f3..45dea0b68e 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/ExecutionException.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/ExecutionException.java @@ -23,6 +23,7 @@ */ package org.hibernate.bytecode.buildtime; + /** * Indicates problem performing the instrumentation execution. * diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/Instrumenter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/Instrumenter.java index a0768d056a..b89107f6ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/Instrumenter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/Instrumenter.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.bytecode.buildtime; - import java.util.Set; /** diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/JavassistInstrumenter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/JavassistInstrumenter.java index 1eea437450..0acef33731 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/JavassistInstrumenter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/buildtime/JavassistInstrumenter.java @@ -23,18 +23,16 @@ */ package org.hibernate.bytecode.buildtime; -import java.util.Set; -import java.io.IOException; -import java.io.DataInputStream; import java.io.ByteArrayInputStream; - +import java.io.DataInputStream; +import java.io.IOException; +import java.util.Set; import javassist.bytecode.ClassFile; - -import org.hibernate.bytecode.util.ClassDescriptor; -import org.hibernate.bytecode.util.BasicClassFilter; import org.hibernate.bytecode.ClassTransformer; import org.hibernate.bytecode.javassist.BytecodeProviderImpl; import org.hibernate.bytecode.javassist.FieldHandled; +import org.hibernate.bytecode.util.BasicClassFilter; +import org.hibernate.bytecode.util.ClassDescriptor; /** * Strategy for performing build-time instrumentation of persistent classes in order to enable @@ -53,11 +51,13 @@ public JavassistInstrumenter(Logger logger, Options options) { super( logger, options ); } - protected ClassDescriptor getClassDescriptor(byte[] bytecode) throws IOException { + @Override + protected ClassDescriptor getClassDescriptor(byte[] bytecode) throws IOException { return new CustomClassDescriptor( bytecode ); } - protected ClassTransformer getClassTransformer(ClassDescriptor descriptor, Set classNames) { + @Override + protected ClassTransformer getClassTransformer(ClassDescriptor descriptor, Set classNames) { if ( descriptor.isInstrumented() ) { logger.debug( "class [" + descriptor.getName() + "] already instrumented" ); return null; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java index 77491334f6..e53465eaad 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java @@ -23,16 +23,14 @@ * */ package org.hibernate.bytecode.cglib; - -import org.hibernate.bytecode.ReflectionOptimizer; -import org.hibernate.PropertyAccessException; -import net.sf.cglib.beans.BulkBean; -import net.sf.cglib.beans.BulkBeanException; - -import java.io.Serializable; -import java.io.ObjectOutputStream; import java.io.IOException; import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import net.sf.cglib.beans.BulkBean; +import net.sf.cglib.beans.BulkBeanException; +import org.hibernate.PropertyAccessException; +import org.hibernate.bytecode.ReflectionOptimizer; /** * The {@link ReflectionOptimizer.AccessOptimizer} implementation for CGLIB diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java index 0051d7a9d5..c8ea796dfd 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java @@ -23,17 +23,17 @@ * */ package org.hibernate.bytecode.cglib; - import java.lang.reflect.Modifier; import net.sf.cglib.beans.BulkBean; import net.sf.cglib.beans.BulkBeanException; import net.sf.cglib.reflect.FastClass; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.bytecode.BytecodeProvider; import org.hibernate.bytecode.ProxyFactoryFactory; import org.hibernate.bytecode.ReflectionOptimizer; import org.hibernate.bytecode.util.FieldFilter; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Bytecode provider implementation for CGLIB. @@ -45,7 +45,7 @@ @Deprecated public class BytecodeProviderImpl implements BytecodeProvider { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, BytecodeProviderImpl.class.getName()); public BytecodeProviderImpl() { LOG.deprecated(); @@ -82,11 +82,15 @@ public ReflectionOptimizer getReflectionOptimizer( if (LOG.isDebugEnabled()) { int index = 0; if (t instanceof BulkBeanException) index = ((BulkBeanException)t).getIndex(); - if (index >= 0) LOG.debug("Reflection optimizer disabled for: " + clazz.getName() + " [" - + StringHelper.unqualify(t.getClass().getName()) + ": " + t.getMessage() + " (property " - + setterNames[index] + ")"); - else LOG.debug("Reflection optimizer disabled for: " + clazz.getName() + " [" - + StringHelper.unqualify(t.getClass().getName()) + ": " + t.getMessage()); + if (index >= 0) LOG.debugf("Reflection optimizer disabled for: %s [%s: %s (property %s)", + clazz.getName(), + StringHelper.unqualify(t.getClass().getName()), + t.getMessage(), + setterNames[index]); + else LOG.debugf("Reflection optimizer disabled for: %s [%s: %s", + clazz.getName(), + StringHelper.unqualify(t.getClass().getName()), + t.getMessage()); } } diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java index c48321e1b1..b72aa1a60e 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.bytecode.cglib; - +package org.hibernate.bytecode.cglib; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -37,10 +36,11 @@ import net.sf.cglib.transform.impl.InterceptFieldFilter; import net.sf.cglib.transform.impl.InterceptFieldTransformer; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.bytecode.AbstractClassTransformerImpl; import org.hibernate.bytecode.util.ClassFilter; import org.hibernate.bytecode.util.FieldFilter; +import org.jboss.logging.Logger; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Type; @@ -56,7 +56,7 @@ @Deprecated public class CglibClassTransformer extends AbstractClassTransformerImpl { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, CglibClassTransformer.class.getName()); public CglibClassTransformer(ClassFilter classFilter, FieldFilter fieldFilter) { super( classFilter, fieldFilter ); @@ -82,7 +82,7 @@ protected byte[] doTransform( ClassWriter w = new DebuggingClassWriter( ClassWriter.COMPUTE_MAXS ); ClassTransformer t = getClassTransformer( names ); if ( t != null ) { - LOG.debug("Enhancing " + className); + LOG.debugf("Enhancing %s", className); ByteArrayOutputStream out; byte[] result; try { diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java index 1773e3a40d..b49b6ff2ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java @@ -23,15 +23,13 @@ * */ package org.hibernate.bytecode.cglib; - -import org.hibernate.bytecode.ReflectionOptimizer; -import net.sf.cglib.reflect.FastClass; -import org.hibernate.InstantiationException; - -import java.io.Serializable; -import java.io.ObjectOutputStream; import java.io.IOException; import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import net.sf.cglib.reflect.FastClass; +import org.hibernate.InstantiationException; +import org.hibernate.bytecode.ReflectionOptimizer; /** * The {@link ReflectionOptimizer.InstantiationOptimizer} implementation for CGLIB diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java index 4e5ae150f6..5e93aaa224 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java @@ -23,23 +23,21 @@ * */ package org.hibernate.bytecode.cglib; - -import org.hibernate.bytecode.ProxyFactoryFactory; -import org.hibernate.bytecode.BasicProxyFactory; -import org.hibernate.proxy.ProxyFactory; -import org.hibernate.proxy.pojo.cglib.CGLIBProxyFactory; -import org.hibernate.AssertionFailure; -import org.hibernate.HibernateException; -import net.sf.cglib.proxy.Enhancer; +import java.lang.reflect.Method; +import java.util.HashMap; +import net.sf.cglib.proxy.Callback; import net.sf.cglib.proxy.CallbackFilter; +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.proxy.Factory; import net.sf.cglib.proxy.MethodInterceptor; import net.sf.cglib.proxy.MethodProxy; import net.sf.cglib.proxy.NoOp; -import net.sf.cglib.proxy.Callback; -import net.sf.cglib.proxy.Factory; - -import java.lang.reflect.Method; -import java.util.HashMap; +import org.hibernate.AssertionFailure; +import org.hibernate.HibernateException; +import org.hibernate.bytecode.BasicProxyFactory; +import org.hibernate.bytecode.ProxyFactoryFactory; +import org.hibernate.proxy.ProxyFactory; +import org.hibernate.proxy.pojo.cglib.CGLIBProxyFactory; /** * A factory for CGLIB-based {@link ProxyFactory} instances. diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java index 950d0f7172..1f0fa0b267 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/ReflectionOptimizerImpl.java @@ -23,10 +23,8 @@ * */ package org.hibernate.bytecode.cglib; - -import org.hibernate.bytecode.ReflectionOptimizer; - import java.io.Serializable; +import org.hibernate.bytecode.ReflectionOptimizer; /** * ReflectionOptimizer implementation for CGLIB. diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java index 7ca1015af1..4e1fceeed8 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/AccessOptimizerAdapter.java @@ -23,11 +23,9 @@ * */ package org.hibernate.bytecode.javassist; - -import org.hibernate.bytecode.ReflectionOptimizer; -import org.hibernate.PropertyAccessException; - import java.io.Serializable; +import org.hibernate.PropertyAccessException; +import org.hibernate.bytecode.ReflectionOptimizer; /** * The {@link ReflectionOptimizer.AccessOptimizer} implementation for Javassist diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessor.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessor.java index bdea43536c..49538e8c87 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessor.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessor.java @@ -23,7 +23,6 @@ * */ package org.hibernate.bytecode.javassist; - import java.io.Serializable; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessorException.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessorException.java index 262e5967f0..2d52d27b72 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessorException.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessorException.java @@ -24,6 +24,7 @@ */ package org.hibernate.bytecode.javassist; + /** * An exception thrown while generating a bulk accessor. * diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessorFactory.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessorFactory.java index da237cd640..add1fee09b 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessorFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BulkAccessorFactory.java @@ -23,11 +23,9 @@ * */ package org.hibernate.bytecode.javassist; - import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.security.ProtectionDomain; - import javassist.CannotCompileException; import javassist.bytecode.AccessFlag; import javassist.bytecode.Bytecode; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java index a159463c3a..d9d1c2ad43 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/BytecodeProviderImpl.java @@ -23,9 +23,8 @@ * */ package org.hibernate.bytecode.javassist; - import java.lang.reflect.Modifier; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.bytecode.BytecodeProvider; import org.hibernate.bytecode.ClassTransformer; import org.hibernate.bytecode.ProxyFactoryFactory; @@ -33,6 +32,7 @@ import org.hibernate.bytecode.util.ClassFilter; import org.hibernate.bytecode.util.FieldFilter; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Bytecode provider implementation for Javassist. @@ -41,7 +41,7 @@ */ public class BytecodeProviderImpl implements BytecodeProvider { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, BytecodeProviderImpl.class.getName()); public ProxyFactoryFactory getProxyFactoryFactory() { return new ProxyFactoryFactoryImpl(); @@ -74,11 +74,15 @@ public ReflectionOptimizer getReflectionOptimizer( if (LOG.isDebugEnabled()) { int index = 0; if (t instanceof BulkAccessorException) index = ((BulkAccessorException)t).getIndex(); - if (index >= 0) LOG.debug("Reflection optimizer disabled for: " + clazz.getName() + " [" - + StringHelper.unqualify(t.getClass().getName()) + ": " + t.getMessage() + " (property " - + setterNames[index] + ")"); - else LOG.debug("Reflection optimizer disabled for: " + clazz.getName() + " [" - + StringHelper.unqualify(t.getClass().getName()) + ": " + t.getMessage()); + if (index >= 0) LOG.debugf("Reflection optimizer disabled for: %s [%s: %s (property %s)", + clazz.getName(), + StringHelper.unqualify(t.getClass().getName()), + t.getMessage(), + setterNames[index]); + else LOG.debugf("Reflection optimizer disabled for: %s [%s: %s", + clazz.getName(), + StringHelper.unqualify(t.getClass().getName()), + t.getMessage()); } } diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FastClass.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FastClass.java index 2252fbaaba..a9b3693d20 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FastClass.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FastClass.java @@ -23,12 +23,11 @@ * */ package org.hibernate.bytecode.javassist; - +import java.io.Serializable; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.io.Serializable; /** * @author Muga Nishizawa diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldFilter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldFilter.java index 299359c33f..788daafa42 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldFilter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldFilter.java @@ -24,6 +24,7 @@ */ package org.hibernate.bytecode.javassist; + /** * Contract for deciding whether fields should be read and/or write intercepted. * diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldHandled.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldHandled.java index 83ad9a0568..29b9630679 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldHandled.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldHandled.java @@ -24,6 +24,7 @@ */ package org.hibernate.bytecode.javassist; + /** * Interface introduced to the enhanced class in order to be able to * inject a {@link FieldHandler} to define the interception behavior. diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldHandler.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldHandler.java index 5adaabc453..382bd9793d 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldHandler.java @@ -24,6 +24,7 @@ */ package org.hibernate.bytecode.javassist; + /** * The interface defining how interception of a field should be handled. * diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldTransformer.java index bbf0ee153f..9b70c29970 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/FieldTransformer.java @@ -23,7 +23,6 @@ * */ package org.hibernate.bytecode.javassist; - import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; @@ -31,7 +30,6 @@ import java.io.FileOutputStream; import java.util.Iterator; import java.util.List; - import javassist.CannotCompileException; import javassist.bytecode.AccessFlag; import javassist.bytecode.BadBytecode; diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java index 6b2ce91146..ee6248f66d 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/InstantiationOptimizerAdapter.java @@ -23,11 +23,9 @@ * */ package org.hibernate.bytecode.javassist; - -import org.hibernate.bytecode.ReflectionOptimizer; -import org.hibernate.InstantiationException; - import java.io.Serializable; +import org.hibernate.InstantiationException; +import org.hibernate.bytecode.ReflectionOptimizer; /** * The {@link ReflectionOptimizer.InstantiationOptimizer} implementation for Javassist diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java index 936b114c9f..224240eb23 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/JavassistClassTransformer.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.bytecode.javassist; - +package org.hibernate.bytecode.javassist; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -32,9 +31,10 @@ import java.security.ProtectionDomain; import javassist.bytecode.ClassFile; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.bytecode.AbstractClassTransformerImpl; import org.hibernate.bytecode.util.ClassFilter; +import org.jboss.logging.Logger; /** * Enhance the classes allowing them to implements InterceptFieldEnabled @@ -45,7 +45,8 @@ */ public class JavassistClassTransformer extends AbstractClassTransformerImpl { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + JavassistClassTransformer.class.getName()); public JavassistClassTransformer(ClassFilter classFilter, org.hibernate.bytecode.util.FieldFilter fieldFilter) { super( classFilter, fieldFilter ); @@ -69,7 +70,7 @@ protected byte[] doTransform( } FieldTransformer transformer = getFieldTransformer( classfile ); if ( transformer != null ) { - LOG.debug("Enhancing " + className); + LOG.debugf("Enhancing %s", className); DataOutputStream out = null; try { transformer.transform( classfile ); diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/ProxyFactoryFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/ProxyFactoryFactoryImpl.java index c2366100d7..a43dcc4d85 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/ProxyFactoryFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/ProxyFactoryFactoryImpl.java @@ -23,19 +23,17 @@ * */ package org.hibernate.bytecode.javassist; - -import org.hibernate.bytecode.ProxyFactoryFactory; -import org.hibernate.bytecode.BasicProxyFactory; -import org.hibernate.proxy.ProxyFactory; -import org.hibernate.proxy.pojo.javassist.JavassistProxyFactory; -import org.hibernate.AssertionFailure; -import org.hibernate.HibernateException; -import javassist.util.proxy.MethodFilter; -import javassist.util.proxy.ProxyObject; -import javassist.util.proxy.MethodHandler; - import java.lang.reflect.Method; import java.util.HashMap; +import javassist.util.proxy.MethodFilter; +import javassist.util.proxy.MethodHandler; +import javassist.util.proxy.ProxyObject; +import org.hibernate.AssertionFailure; +import org.hibernate.HibernateException; +import org.hibernate.bytecode.BasicProxyFactory; +import org.hibernate.bytecode.ProxyFactoryFactory; +import org.hibernate.proxy.ProxyFactory; +import org.hibernate.proxy.pojo.javassist.JavassistProxyFactory; /** * A factory for Javassist-based {@link ProxyFactory} instances. diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/ReflectionOptimizerImpl.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/ReflectionOptimizerImpl.java index 12a46323c9..034c8a1f16 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/ReflectionOptimizerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/ReflectionOptimizerImpl.java @@ -23,10 +23,8 @@ * */ package org.hibernate.bytecode.javassist; - -import org.hibernate.bytecode.ReflectionOptimizer; - import java.io.Serializable; +import org.hibernate.bytecode.ReflectionOptimizer; /** * ReflectionOptimizer implementation for Javassist. diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/TransformingClassLoader.java b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/TransformingClassLoader.java index 64365fe296..25d19d303d 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/TransformingClassLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/javassist/TransformingClassLoader.java @@ -22,15 +22,13 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.bytecode.javassist; - -import javassist.ClassPool; -import javassist.NotFoundException; -import javassist.CtClass; -import javassist.CannotCompileException; -import org.hibernate.HibernateException; - +package org.hibernate.bytecode.javassist; import java.io.IOException; +import javassist.CannotCompileException; +import javassist.ClassPool; +import javassist.CtClass; +import javassist.NotFoundException; +import org.hibernate.HibernateException; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java index fa3779eb66..e7ec152366 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/util/BasicClassFilter.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.bytecode.util; - -import java.util.Set; +package org.hibernate.bytecode.util; import java.util.HashSet; +import java.util.Set; /** * BasicClassFilter provides class filtering based on a series of packages to diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/util/ByteCodeHelper.java b/hibernate-core/src/main/java/org/hibernate/bytecode/util/ByteCodeHelper.java index 72eee0f155..84b548bf55 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/util/ByteCodeHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/util/ByteCodeHelper.java @@ -21,14 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.bytecode.util; - -import java.io.InputStream; -import java.io.IOException; +package org.hibernate.bytecode.util; +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; -import java.io.ByteArrayOutputStream; -import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; import java.util.zip.ZipInputStream; /** diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/util/ClassDescriptor.java b/hibernate-core/src/main/java/org/hibernate/bytecode/util/ClassDescriptor.java index e5a787dee9..88f0af867d 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/util/ClassDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/util/ClassDescriptor.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.bytecode.util; +package org.hibernate.bytecode.util; + /** * Contract describing the information Hibernate needs in terms of instrumenting diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/util/ClassFilter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/util/ClassFilter.java index ff94c3a1ba..be10a28d46 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/util/ClassFilter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/util/ClassFilter.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.bytecode.util; +package org.hibernate.bytecode.util; + /** * Used to determine whether a class should be instrumented. diff --git a/hibernate-core/src/main/java/org/hibernate/bytecode/util/FieldFilter.java b/hibernate-core/src/main/java/org/hibernate/bytecode/util/FieldFilter.java index 2a5f4df981..b62f531d0d 100644 --- a/hibernate-core/src/main/java/org/hibernate/bytecode/util/FieldFilter.java +++ b/hibernate-core/src/main/java/org/hibernate/bytecode/util/FieldFilter.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.bytecode.util; +package org.hibernate.bytecode.util; + /** * Used to determine whether a field reference should be instrumented. diff --git a/hibernate-core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java b/hibernate-core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java index 4163d6b795..b44054f07d 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java @@ -23,15 +23,15 @@ * */ package org.hibernate.cache; - import java.util.Properties; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cfg.Environment; import org.hibernate.internal.util.jndi.JndiHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Support for CacheProvider implementations which are backed by caches bound @@ -41,7 +41,8 @@ */ public abstract class AbstractJndiBoundCacheProvider implements CacheProvider { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + AbstractJndiBoundCacheProvider.class.getName()); private Object cache; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/Cache.java b/hibernate-core/src/main/java/org/hibernate/cache/Cache.java index 34da482a5e..54fcb4ef71 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/Cache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/Cache.java @@ -23,7 +23,6 @@ * */ package org.hibernate.cache; - import java.util.Map; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/CacheConcurrencyStrategy.java b/hibernate-core/src/main/java/org/hibernate/cache/CacheConcurrencyStrategy.java index ffc1ace587..eab56424fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/CacheConcurrencyStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/CacheConcurrencyStrategy.java @@ -23,9 +23,7 @@ * */ package org.hibernate.cache; - import java.util.Comparator; - import org.hibernate.cache.access.SoftLock; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/CacheDataDescription.java b/hibernate-core/src/main/java/org/hibernate/cache/CacheDataDescription.java index a288b30311..097e2c6449 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/CacheDataDescription.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/CacheDataDescription.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache; - +package org.hibernate.cache; import java.util.Comparator; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/CacheException.java b/hibernate-core/src/main/java/org/hibernate/cache/CacheException.java index 226b776fc9..3505e41ec8 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/CacheException.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/CacheException.java @@ -23,7 +23,6 @@ * */ package org.hibernate.cache; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/CacheKey.java b/hibernate-core/src/main/java/org/hibernate/cache/CacheKey.java index 167a31de4e..aa9c5eaab9 100755 --- a/hibernate-core/src/main/java/org/hibernate/cache/CacheKey.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/CacheKey.java @@ -23,9 +23,7 @@ * */ package org.hibernate.cache; - import java.io.Serializable; - import org.hibernate.EntityMode; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/CacheProvider.java b/hibernate-core/src/main/java/org/hibernate/cache/CacheProvider.java index b3bd93957a..6f93922c82 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/CacheProvider.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/CacheProvider.java @@ -23,7 +23,6 @@ * */ package org.hibernate.cache; - import java.util.Properties; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/CollectionRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/CollectionRegion.java index c955de1692..21a612e0c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/CollectionRegion.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/CollectionRegion.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache; - -import org.hibernate.cache.access.CollectionRegionAccessStrategy; +package org.hibernate.cache; import org.hibernate.cache.access.AccessType; +import org.hibernate.cache.access.CollectionRegionAccessStrategy; /** * Defines the contract for a cache region which will specifically be used to diff --git a/hibernate-core/src/main/java/org/hibernate/cache/EntityRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/EntityRegion.java index a999a3347c..626cadcdbf 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/EntityRegion.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/EntityRegion.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache; - -import org.hibernate.cache.access.EntityRegionAccessStrategy; +package org.hibernate.cache; import org.hibernate.cache.access.AccessType; +import org.hibernate.cache.access.EntityRegionAccessStrategy; /** * Defines the contract for a cache region which will specifically be used to diff --git a/hibernate-core/src/main/java/org/hibernate/cache/FilterKey.java b/hibernate-core/src/main/java/org/hibernate/cache/FilterKey.java index 022b46311d..324b6b84b7 100755 --- a/hibernate-core/src/main/java/org/hibernate/cache/FilterKey.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/FilterKey.java @@ -23,14 +23,12 @@ * */ package org.hibernate.cache; - import java.io.Serializable; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; - import org.hibernate.EntityMode; import org.hibernate.engine.TypedValue; import org.hibernate.impl.FilterImpl; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/GeneralDataRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/GeneralDataRegion.java index 22663b06d7..0f593a8ce7 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/GeneralDataRegion.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/GeneralDataRegion.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache; +package org.hibernate.cache; + /** * Contract for general-purpose cache regions. diff --git a/hibernate-core/src/main/java/org/hibernate/cache/HashtableCache.java b/hibernate-core/src/main/java/org/hibernate/cache/HashtableCache.java index 25e73d4f77..f95b2bded4 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/HashtableCache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/HashtableCache.java @@ -23,10 +23,8 @@ * */ package org.hibernate.cache; - import java.util.Collections; import java.util.Hashtable; - import java.util.Map; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/HashtableCacheProvider.java b/hibernate-core/src/main/java/org/hibernate/cache/HashtableCacheProvider.java index 1327e5d3c4..a652778899 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/HashtableCacheProvider.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/HashtableCacheProvider.java @@ -23,7 +23,6 @@ * */ package org.hibernate.cache; - import java.util.Properties; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/NoCacheProvider.java b/hibernate-core/src/main/java/org/hibernate/cache/NoCacheProvider.java index 64059d6753..0f3e058023 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/NoCacheProvider.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/NoCacheProvider.java @@ -23,7 +23,6 @@ * */ package org.hibernate.cache; - import java.util.Properties; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/NoCachingEnabledException.java b/hibernate-core/src/main/java/org/hibernate/cache/NoCachingEnabledException.java index 76962cd0b5..a132226a48 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/NoCachingEnabledException.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/NoCachingEnabledException.java @@ -23,7 +23,6 @@ * */ package org.hibernate.cache; - import org.hibernate.cfg.Environment; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java b/hibernate-core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java index 850891b444..f23f7f8e81 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java @@ -23,10 +23,10 @@ * */ package org.hibernate.cache; - import java.util.Comparator; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cache.access.SoftLock; +import org.jboss.logging.Logger; /** * Caches data that is sometimes updated without ever locking the cache. @@ -40,7 +40,8 @@ */ public class NonstrictReadWriteCache implements CacheConcurrencyStrategy { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + NonstrictReadWriteCache.class.getName()); private Cache cache; @@ -59,11 +60,11 @@ public Cache getCache() { * Get the most recent version, if available. */ public Object get(Object key, long txTimestamp) throws CacheException { - LOG.debug("Cache lookup: " + key); + LOG.debugf("Cache lookup: %s", key); Object result = cache.get( key ); - if (result != null) LOG.debug("Cache hit: " + key); - else LOG.debug("Cache miss: " + key); + if (result != null) LOG.debugf("Cache hit: %s", key); + else LOG.debugf("Cache miss: %s", key); return result; } @@ -78,10 +79,10 @@ public boolean put( Comparator versionComparator, boolean minimalPut) throws CacheException { if ( minimalPut && cache.get( key ) != null ) { - LOG.debug("Item already cached: " + key); + LOG.debugf("Item already cached: %s", key); return false; } - LOG.debug("Caching: " + key); + LOG.debugf("Caching: %s", key); cache.put( key, value ); return true; @@ -98,12 +99,12 @@ public SoftLock lock(Object key, Object version) throws CacheException { } public void remove(Object key) throws CacheException { - LOG.debug("Removing: " + key); + LOG.debugf("Removing: %s", key); cache.remove( key ); } public void clear() throws CacheException { - LOG.debug("Clearing"); + LOG.debugf("Clearing"); cache.clear(); } @@ -120,7 +121,7 @@ public void destroy() { * Invalidate the item */ public void evict(Object key) throws CacheException { - LOG.debug("Invalidating: " + key); + LOG.debugf("Invalidating: %s", key); cache.remove( key ); } @@ -143,7 +144,7 @@ public boolean update(Object key, Object value, Object currentVersion, Object pr * Invalidate the item (again, for safety). */ public void release(Object key, SoftLock lock) throws CacheException { - LOG.debug("Invalidating: " + key); + LOG.debugf("Invalidating: %s", key); cache.remove( key ); } diff --git a/hibernate-core/src/main/java/org/hibernate/cache/OptimisticCache.java b/hibernate-core/src/main/java/org/hibernate/cache/OptimisticCache.java index ceb3a39674..c9e63c0668 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/OptimisticCache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/OptimisticCache.java @@ -24,6 +24,7 @@ */ package org.hibernate.cache; + /** * A contract for transactional cache implementations which support * optimistic locking of items within the cache. diff --git a/hibernate-core/src/main/java/org/hibernate/cache/OptimisticCacheSource.java b/hibernate-core/src/main/java/org/hibernate/cache/OptimisticCacheSource.java index e9d6c5ba98..9ac3d1cd54 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/OptimisticCacheSource.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/OptimisticCacheSource.java @@ -23,7 +23,6 @@ * */ package org.hibernate.cache; - import java.util.Comparator; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/QueryCache.java b/hibernate-core/src/main/java/org/hibernate/cache/QueryCache.java index 9dea6fdd72..91a2ae0d13 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/QueryCache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/QueryCache.java @@ -23,10 +23,8 @@ * */ package org.hibernate.cache; - import java.util.List; import java.util.Set; - import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/QueryCacheFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/QueryCacheFactory.java index 4f6d07c2ea..b9f239dd1b 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/QueryCacheFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/QueryCacheFactory.java @@ -23,12 +23,10 @@ * */ package org.hibernate.cache; - +import java.util.Properties; import org.hibernate.HibernateException; import org.hibernate.cfg.Settings; -import java.util.Properties; - /** * Defines a factory for query cache instances. These factories are responsible for * creating individual QueryCache instances. diff --git a/hibernate-core/src/main/java/org/hibernate/cache/QueryKey.java b/hibernate-core/src/main/java/org/hibernate/cache/QueryKey.java index 6dfa6125df..df790d5187 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/QueryKey.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/QueryKey.java @@ -22,23 +22,20 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cache; - -import java.io.Serializable; import java.io.IOException; +import java.io.Serializable; +import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.Iterator; - import org.hibernate.EntityMode; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.RowSelection; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.TypedValue; import org.hibernate.transform.CacheableResultTransformer; -import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; -import org.hibernate.util.EqualsHelper; import org.hibernate.util.CollectionHelper; +import org.hibernate.util.EqualsHelper; /** * A key that identifies a particular query with bound parameter values. This is the object Hibernate uses diff --git a/hibernate-core/src/main/java/org/hibernate/cache/QueryResultsRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/QueryResultsRegion.java index f8226e61d1..7dc528028f 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/QueryResultsRegion.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/QueryResultsRegion.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache; +package org.hibernate.cache; + /** * Defines the contract for a cache region which will specifically be used to diff --git a/hibernate-core/src/main/java/org/hibernate/cache/ReadOnlyCache.java b/hibernate-core/src/main/java/org/hibernate/cache/ReadOnlyCache.java index e105af92be..b1b6ac37d2 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/ReadOnlyCache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/ReadOnlyCache.java @@ -23,10 +23,10 @@ * */ package org.hibernate.cache; - import java.util.Comparator; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cache.access.SoftLock; +import org.jboss.logging.Logger; /** * Caches data that is never updated. @@ -34,7 +34,7 @@ */ public class ReadOnlyCache implements CacheConcurrencyStrategy { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, ReadOnlyCache.class.getName()); private Cache cache; @@ -54,7 +54,7 @@ public String getRegionName() { public synchronized Object get(Object key, long timestamp) throws CacheException { Object result = cache.get(key); - if (result != null) LOG.debug("Cache hit: " + key); + if (result != null) LOG.debugf("Cache hit: %s", key); return result; } @@ -75,10 +75,10 @@ public synchronized boolean put( boolean minimalPut) throws CacheException { if ( minimalPut && cache.get(key)!=null ) { - LOG.debug("Item already cached: " + key); + LOG.debugf("Item already cached: %s", key); return false; } - LOG.debug("Caching: " + key); + LOG.debugf("Caching: %s", key); cache.put(key, value); return true; } @@ -120,7 +120,7 @@ public boolean afterUpdate(Object key, Object value, Object version, SoftLock lo * Do nothing. */ public boolean afterInsert(Object key, Object value, Object version) throws CacheException { - LOG.debug("Caching after insert: " + key); + LOG.debugf("Caching after insert: %s", key); cache.update(key, value); return true; } diff --git a/hibernate-core/src/main/java/org/hibernate/cache/ReadWriteCache.java b/hibernate-core/src/main/java/org/hibernate/cache/ReadWriteCache.java index b7ace26645..f2b6bf2486 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/ReadWriteCache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/ReadWriteCache.java @@ -23,11 +23,11 @@ * */ package org.hibernate.cache; - import java.io.Serializable; import java.util.Comparator; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cache.access.SoftLock; +import org.jboss.logging.Logger; /** * Caches data that is sometimes updated while maintaining the semantics of @@ -47,7 +47,7 @@ */ public class ReadWriteCache implements CacheConcurrencyStrategy { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, ReadWriteCache.class.getName()); private Cache cache; private int nextLockId; @@ -93,15 +93,15 @@ private int nextLockId() { * the data is versioned or timestamped. */ public synchronized Object get(Object key, long txTimestamp) throws CacheException { - LOG.debug("Cache lookup: " + key); + LOG.debugf("Cache lookup: %s", key); Lockable lockable = (Lockable)cache.get(key); boolean gettable = lockable != null && lockable.isGettable(txTimestamp); if (gettable) { - LOG.debug("Cache hit: " + key); + LOG.debugf("Cache hit: %s", key); return ((Item)lockable).getValue(); } - if (lockable == null) LOG.debug("Cache miss: " + key); - else LOG.debug("Cached item was locked: " + key); + if (lockable == null) LOG.debugf("Cache miss: %s", key); + else LOG.debugf("Cached item was locked: %s", key); return null; } @@ -113,7 +113,7 @@ public synchronized Object get(Object key, long txTimestamp) throws CacheExcepti * item. */ public synchronized SoftLock lock(Object key, Object version) throws CacheException { - LOG.debug("Invalidating: " + key); + LOG.debugf("Invalidating: %s", key); try { cache.lock(key); @@ -147,7 +147,7 @@ public synchronized boolean put( Comparator versionComparator, boolean minimalPut) throws CacheException { - LOG.debug("Caching: " + key); + LOG.debugf("Caching: %s", key); try { cache.lock(key); @@ -159,11 +159,11 @@ public synchronized boolean put( if (puttable) { cache.put( key, new Item( value, version, cache.nextTimestamp() ) ); - LOG.debug("Cached: " + key); + LOG.debugf("Cached: %s", key); return true; } - if (lockable.isLock()) LOG.debug("Cached item was locked: " + key); - else LOG.debug("Item already cached: " + key); + if (lockable.isLock()) LOG.debugf("Cached item was locked: %s", key); + else LOG.debugf("Item already cached: %s", key); return false; } finally { @@ -186,7 +186,7 @@ private void decrementLock(Object key, Lock lock) throws CacheException { * simultaneous lock). */ public synchronized void release(Object key, SoftLock clientLock) throws CacheException { - LOG.debug("Releasing: " + key); + LOG.debugf("Releasing: %s", key); try { cache.lock(key); @@ -237,7 +237,7 @@ public void destroy() { public synchronized boolean afterUpdate(Object key, Object value, Object version, SoftLock clientLock) throws CacheException { - LOG.debug("Updating: " + key); + LOG.debugf("Updating: %s", key); try { cache.lock(key); @@ -253,7 +253,7 @@ public synchronized boolean afterUpdate(Object key, Object value, Object version } // recache the updated state cache.update(key, new Item(value, version, cache.nextTimestamp())); - LOG.debug("Updated: " + key); + LOG.debugf("Updated: %s", key); return true; } handleLockExpiry(key); @@ -271,14 +271,14 @@ public synchronized boolean afterUpdate(Object key, Object value, Object version public synchronized boolean afterInsert(Object key, Object value, Object version) throws CacheException { - LOG.debug("Inserting: " + key); + LOG.debugf("Inserting: %s", key); try { cache.lock(key); Lockable lockable = (Lockable) cache.get(key); if (lockable==null) { cache.update( key, new Item( value, version, cache.nextTimestamp() ) ); - LOG.debug("Inserted: " + key); + LOG.debugf("Inserted: %s", key); return true; } return false; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/Region.java b/hibernate-core/src/main/java/org/hibernate/cache/Region.java index 18471bb14b..348e231398 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/Region.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/Region.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache; - +package org.hibernate.cache; import java.util.Map; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java index 2a1646f95f..440f80ad58 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/RegionFactory.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache; - +package org.hibernate.cache; import java.util.Properties; - import org.hibernate.cache.access.AccessType; import org.hibernate.cfg.Settings; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/StandardQueryCache.java b/hibernate-core/src/main/java/org/hibernate/cache/StandardQueryCache.java index a42fcbe5ae..dcb0bc402d 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/StandardQueryCache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/StandardQueryCache.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cache; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -30,12 +29,13 @@ import java.util.Set; import javax.persistence.EntityNotFoundException; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.UnresolvableObjectException; import org.hibernate.cfg.Settings; import org.hibernate.engine.SessionImplementor; import org.hibernate.type.Type; import org.hibernate.type.TypeHelper; +import org.jboss.logging.Logger; /** * The standard implementation of the Hibernate QueryCache interface. This @@ -48,7 +48,7 @@ */ public class StandardQueryCache implements QueryCache { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, StandardQueryCache.class.getName()); private QueryResultsRegion cacheRegion; private UpdateTimestampsCache updateTimestampsCache; @@ -85,7 +85,7 @@ public boolean put( if (isNaturalKeyLookup && result.size() == 0) return false; Long ts = new Long(session.getFactory().getSettings().getRegionFactory().nextTimestamp()); - LOG.debug("Caching query results in region: " + cacheRegion.getName() + "; timestamp=" + ts); + LOG.debugf("Caching query results in region: %s; timestamp=%s", cacheRegion.getName(), ts); List cacheable = new ArrayList(result.size() + 1); logCachedResultDetails(key, null, returnTypes, cacheable); @@ -107,23 +107,23 @@ public List get( boolean isNaturalKeyLookup, Set spaces, SessionImplementor session) throws HibernateException { - LOG.debug("Checking cached query results in region: " + cacheRegion.getName()); + LOG.debugf("Checking cached query results in region: %s", cacheRegion.getName()); List cacheable = ( List ) cacheRegion.get( key ); logCachedResultDetails(key, spaces, returnTypes, cacheable); if ( cacheable == null ) { - LOG.debug("Query results were not found in cache"); + LOG.debugf("Query results were not found in cache"); return null; } Long timestamp = ( Long ) cacheable.get( 0 ); if ( !isNaturalKeyLookup && !isUpToDate( spaces, timestamp ) ) { - LOG.debug("Cached query results were not up-to-date"); + LOG.debugf("Cached query results were not up-to-date"); return null; } - LOG.debug("Returning cached query results"); + LOG.debugf("Returning cached query results"); for ( int i = 1; i < cacheable.size(); i++ ) { if ( returnTypes.length == 1 ) { returnTypes[0].beforeAssemble( ( Serializable ) cacheable.get( i ), session ); @@ -153,7 +153,7 @@ public List get( // the uoe could occur while resolving // associations, leaving the PC in an // inconsistent state - LOG.debug("Unable to reassemble cached result set"); + LOG.debugf("Unable to reassemble cached result set"); cacheRegion.evict( key ); return null; } @@ -164,7 +164,7 @@ public List get( } protected boolean isUpToDate(Set spaces, Long timestamp) { - LOG.debug("Checking query spaces are up-to-date: " + spaces); + LOG.debugf("Checking query spaces are up-to-date: %s", spaces); return updateTimestampsCache.isUpToDate( spaces, timestamp ); } diff --git a/hibernate-core/src/main/java/org/hibernate/cache/StandardQueryCacheFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/StandardQueryCacheFactory.java index 9d120654fb..29264b9a10 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/StandardQueryCacheFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/StandardQueryCacheFactory.java @@ -23,12 +23,10 @@ * */ package org.hibernate.cache; - +import java.util.Properties; import org.hibernate.HibernateException; import org.hibernate.cfg.Settings; -import java.util.Properties; - /** * Standard Hibernate implementation of the QueryCacheFactory interface. Returns * instances of {@link StandardQueryCache}. diff --git a/hibernate-core/src/main/java/org/hibernate/cache/Timestamper.java b/hibernate-core/src/main/java/org/hibernate/cache/Timestamper.java index caf5158713..bdbae9e67c 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/Timestamper.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/Timestamper.java @@ -24,6 +24,7 @@ */ package org.hibernate.cache; + /** * Generates increasing identifiers (in a single VM only). * Not valid across multiple VMs. Identifiers are not necessarily diff --git a/hibernate-core/src/main/java/org/hibernate/cache/TimestampsRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/TimestampsRegion.java index 8dcd58410f..af8fc81a4e 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/TimestampsRegion.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/TimestampsRegion.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache; +package org.hibernate.cache; + /** * Defines the contract for a cache region which will specifically be used to diff --git a/hibernate-core/src/main/java/org/hibernate/cache/TransactionAwareCache.java b/hibernate-core/src/main/java/org/hibernate/cache/TransactionAwareCache.java index 86087daee2..d93bbdf3bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/TransactionAwareCache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/TransactionAwareCache.java @@ -24,6 +24,7 @@ */ package org.hibernate.cache; + /** * Marker interface for identifying cache impls which are aware of * JTA transactions diff --git a/hibernate-core/src/main/java/org/hibernate/cache/TransactionalCache.java b/hibernate-core/src/main/java/org/hibernate/cache/TransactionalCache.java index 53f1d605d2..a09ae64939 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/TransactionalCache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/TransactionalCache.java @@ -23,10 +23,10 @@ * */ package org.hibernate.cache; - import java.util.Comparator; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cache.access.SoftLock; +import org.jboss.logging.Logger; /** * Support for fully transactional cache implementations like @@ -38,7 +38,7 @@ */ public class TransactionalCache implements CacheConcurrencyStrategy { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, TransactionalCache.class.getName()); private Cache cache; @@ -47,10 +47,10 @@ public String getRegionName() { } public Object get(Object key, long txTimestamp) throws CacheException { - LOG.debug("Cache lookup: " + key); + LOG.debugf("Cache lookup: %s", key); Object result = cache.read( key ); - if (result == null) LOG.debug("Cache miss: " + key); - else LOG.debug("Cache hit: " + key); + if (result == null) LOG.debugf("Cache miss: %s", key); + else LOG.debugf("Cache hit: %s", key); return result; } @@ -62,10 +62,10 @@ public boolean put( Comparator versionComparator, boolean minimalPut) throws CacheException { if ( minimalPut && cache.read( key ) != null ) { - LOG.debug("Item already cached: " + key); + LOG.debugf("Item already cached: %s", key); return false; } - LOG.debug("Caching: " + key); + LOG.debugf("Caching: %s", key); if ( cache instanceof OptimisticCache ) { ( ( OptimisticCache ) cache ).writeLoad( key, value, version ); } @@ -95,7 +95,7 @@ public boolean update( Object value, Object currentVersion, Object previousVersion) throws CacheException { - LOG.debug("Updating: " + key); + LOG.debugf("Updating: %s", key); if ( cache instanceof OptimisticCache ) { ( ( OptimisticCache ) cache ).writeUpdate( key, value, currentVersion, previousVersion ); } @@ -109,7 +109,7 @@ public boolean insert( Object key, Object value, Object currentVersion) throws CacheException { - LOG.debug("Inserting: " + key); + LOG.debugf("Inserting: %s", key); if ( cache instanceof OptimisticCache ) { ( ( OptimisticCache ) cache ).writeInsert( key, value, currentVersion ); } @@ -124,12 +124,12 @@ public void evict(Object key) throws CacheException { } public void remove(Object key) throws CacheException { - LOG.debug("Removing: " + key); + LOG.debugf("Removing: %s", key); cache.remove( key ); } public void clear() throws CacheException { - LOG.debug("Clearing"); + LOG.debugf("Clearing"); cache.clear(); } diff --git a/hibernate-core/src/main/java/org/hibernate/cache/TransactionalDataRegion.java b/hibernate-core/src/main/java/org/hibernate/cache/TransactionalDataRegion.java index 0545843d97..c7d9b5f2db 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/TransactionalDataRegion.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/TransactionalDataRegion.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache; +package org.hibernate.cache; + /** * Defines contract for regions which hold transactionally-managed data. diff --git a/hibernate-core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java b/hibernate-core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java index 94b1786765..2c876001f4 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java @@ -23,14 +23,14 @@ * */ package org.hibernate.cache; - import java.io.Serializable; import java.util.Iterator; import java.util.Properties; import java.util.Set; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cfg.Settings; +import org.jboss.logging.Logger; /** * Tracks the timestamps of the most recent updates to particular tables. It is @@ -43,9 +43,10 @@ * @author Mikheil Kapanadze */ public class UpdateTimestampsCache { + public static final String REGION_NAME = UpdateTimestampsCache.class.getName(); - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - UpdateTimestampsCache.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + UpdateTimestampsCache.class.getName()); private final TimestampsRegion region; @@ -60,7 +61,7 @@ public synchronized void preinvalidate(Serializable[] spaces) throws CacheExcept //TODO: to handle concurrent writes correctly, this should return a Lock to the client Long ts = new Long( region.nextTimestamp() + region.getTimeout() ); for ( int i=0; i= timestamp.longValue() ) { return false; } diff --git a/hibernate-core/src/main/java/org/hibernate/cache/access/AccessType.java b/hibernate-core/src/main/java/org/hibernate/cache/access/AccessType.java index 44c11a9882..cfc7d722fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/access/AccessType.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/access/AccessType.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.access; - +package org.hibernate.cache.access; import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/access/CollectionRegionAccessStrategy.java b/hibernate-core/src/main/java/org/hibernate/cache/access/CollectionRegionAccessStrategy.java index e077736946..07fdc530ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/access/CollectionRegionAccessStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/access/CollectionRegionAccessStrategy.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.access; - +package org.hibernate.cache.access; import org.hibernate.cache.CacheException; import org.hibernate.cache.CollectionRegion; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/access/EntityRegionAccessStrategy.java b/hibernate-core/src/main/java/org/hibernate/cache/access/EntityRegionAccessStrategy.java index 42101a1bb8..678725ac5c 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/access/EntityRegionAccessStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/access/EntityRegionAccessStrategy.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.access; - -import org.hibernate.cache.EntityRegion; +package org.hibernate.cache.access; import org.hibernate.cache.CacheException; +import org.hibernate.cache.EntityRegion; /** * Contract for managing transactional and concurrent access to cached entity diff --git a/hibernate-core/src/main/java/org/hibernate/cache/access/SoftLock.java b/hibernate-core/src/main/java/org/hibernate/cache/access/SoftLock.java index 3cc56b15f8..02fc359d8b 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/access/SoftLock.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/access/SoftLock.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.access; +package org.hibernate.cache.access; + /** * Moved up from inner definition on the now deprecated diff --git a/hibernate-core/src/main/java/org/hibernate/cache/entry/CacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/entry/CacheEntry.java index 0629d61585..abec7ba5bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/entry/CacheEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/entry/CacheEntry.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cache.entry; - import java.io.Serializable; - import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.Interceptor; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/entry/CacheEntryStructure.java b/hibernate-core/src/main/java/org/hibernate/cache/entry/CacheEntryStructure.java index 012ded3ead..3a8223a6e8 100755 --- a/hibernate-core/src/main/java/org/hibernate/cache/entry/CacheEntryStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/entry/CacheEntryStructure.java @@ -23,7 +23,6 @@ * */ package org.hibernate.cache.entry; - import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/entry/CollectionCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/entry/CollectionCacheEntry.java index 5b5a281ed2..46b4bc1f49 100755 --- a/hibernate-core/src/main/java/org/hibernate/cache/entry/CollectionCacheEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/entry/CollectionCacheEntry.java @@ -23,9 +23,7 @@ * */ package org.hibernate.cache.entry; - import java.io.Serializable; - import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.util.ArrayHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredCacheEntry.java index 045cdf572f..706c50d940 100755 --- a/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredCacheEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredCacheEntry.java @@ -23,11 +23,9 @@ * */ package org.hibernate.cache.entry; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; - import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredCollectionCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredCollectionCacheEntry.java index b35c17fee1..f610c3ad3e 100755 --- a/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredCollectionCacheEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredCollectionCacheEntry.java @@ -23,11 +23,9 @@ * */ package org.hibernate.cache.entry; - import java.io.Serializable; import java.util.Arrays; import java.util.List; - import org.hibernate.engine.SessionFactoryImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredMapCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredMapCacheEntry.java index 5351a10de9..a21a51fdcf 100755 --- a/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredMapCacheEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/entry/StructuredMapCacheEntry.java @@ -23,12 +23,10 @@ * */ package org.hibernate.cache.entry; - import java.io.Serializable; import java.util.HashMap; import java.util.Iterator; import java.util.Map; - import org.hibernate.engine.SessionFactoryImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/entry/UnstructuredCacheEntry.java b/hibernate-core/src/main/java/org/hibernate/cache/entry/UnstructuredCacheEntry.java index d6823d7412..c8de0682d9 100755 --- a/hibernate-core/src/main/java/org/hibernate/cache/entry/UnstructuredCacheEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/entry/UnstructuredCacheEntry.java @@ -23,7 +23,6 @@ * */ package org.hibernate.cache.entry; - import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/CacheDataDescriptionImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/CacheDataDescriptionImpl.java index d87f3e28d4..886a1da748 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/CacheDataDescriptionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/CacheDataDescriptionImpl.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.impl; - +package org.hibernate.cache.impl; import java.util.Comparator; - import org.hibernate.cache.CacheDataDescription; -import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Collection; +import org.hibernate.mapping.PersistentClass; import org.hibernate.type.VersionType; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/NoCachingRegionFactory.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/NoCachingRegionFactory.java index 352d65f60f..e2c214caa9 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/NoCachingRegionFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/NoCachingRegionFactory.java @@ -21,18 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cache.impl; - +package org.hibernate.cache.impl; import java.util.Properties; - -import org.hibernate.cache.RegionFactory; -import org.hibernate.cache.CacheException; -import org.hibernate.cache.EntityRegion; -import org.hibernate.cache.CollectionRegion; -import org.hibernate.cache.QueryResultsRegion; -import org.hibernate.cache.TimestampsRegion; -import org.hibernate.cache.NoCachingEnabledException; import org.hibernate.cache.CacheDataDescription; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.CollectionRegion; +import org.hibernate.cache.EntityRegion; +import org.hibernate.cache.NoCachingEnabledException; +import org.hibernate.cache.QueryResultsRegion; +import org.hibernate.cache.RegionFactory; +import org.hibernate.cache.TimestampsRegion; import org.hibernate.cache.access.AccessType; import org.hibernate.cfg.Settings; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseGeneralDataRegionAdapter.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseGeneralDataRegionAdapter.java index 9dd7e0ff94..c843a81509 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseGeneralDataRegionAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseGeneralDataRegionAdapter.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.impl.bridge; - -import org.hibernate.cache.GeneralDataRegion; +package org.hibernate.cache.impl.bridge; import org.hibernate.cache.Cache; import org.hibernate.cache.CacheException; +import org.hibernate.cache.GeneralDataRegion; import org.hibernate.cfg.Settings; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java index 163d95745c..ac418984fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseRegionAdapter.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.impl.bridge; - +package org.hibernate.cache.impl.bridge; import java.util.Map; - -import org.hibernate.cache.Region; import org.hibernate.cache.Cache; import org.hibernate.cache.CacheException; +import org.hibernate.cache.Region; import org.hibernate.cfg.Settings; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseTransactionalDataRegionAdapter.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseTransactionalDataRegionAdapter.java index 17090cfac0..d770130156 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseTransactionalDataRegionAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/BaseTransactionalDataRegionAdapter.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.impl.bridge; - -import org.hibernate.cache.TransactionalDataRegion; +package org.hibernate.cache.impl.bridge; import org.hibernate.cache.Cache; import org.hibernate.cache.CacheDataDescription; +import org.hibernate.cache.TransactionalDataRegion; import org.hibernate.cfg.Settings; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/CollectionAccessStrategyAdapter.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/CollectionAccessStrategyAdapter.java index 0f25b4a0e9..c96bec9497 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/CollectionAccessStrategyAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/CollectionAccessStrategyAdapter.java @@ -22,13 +22,12 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.impl.bridge; - +package org.hibernate.cache.impl.bridge; +import org.hibernate.cache.CacheConcurrencyStrategy; +import org.hibernate.cache.CacheException; +import org.hibernate.cache.CollectionRegion; import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cache.access.SoftLock; -import org.hibernate.cache.CacheConcurrencyStrategy; -import org.hibernate.cache.CollectionRegion; -import org.hibernate.cache.CacheException; import org.hibernate.cfg.Settings; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java index 72562b364f..6c20420dd5 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java @@ -22,9 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.impl.bridge; - -import org.hibernate.Logger; +package org.hibernate.cache.impl.bridge; +import org.hibernate.HibernateLogger; import org.hibernate.cache.Cache; import org.hibernate.cache.CacheConcurrencyStrategy; import org.hibernate.cache.CacheDataDescription; @@ -38,6 +37,7 @@ import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.CollectionRegionAccessStrategy; import org.hibernate.cfg.Settings; +import org.jboss.logging.Logger; /** * Adapter specifically bridging {@link CollectionRegion} to {@link Cache}. @@ -46,7 +46,8 @@ */ public class CollectionRegionAdapter extends BaseTransactionalDataRegionAdapter implements CollectionRegion { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + CollectionRegionAdapter.class.getName()); public CollectionRegionAdapter(Cache underlyingCache, Settings settings, CacheDataDescription metadata) { super( underlyingCache, settings, metadata ); diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/EntityAccessStrategyAdapter.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/EntityAccessStrategyAdapter.java index 72f52bc7aa..8ec1a0570f 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/EntityAccessStrategyAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/EntityAccessStrategyAdapter.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.impl.bridge; - +package org.hibernate.cache.impl.bridge; import org.hibernate.cache.CacheConcurrencyStrategy; -import org.hibernate.cache.EntityRegion; import org.hibernate.cache.CacheException; +import org.hibernate.cache.EntityRegion; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.access.SoftLock; import org.hibernate.cfg.Settings; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java index 8ef4b6f5eb..6930d42209 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java @@ -22,9 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.impl.bridge; - -import org.hibernate.Logger; +package org.hibernate.cache.impl.bridge; +import org.hibernate.HibernateLogger; import org.hibernate.cache.Cache; import org.hibernate.cache.CacheConcurrencyStrategy; import org.hibernate.cache.CacheDataDescription; @@ -38,6 +37,7 @@ import org.hibernate.cache.access.AccessType; import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cfg.Settings; +import org.jboss.logging.Logger; /** * Adapter specifically bridging {@link EntityRegion} to {@link Cache}. @@ -46,7 +46,7 @@ */ public class EntityRegionAdapter extends BaseTransactionalDataRegionAdapter implements EntityRegion { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, EntityRegionAdapter.class.getName()); public EntityRegionAdapter(Cache underlyingCache, Settings settings, CacheDataDescription metadata) { super( underlyingCache, settings, metadata ); diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/OptimisticCacheSourceAdapter.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/OptimisticCacheSourceAdapter.java index d94d558a08..6c02477ce4 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/OptimisticCacheSourceAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/OptimisticCacheSourceAdapter.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.impl.bridge; - +package org.hibernate.cache.impl.bridge; import java.util.Comparator; - -import org.hibernate.cache.OptimisticCacheSource; import org.hibernate.cache.CacheDataDescription; +import org.hibernate.cache.OptimisticCacheSource; /** * {@inheritDoc} diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/QueryResultsRegionAdapter.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/QueryResultsRegionAdapter.java index 3e664ac802..d3ac00ebe7 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/QueryResultsRegionAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/QueryResultsRegionAdapter.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.impl.bridge; - -import org.hibernate.cache.QueryResultsRegion; +package org.hibernate.cache.impl.bridge; import org.hibernate.cache.Cache; +import org.hibernate.cache.QueryResultsRegion; import org.hibernate.cfg.Settings; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java index a930f0b0b3..cdf2a1e89d 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java @@ -22,9 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cache.impl.bridge; - import java.util.Properties; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cache.CacheDataDescription; import org.hibernate.cache.CacheException; import org.hibernate.cache.CacheProvider; @@ -39,6 +38,7 @@ import org.hibernate.cfg.Settings; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; /** * Acts as a bridge between the {@link RegionFactory} contract and the older @@ -49,8 +49,8 @@ public class RegionFactoryCacheProviderBridge implements RegionFactory { public static final String DEF_PROVIDER = NoCacheProvider.class.getName(); - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - RegionFactoryCacheProviderBridge.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + RegionFactoryCacheProviderBridge.class.getName()); private CacheProvider cacheProvider; private Settings settings; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/TimestampsRegionAdapter.java b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/TimestampsRegionAdapter.java index b88cc084d3..9a7d949ddb 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/TimestampsRegionAdapter.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/TimestampsRegionAdapter.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.cache.impl.bridge; - -import org.hibernate.cache.TimestampsRegion; +package org.hibernate.cache.impl.bridge; import org.hibernate.cache.Cache; +import org.hibernate.cache.TimestampsRegion; import org.hibernate.cfg.Settings; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java index 817c822966..4cc5e5213b 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AbstractPropertyHolder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.HashMap; import java.util.Map; import javax.persistence.AssociationOverride; @@ -35,7 +34,6 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.MappedSuperclass; - import org.hibernate.AssertionFailure; import org.hibernate.annotations.common.reflection.XAnnotatedElement; import org.hibernate.annotations.common.reflection.XClass; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java b/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java index 8989c9daec..f65b81e5e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AccessType.java @@ -26,6 +26,7 @@ package org.hibernate.cfg; + /** * Enum defining deifferent access strategies for accessing entity values. * diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotatedClassType.java b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotatedClassType.java index 8a049f4c25..c4f21a7be0 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotatedClassType.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotatedClassType.java @@ -23,6 +23,7 @@ */ package org.hibernate.cfg; + /** * Type of annotation of a class will give its type * diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java index 0aea72cdb4..699a786381 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Arrays; @@ -83,7 +82,7 @@ import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; import org.hibernate.FetchMode; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.Cache; @@ -170,6 +169,7 @@ import org.hibernate.persister.entity.JoinedSubclassEntityPersister; import org.hibernate.persister.entity.SingleTableEntityPersister; import org.hibernate.persister.entity.UnionSubclassEntityPersister; +import org.jboss.logging.Logger; /** * JSR 175 annotation binder which reads the annotations from classes, applies the @@ -182,8 +182,7 @@ @SuppressWarnings("unchecked") public final class AnnotationBinder { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AnnotationBinder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, AnnotationBinder.class.getName()); /* * Some design description @@ -989,7 +988,7 @@ private static SharedCacheMode determineSharedCacheMode(Mappings mappings) { SharedCacheMode mode; final Object value = mappings.getConfigurationProperties().get( "javax.persistence.sharedCache.mode" ); if ( value == null ) { - LOG.debug("No value specified for 'javax.persistence.sharedCache.mode'; using UNSPECIFIED"); + LOG.debugf("No value specified for 'javax.persistence.sharedCache.mode'; using UNSPECIFIED"); mode = SharedCacheMode.UNSPECIFIED; } else { @@ -1001,7 +1000,7 @@ private static SharedCacheMode determineSharedCacheMode(Mappings mappings) { mode = SharedCacheMode.valueOf( value.toString() ); } catch ( Exception e ) { - LOG.debug("Unable to resolve given mode name [" + value + "]; using UNSPECIFIED : " + e); + LOG.debugf("Unable to resolve given mode name [%s]; using UNSPECIFIED : %s", value, e); mode = SharedCacheMode.UNSPECIFIED; } } @@ -1034,7 +1033,7 @@ static void prepareDefaultCacheConcurrencyStrategy(Properties properties) { return; } - LOG.debug("Setting default cache concurrency strategy via config [" + strategy.name() + "]"); + LOG.debugf("Setting default cache concurrency strategy via config [%s]", strategy.name()); DEFAULT_CACHE_CONCURRENCY_STRATEGY = strategy; } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java index f9dd2fb433..b7458996bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationConfiguration.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.io.File; import java.io.InputStream; import java.net.URL; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/BinderHelper.java b/hibernate-core/src/main/java/org/hibernate/cfg/BinderHelper.java index 800e6579b5..5bff34fbe4 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/BinderHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/BinderHelper.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -35,7 +34,7 @@ import java.util.StringTokenizer; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.annotations.AnyMetaDef; import org.hibernate.annotations.AnyMetaDefs; @@ -63,6 +62,7 @@ import org.hibernate.mapping.ToOne; import org.hibernate.mapping.Value; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * @author Emmanuel Bernard @@ -71,8 +71,7 @@ public class BinderHelper { public static final String ANNOTATION_STRING_DEFAULT = ""; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - BinderHelper.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, BinderHelper.class.getName()); private BinderHelper() { } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java index a79d9a7667..c009967e69 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ClassPropertyHolder.java @@ -22,21 +22,19 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.HashMap; import java.util.Map; import javax.persistence.JoinTable; - -import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.AssertionFailure; +import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.cfg.annotations.EntityBinder; import org.hibernate.mapping.Component; import org.hibernate.mapping.Join; import org.hibernate.mapping.KeyValue; +import org.hibernate.mapping.MappedSuperclass; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.Table; -import org.hibernate.mapping.MappedSuperclass; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java index 6ea78b65e6..e98d6464c0 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/CollectionPropertyHolder.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import javax.persistence.JoinTable; - import org.hibernate.AssertionFailure; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java index 4f9557cb67..9d587da714 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java @@ -22,17 +22,17 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Collections; import java.util.Iterator; import java.util.Map; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.mapping.Collection; import org.hibernate.mapping.IndexedCollection; import org.hibernate.mapping.OneToMany; import org.hibernate.mapping.Selectable; import org.hibernate.mapping.Value; +import org.jboss.logging.Logger; /** * Collection second pass @@ -41,8 +41,7 @@ */ public abstract class CollectionSecondPass implements SecondPass { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - CollectionSecondPass.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, CollectionSecondPass.class.getName()); Mappings mappings; Collection collection; @@ -60,7 +59,7 @@ public CollectionSecondPass(Mappings mappings, Collection collection) { public void doSecondPass(java.util.Map persistentClasses) throws MappingException { - LOG.debug("Second pass for collection: " + collection.getRole()); + LOG.debugf("Second pass for collection: %s", collection.getRole()); secondPass( persistentClasses, localInheritedMetas ); // using local since the inheritedMetas at this point is not the correct map since it is always the empty map collection.createAllKeys(); @@ -76,7 +75,7 @@ public void doSecondPass(java.util.Map persistentClasses) else { msg += ", element: " + columns( collection.getElement() ); } - LOG.debug(msg); + LOG.debugf(msg); } } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ColumnsBuilder.java b/hibernate-core/src/main/java/org/hibernate/cfg/ColumnsBuilder.java index 0e5175629a..3f1be0f54a 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ColumnsBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ColumnsBuilder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import javax.persistence.Column; import javax.persistence.ElementCollection; import javax.persistence.JoinColumn; @@ -32,7 +31,6 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.OneToOne; - import org.hibernate.AnnotationException; import org.hibernate.annotations.CollectionOfElements; import org.hibernate.annotations.Columns; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java index b84ba4cd8f..bef7424c09 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ComponentPropertyHolder.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import javax.persistence.Column; import javax.persistence.EmbeddedId; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; - import org.hibernate.AnnotationException; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java index 9bfcaf32bb..1c3b32d733 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -66,9 +65,9 @@ import org.hibernate.DuplicateMappingException; import org.hibernate.EmptyInterceptor; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.Interceptor; import org.hibernate.InvalidMappingException; -import org.hibernate.Logger; import org.hibernate.MappingException; import org.hibernate.MappingNotFoundException; import org.hibernate.SessionFactory; @@ -171,6 +170,7 @@ import org.hibernate.util.xml.OriginImpl; import org.hibernate.util.xml.XmlDocument; import org.hibernate.util.xml.XmlDocumentImpl; +import org.jboss.logging.Logger; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -193,8 +193,7 @@ */ public class Configuration implements Serializable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - Configuration.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Configuration.class.getName()); /** * Setting used to give the name of the default {@link org.hibernate.annotations.CacheConcurrencyStrategy} @@ -578,7 +577,7 @@ public Configuration addCacheableFile(File xmlFile) throws MappingException { XmlDocument metadataXml = add( inputSource, "file", name ); try { - LOG.debug("Writing cache file for: " + xmlFile + " to: " + cachedFile); + LOG.debugf("Writing cache file for: %s to: %s", xmlFile, cachedFile); SerializationHelper.serialize( ( Serializable ) metadataXml.getDocumentTree(), new FileOutputStream( cachedFile ) ); } catch (Exception e) { LOG.unableToWriteCachedFile(cachedFile.getPath(), e.getMessage()); @@ -645,7 +644,7 @@ public Configuration addCacheableFile(String xmlFile) throws MappingException { * given XML string */ public Configuration addXML(String xml) throws MappingException { - LOG.debug("Mapping XML:\n" + xml); + LOG.debugf("Mapping XML:\n%s", xml); final InputSource inputSource = new InputSource( new StringReader( xml ) ); add( inputSource, "string", "XML String" ); return this; @@ -662,7 +661,7 @@ public Configuration addXML(String xml) throws MappingException { public Configuration addURL(URL url) throws MappingException { final String urlExternalForm = url.toExternalForm(); - LOG.debug("Reading mapping document from URL : " + urlExternalForm); + LOG.debugf("Reading mapping document from URL : %s", urlExternalForm); try { add( url.openStream(), "URL", urlExternalForm ); @@ -697,7 +696,7 @@ private XmlDocument add(InputStream inputStream, final String type, final String * the mapping document. */ public Configuration addDocument(org.w3c.dom.Document doc) throws MappingException { - LOG.debug("Mapping Document:\n" + doc); + LOG.debugf("Mapping Document:\n%s", doc); final Document document = xmlHelper.createDOMReader().read( doc ); add( new XmlDocumentImpl( document, "unknown", null ) ); @@ -1424,7 +1423,7 @@ private void processSecondPassesOfType(Class type) { * an entity having a PK made of a ManyToOne ...). */ private void processFkSecondPassInOrder() { - LOG.debug("Processing fk mappings (*ToOne and JoinedSubclass)"); + LOG.debugf("Processing fk mappings (*ToOne and JoinedSubclass)"); List fkSecondPasses = getFKSecondPassesOnly(); if ( fkSecondPasses.size() == 0 ) { @@ -1651,7 +1650,7 @@ private void applyHibernateValidatorLegacyConstraintsOnDDL() { applyMethod.invoke( validator, persistentClazz ); } catch ( Exception e ) { - LOG.warn(LOG.unableToApplyConstraints(className), e); + LOG.unableToApplyConstraints(className, e); } } } @@ -1664,10 +1663,10 @@ private void applyBeanValidationConstraintsOnDDL() { } private void originalSecondPassCompile() throws MappingException { - LOG.debug("Processing extends queue"); + LOG.debugf("Processing extends queue"); processExtendsQueue(); - LOG.debug("Processing collection mappings"); + LOG.debugf("Processing collection mappings"); Iterator itr = secondPasses.iterator(); while ( itr.hasNext() ) { SecondPass sp = (SecondPass) itr.next(); @@ -1677,7 +1676,7 @@ private void originalSecondPassCompile() throws MappingException { } } - LOG.debug("Processing native query and ResultSetMapping mappings"); + LOG.debugf("Processing native query and ResultSetMapping mappings"); itr = secondPasses.iterator(); while ( itr.hasNext() ) { SecondPass sp = (SecondPass) itr.next(); @@ -1685,7 +1684,7 @@ private void originalSecondPassCompile() throws MappingException { itr.remove(); } - LOG.debug("Processing association property references"); + LOG.debugf("Processing association property references"); itr = propertyReferences.iterator(); while ( itr.hasNext() ) { @@ -1707,7 +1706,7 @@ private void originalSecondPassCompile() throws MappingException { //TODO: Somehow add the newly created foreign keys to the internal collection - LOG.debug("Processing foreign key constraints"); + LOG.debugf("Processing foreign key constraints"); itr = getTableMappings(); Set done = new HashSet(); @@ -1718,7 +1717,7 @@ private void originalSecondPassCompile() throws MappingException { } private int processExtendsQueue() { - LOG.debug("Processing extends queue"); + LOG.debugf("Processing extends queue"); int added = 0; ExtendsQueueEntry extendsQueueEntry = findPossibleExtends(); while ( extendsQueueEntry != null ) { @@ -1775,7 +1774,7 @@ protected void secondPassCompileForeignKeys(Table table, Set done) throws Mappin " does not specify the referenced entity" ); } - LOG.debug("Resolving reference to class: " + referencedEntityName); + LOG.debugf("Resolving reference to class: %s", referencedEntityName); PersistentClass referencedClass = classes.get( referencedEntityName ); if ( referencedClass == null ) { throw new MappingException( @@ -1808,7 +1807,7 @@ public Map getNamedQueries() { * @throws HibernateException usually indicates an invalid configuration or invalid mapping information */ public SessionFactory buildSessionFactory(ServicesRegistry serviceRegistry) throws HibernateException { - LOG.debug("Preparing to build session factory with filters : " + filterDefinitions); + LOG.debugf("Preparing to build session factory with filters : %s", filterDefinitions); secondPassCompile(); if (!metadataSourceQueue.isEmpty()) LOG.incompleteMappingMetadataCacheProcessing(); @@ -1849,7 +1848,7 @@ private void enableLegacyHibernateValidator() { } catch ( ClassNotFoundException e ) { //validator is not present - LOG.debug("Legacy Validator not present in classpath, ignoring event listener registration"); + LOG.debugf("Legacy Validator not present in classpath, ignoring event listener registration"); } if ( enableValidatorListeners && validateEventListenerClass != null ) { //TODO so much duplication @@ -1932,7 +1931,7 @@ private void enableHibernateSearch() { searchStartupClass = ReflectHelper.classForName( SEARCH_EVENT_LISTENER_REGISTERER_CLASS, getClass() ); } catch ( ClassNotFoundException cnfe ) { - LOG.debug("Search not present in classpath, ignoring event listener registration."); + LOG.debugf("Search not present in classpath, ignoring event listener registration."); return; } } @@ -1948,16 +1947,16 @@ private void enableHibernateSearch() { enableSearchMethod.invoke( searchStartupInstance, getEventListeners(), getProperties() ); } catch ( InstantiationException e ) { - LOG.debug("Unable to instantiate " + SEARCH_STARTUP_CLASS + ", ignoring event listener registration."); + LOG.debugf("Unable to instantiate %s, ignoring event listener registration.", SEARCH_STARTUP_CLASS); } catch ( IllegalAccessException e ) { - LOG.debug("Unable to instantiate " + SEARCH_STARTUP_CLASS + ", ignoring event listener registration."); + LOG.debugf("Unable to instantiate %s, ignoring event listener registration.", SEARCH_STARTUP_CLASS); } catch ( NoSuchMethodException e ) { - LOG.debug("Method " + SEARCH_STARTUP_METHOD + "() not found in " + SEARCH_STARTUP_CLASS); + LOG.debugf("Method %s() not found in %s", SEARCH_STARTUP_METHOD, SEARCH_STARTUP_CLASS); } catch ( InvocationTargetException e ) { - LOG.debug("Unable to execute " + SEARCH_STARTUP_METHOD + ", ignoring event listener registration."); + LOG.debugf("Unable to execute %s, ignoring event listener registration.", SEARCH_STARTUP_METHOD); } } @@ -2071,7 +2070,7 @@ private void addProperties(Element parent) { Element node = (Element) itr.next(); String name = node.attributeValue( "name" ); String value = node.getText().trim(); - LOG.debug(name + "=" + value); + LOG.debugf("%s=%s", name, value); properties.setProperty( name, value ); if ( !name.startsWith( "hibernate" ) ) { properties.setProperty( "hibernate." + name, value ); @@ -2206,7 +2205,7 @@ protected Configuration doConfigure(InputStream stream, String resourceName) thr stream.close(); } catch (IOException ioe) { - LOG.warn(LOG.unableToCloseInputStreamForResource(resourceName), ioe); + LOG.unableToCloseInputStreamForResource(resourceName, ioe); } } return this; @@ -2251,7 +2250,7 @@ protected Configuration doConfigure(Document doc) throws HibernateException { } LOG.configuredSessionFactory(name); - LOG.debug("Properties: " + properties); + LOG.debugf("Properties: %s", properties); return this; } @@ -2296,28 +2295,27 @@ private void parseMappingElement(Element mappingElement, String name) { if ( resourceAttribute != null ) { final String resourceName = resourceAttribute.getValue(); - LOG.debug("Session-factory config [" + name + "] named resource [" + resourceName + "] for mapping"); + LOG.debugf("Session-factory config [%s] named resource [%s] for mapping", name, resourceName); addResource( resourceName ); } else if ( fileAttribute != null ) { final String fileName = fileAttribute.getValue(); - LOG.debug("Session-factory config [" + name + "] named file [" + fileName + "] for mapping"); + LOG.debugf("Session-factory config [%s] named file [%s] for mapping", name, fileName); addFile( fileName ); } else if ( jarAttribute != null ) { final String jarFileName = jarAttribute.getValue(); - LOG.debug("Session-factory config [" + name + "] named jar file [" + jarFileName + "] for mapping"); + LOG.debugf("Session-factory config [%s] named jar file [%s] for mapping", name, jarFileName); addJar( new File( jarFileName ) ); } else if ( packageAttribute != null ) { final String packageName = packageAttribute.getValue(); - LOG.debug("Session-factory config [" + name + "] named package [" + packageName + "] for mapping"); + LOG.debugf("Session-factory config [%s] named package [%s] for mapping", name, packageName); addPackage( packageName ); } else if ( classAttribute != null ) { final String className = classAttribute.getValue(); - LOG.debug("Session-factory config [" + name + "] named class [" + className + "] for mapping"); - + LOG.debugf("Session-factory config [%s] named class [%s] for mapping", name, className); try { addAnnotatedClass( ReflectHelper.classForName( className ) ); } @@ -2359,7 +2357,7 @@ private void parseEvent(Element element) { for ( int i = 0; i < listeners.size() ; i++ ) { listenerClasses[i] = ( (Element) listeners.get( i ) ).attributeValue( "class" ); } - LOG.debug("Event listeners: " + type + "=" + StringHelper.toString(listenerClasses)); + LOG.debugf("Event listeners: %s=%s", type, StringHelper.toString(listenerClasses)); setListeners( type, listenerClasses ); } @@ -2369,7 +2367,7 @@ private void parseListener(Element element) { throw new MappingException( "No type specified for listener" ); } String impl = element.attributeValue( "class" ); - LOG.debug("Event listener: " + type + "=" + impl); + LOG.debugf("Event listener: %s=%s", type, impl); setListeners( type, new String[]{impl} ); } @@ -3282,7 +3280,7 @@ public TypeDef getTypeDef(String typeName) { public void addTypeDef(String typeName, String typeClass, Properties paramMap) { TypeDef def = new TypeDef( typeClass, paramMap ); typeDefs.put( typeName, def ); - LOG.debug("Added " + typeName + " with class " + typeClass); + LOG.debugf("Added %s with class %s", typeName, typeClass); } public Map getFilterDefinitions() { @@ -3906,7 +3904,7 @@ else if ( MetadataSourceType.CLASS.equals( type ) ) { } private void processHbmXmlQueue() { - LOG.debug("Processing hbm.xml files"); + LOG.debugf("Processing hbm.xml files"); for ( Map.Entry> entry : hbmMetadataToEntityNamesMap.entrySet() ) { // Unfortunately we have to create a Mappings instance for each iteration here processHbmXml( entry.getKey(), entry.getValue() ); @@ -3936,7 +3934,7 @@ private void processHbmXml(XmlDocument metadataXml, Set entityNames) { } private void processAnnotatedClassesQueue() { - LOG.debug("Process annotated classes"); + LOG.debugf("Process annotated classes"); //bind classes in the correct order calculating some inheritance state List orderedClasses = orderAndFillHierarchy( annotatedClasses ); Mappings mappings = createMappings(); diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java index 930e52f346..6b7164a1ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.HashMap; import java.util.Iterator; import java.util.Map; - import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; import org.hibernate.MappingException; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java index 98df407544..52b0cac4fb 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/CreateKeySecondPass.java @@ -21,10 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cfg; - +package org.hibernate.cfg; import java.util.Map; - import org.hibernate.MappingException; import org.hibernate.mapping.JoinedSubclass; import org.hibernate.mapping.RootClass; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java index 523a1aee45..fad93d4942 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import org.hibernate.AssertionFailure; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java index 93f1caf32f..0447242e6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/DefaultNamingStrategy.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.io.Serializable; - -import org.hibernate.util.StringHelper; import org.hibernate.AssertionFailure; +import org.hibernate.util.StringHelper; /** * The default NamingStrategy diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java b/hibernate-core/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java index fabe26723e..9f6508f345 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cfg; - +package org.hibernate.cfg; import java.io.InputStream; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.util.DTDEntityResolver; +import org.jboss.logging.Logger; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -37,8 +37,7 @@ public class EJB3DTDEntityResolver extends DTDEntityResolver { public static final EntityResolver INSTANCE = new EJB3DTDEntityResolver(); - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - EJB3DTDEntityResolver.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, EJB3DTDEntityResolver.class.getName()); boolean resolved = false; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java index ffd27251b2..629197433e 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/EJB3NamingStrategy.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.io.Serializable; - import org.hibernate.AssertionFailure; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3Column.java b/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3Column.java index 9930579e0e..65713c3eef 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3Column.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3Column.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Map; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.annotations.ColumnTransformer; import org.hibernate.annotations.ColumnTransformers; import org.hibernate.annotations.Index; @@ -38,6 +37,7 @@ import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Table; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Wrap state of an EJB3 @Column annotation @@ -47,8 +47,7 @@ */ public class Ejb3Column { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - Ejb3Column.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Ejb3Column.class.getName()); private Column mappingColumn; private boolean insertable = true; @@ -182,7 +181,7 @@ public Ejb3Column() { public void bind() { if ( StringHelper.isNotEmpty( formulaString ) ) { - LOG.debug("Binding formula " + formulaString); + LOG.debugf("Binding formula %s", formulaString); formula = new Formula(); formula.setFormula( formulaString ); } @@ -190,7 +189,7 @@ public void bind() { initMappingColumn( logicalColumnName, propertyName, length, precision, scale, nullable, sqlType, unique, true ); - LOG.debug("Binding column: " + toString()); + LOG.debugf("Binding column: %s", toString()); } } @@ -421,7 +420,7 @@ public static Ejb3Column[] buildColumnFromAnnotation( throw new AnnotationException( "AttributeOverride.column() should override all columns for now" ); } actualCols = overriddenCols.length == 0 ? null : overriddenCols; - LOG.debug("Column(s) overridden for property " + inferredData.getPropertyName()); + LOG.debugf("Column(s) overridden for property %s", inferredData.getPropertyName()); } if ( actualCols == null ) { columns = buildImplicitColumn( diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java b/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java index 1bbb098815..265aa74883 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3DiscriminatorColumn.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import javax.persistence.DiscriminatorColumn; import javax.persistence.DiscriminatorType; - import org.hibernate.AssertionFailure; import org.hibernate.annotations.DiscriminatorFormula; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java b/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java index e57636a81f..9114540bf6 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Ejb3JoinColumn.java @@ -22,18 +22,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; import javax.persistence.JoinColumn; import javax.persistence.PrimaryKeyJoinColumn; - import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; import org.hibernate.MappingException; -import org.hibernate.util.StringHelper; import org.hibernate.annotations.JoinColumnOrFormula; import org.hibernate.annotations.JoinColumnsOrFormulas; import org.hibernate.annotations.JoinFormula; @@ -44,6 +41,7 @@ import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Table; import org.hibernate.mapping.Value; +import org.hibernate.util.StringHelper; /** * Wrap state of an EJB3 @JoinColumn annotation diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java b/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java index 71f464b524..b72745ba20 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Environment.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.io.IOException; import java.io.InputStream; import java.sql.Connection; @@ -33,11 +32,12 @@ import java.util.Map; import java.util.Properties; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.Version; import org.hibernate.bytecode.BytecodeProvider; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.util.ConfigHelper; +import org.jboss.logging.Logger; /** @@ -563,8 +563,7 @@ public final class Environment { private static final Map OBSOLETE_PROPERTIES = new HashMap(); private static final Map RENAMED_PROPERTIES = new HashMap(); - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - Environment.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Environment.class.getName()); /** * Issues warnings to the user when any obsolete or renamed property names are used. diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ExtendedMappings.java b/hibernate-core/src/main/java/org/hibernate/cfg/ExtendedMappings.java index 4cac7397de..e052340569 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ExtendedMappings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ExtendedMappings.java @@ -23,6 +23,7 @@ */ package org.hibernate.cfg; + /** * Allow annotation related mappings *

diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ExtendsQueueEntry.java b/hibernate-core/src/main/java/org/hibernate/cfg/ExtendsQueueEntry.java index 8e4b425afc..e7bb48d37f 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ExtendsQueueEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ExtendsQueueEntry.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Set; - import org.hibernate.util.xml.XmlDocument; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/FkSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/FkSecondPass.java index 0ee893166e..c2fd09e0a0 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/FkSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/FkSecondPass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.concurrent.atomic.AtomicInteger; - import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Value; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java index 9a5978aeba..c596193522 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -36,7 +35,7 @@ import org.hibernate.EntityMode; import org.hibernate.FetchMode; import org.hibernate.FlushMode; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.engine.FilterDefinition; @@ -97,6 +96,7 @@ import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; import org.hibernate.util.xml.XmlDocument; +import org.jboss.logging.Logger; /** * Walks an XML mapping document and produces the Hibernate configuration-time metamodel (the @@ -106,8 +106,7 @@ */ public final class HbmBinder { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - HbmBinder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, HbmBinder.class.getName()); /** * Private constructor to disallow instantiation. @@ -228,7 +227,7 @@ private static void bindImport(Element importNode, Mappings mappings) { String rename = ( renameNode == null ) ? StringHelper.unqualify( className ) : renameNode.getValue(); - LOG.debug("Import: " + rename + " -> " + className); + LOG.debugf("Import: %s -> %s", rename, className); mappings.addImport( className, rename ); } @@ -1318,7 +1317,7 @@ else if ( node.getName().equals( "properties" ) ) { if ( columns.length() > 0 ) msg += " -> " + columns; // TODO: this fails if we run with debug on! // if ( model.getType()!=null ) msg += ", type: " + model.getType().getName(); - LOG.debug(msg); + LOG.debugf(msg); } property.setMetaAttributes( getMetas( node, inheritedMetas ) ); @@ -2600,7 +2599,7 @@ private static void bindManyToManySubelements( if ( condition==null) { throw new MappingException("no filter condition found for filter: " + name); } - LOG.debug("Applying many-to-many filter [" + name + "] as [" + condition + "] to role [" + collection.getRole() + "]"); + LOG.debugf("Applying many-to-many filter [%s] as [%s] to role [%s]", name, condition, collection.getRole()); collection.addManyToManyFilter( name, condition ); } } @@ -2633,7 +2632,7 @@ private static void bindNamedQuery(Element queryElem, String path, Mappings mapp String queryName = queryElem.attributeValue( "name" ); if (path!=null) queryName = path + '.' + queryName; String query = queryElem.getText(); - LOG.debug("Named query: " + queryName + " -> " + query); + LOG.debugf("Named query: %s -> %s", queryName, query); boolean cacheable = "true".equals( queryElem.attributeValue( "cacheable" ) ); String region = queryElem.attributeValue( "cache-region" ); @@ -2966,7 +2965,7 @@ public static String getClassName(String unqualifiedName, String defaultPackage) private static void parseFilterDef(Element element, Mappings mappings) { String name = element.attributeValue( "name" ); - LOG.debug("Parsing filter-def [" + name + "]"); + LOG.debugf("Parsing filter-def [%s]", name); String defaultCondition = element.getTextTrim(); if ( StringHelper.isEmpty( defaultCondition ) ) { defaultCondition = element.attributeValue( "condition" ); @@ -2977,12 +2976,12 @@ private static void parseFilterDef(Element element, Mappings mappings) { final Element param = (Element) params.next(); final String paramName = param.attributeValue( "name" ); final String paramType = param.attributeValue( "type" ); - LOG.debug("Adding filter parameter : " + paramName + " -> " + paramType); + LOG.debugf("Adding filter parameter : %s -> %s", paramName, paramType); final Type heuristicType = mappings.getTypeResolver().heuristicType( paramType ); - LOG.debug("Parameter heuristic type : " + heuristicType); + LOG.debugf("Parameter heuristic type : %s", heuristicType); paramMappings.put( paramName, heuristicType ); } - LOG.debug("Parsed filter-def [" + name + "]"); + LOG.debugf("Parsed filter-def [%s]", name); FilterDefinition def = new FilterDefinition( name, defaultCondition, paramMappings ); mappings.addFilterDefinition( def ); } @@ -3005,7 +3004,7 @@ private static void parseFilter(Element filterElement, Filterable filterable, Ma if ( condition==null) { throw new MappingException("no filter condition found for filter: " + name); } - LOG.debug("Applying filter [" + name + "] as [" + condition + "]"); + LOG.debugf("Applying filter [%s] as [%s]", name, condition); filterable.addFilter( name, condition ); } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java index 8cd2071ef2..15cb3bc6cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.io.Serializable; - -import org.hibernate.util.StringHelper; import org.hibernate.AssertionFailure; +import org.hibernate.util.StringHelper; /** * An improved naming strategy that prefers embedded diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/IndexColumn.java b/hibernate-core/src/main/java/org/hibernate/cfg/IndexColumn.java index 1c439ff698..9f4345dbe9 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/IndexColumn.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/IndexColumn.java @@ -22,11 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Map; - import javax.persistence.OrderColumn; - import org.hibernate.mapping.Join; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java index e466de62f4..554b092675 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/IndexOrUniqueKeySecondPass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Map; - import org.hibernate.AnnotationException; import org.hibernate.MappingException; import org.hibernate.mapping.Column; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/InheritanceState.java b/hibernate-core/src/main/java/org/hibernate/cfg/InheritanceState.java index ecdd7fd0f9..f3c1dd1d7f 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/InheritanceState.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/InheritanceState.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -33,7 +32,6 @@ import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.MappedSuperclass; - import org.hibernate.AnnotationException; import org.hibernate.annotations.common.reflection.XAnnotatedElement; import org.hibernate.annotations.common.reflection.XClass; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java index d00df9ec3c..c432a05c5e 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/JoinedSubclassFkSecondPass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Map; - import org.hibernate.MappingException; import org.hibernate.cfg.annotations.TableBinder; import org.hibernate.mapping.JoinedSubclass; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Mappings.java b/hibernate-core/src/main/java/org/hibernate/cfg/Mappings.java index 3e3bb128dd..d83f2a1524 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Mappings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Mappings.java @@ -22,35 +22,33 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.io.Serializable; import java.util.Iterator; import java.util.List; -import java.util.Properties; -import java.util.Map; import java.util.ListIterator; - +import java.util.Map; +import java.util.Properties; import org.hibernate.AnnotationException; import org.hibernate.DuplicateMappingException; import org.hibernate.MappingException; import org.hibernate.annotations.AnyMetaDef; import org.hibernate.annotations.common.reflection.ReflectionManager; import org.hibernate.annotations.common.reflection.XClass; -import org.hibernate.id.factory.DefaultIdentifierGeneratorFactory; import org.hibernate.engine.FilterDefinition; import org.hibernate.engine.NamedQueryDefinition; import org.hibernate.engine.NamedSQLQueryDefinition; import org.hibernate.engine.ResultSetMappingDefinition; +import org.hibernate.id.factory.DefaultIdentifierGeneratorFactory; +import org.hibernate.mapping.AuxiliaryDatabaseObject; import org.hibernate.mapping.Collection; +import org.hibernate.mapping.Column; +import org.hibernate.mapping.FetchProfile; import org.hibernate.mapping.IdGenerator; import org.hibernate.mapping.Join; import org.hibernate.mapping.MetadataSource; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; import org.hibernate.mapping.TypeDef; -import org.hibernate.mapping.AuxiliaryDatabaseObject; -import org.hibernate.mapping.Column; -import org.hibernate.mapping.FetchProfile; import org.hibernate.type.TypeResolver; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/MetadataSourceType.java b/hibernate-core/src/main/java/org/hibernate/cfg/MetadataSourceType.java index d4b8e2b5c3..662dc53197 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/MetadataSourceType.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/MetadataSourceType.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java index bb3686dcea..dd49cb4e1f 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java @@ -22,25 +22,25 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.ArrayList; import java.util.Iterator; import java.util.Map; import org.dom4j.Attribute; import org.dom4j.Element; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.engine.NamedSQLQueryDefinition; import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * @author Emmanuel Bernard */ public class NamedSQLQuerySecondPass extends ResultSetMappingBinder implements QuerySecondPass { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - NamedSQLQuerySecondPass.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + NamedSQLQuerySecondPass.class.getName()); private Element queryElem; private String path; @@ -116,7 +116,7 @@ public void doSecondPass(Map persistentClasses) throws MappingException { ); } - LOG.debug("Named SQL query: " + queryName + " -> " + namedQuery.getQueryString()); + LOG.debugf("Named SQL query: %s -> %s", queryName, namedQuery.getQueryString()); mappings.addSQLQuery( queryName, namedQuery ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/NamingStrategy.java b/hibernate-core/src/main/java/org/hibernate/cfg/NamingStrategy.java index c4b65e02c0..c78e0f2f03 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/NamingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/NamingStrategy.java @@ -23,6 +23,7 @@ */ package org.hibernate.cfg; + /** * A set of rules for determining the physical column * and table names given the information in the mapping diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/NotYetImplementedException.java b/hibernate-core/src/main/java/org/hibernate/cfg/NotYetImplementedException.java index 1489b82fbf..c2e9827682 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/NotYetImplementedException.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/NotYetImplementedException.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import org.hibernate.MappingException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ObjectNameNormalizer.java b/hibernate-core/src/main/java/org/hibernate/cfg/ObjectNameNormalizer.java index 8cc21272c2..1b7593f3f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ObjectNameNormalizer.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ObjectNameNormalizer.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import org.hibernate.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ObjectNameSource.java b/hibernate-core/src/main/java/org/hibernate/cfg/ObjectNameSource.java index 7d7b628134..17a0b20aca 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ObjectNameSource.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ObjectNameSource.java @@ -23,6 +23,7 @@ */ package org.hibernate.cfg; + /** * Source for database object names (identifiers). * diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java index a1d98977f3..8c816850d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/OneToOneSecondPass.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Iterator; import java.util.Map; - import org.hibernate.AnnotationException; import org.hibernate.MappingException; import org.hibernate.annotations.ForeignKey; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/PkDrivenByDefaultMapsIdSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/PkDrivenByDefaultMapsIdSecondPass.java index 92772a0451..9326a88cd5 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/PkDrivenByDefaultMapsIdSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/PkDrivenByDefaultMapsIdSecondPass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Map; - import org.hibernate.AnnotationException; import org.hibernate.MappingException; import org.hibernate.cfg.annotations.TableBinder; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyContainer.java b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyContainer.java index 550477bc7a..b384526fec 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyContainer.java @@ -25,7 +25,6 @@ // $Id$ package org.hibernate.cfg; - import java.util.Collection; import java.util.Collections; import java.util.List; @@ -38,7 +37,7 @@ import javax.persistence.OneToOne; import javax.persistence.Transient; import org.hibernate.AnnotationException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.annotations.ManyToAny; import org.hibernate.annotations.Target; @@ -46,6 +45,7 @@ import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * A helper class to keep the {@code XProperty}s of a class ordered by access type. @@ -58,8 +58,7 @@ class PropertyContainer { System.setProperty("jboss.i18n.generate-proxies", "true"); } - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - PropertyContainer.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, PropertyContainer.class.getName()); private final AccessType explicitClassDefinedAccessType; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyData.java b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyData.java index 487693adfb..3bbf82ec7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyData.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyData.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import org.hibernate.MappingException; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolder.java b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolder.java index ef1354add1..24c1d7d468 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolder.java @@ -22,18 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import javax.persistence.Column; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; - +import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; import org.hibernate.mapping.Join; import org.hibernate.mapping.KeyValue; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.Table; -import org.hibernate.annotations.common.reflection.XClass; /** * Property holder abstract property containers from their direct implementation diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java index a4490ed57f..1564cd92b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyHolderBuilder.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Map; - import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; import org.hibernate.cfg.annotations.EntityBinder; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyInferredData.java b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyInferredData.java index db675f0f5e..77f0d10acc 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyInferredData.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyInferredData.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import javax.persistence.Access; - import org.hibernate.MappingException; import org.hibernate.annotations.Target; import org.hibernate.annotations.common.reflection.ReflectionManager; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java index 7d11faf72e..cd050639e7 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/PropertyPreloadedData.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import org.hibernate.MappingException; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/QuerySecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/QuerySecondPass.java index 80259f264e..0cde96dee1 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/QuerySecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/QuerySecondPass.java @@ -23,6 +23,7 @@ */ package org.hibernate.cfg; + /** * Bind query * diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/RecoverableException.java b/hibernate-core/src/main/java/org/hibernate/cfg/RecoverableException.java index f407bbfbef..3b320f1041 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/RecoverableException.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/RecoverableException.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import org.hibernate.AnnotationException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ResultSetMappingBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/ResultSetMappingBinder.java index 2ab15d411c..44739bbe12 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ResultSetMappingBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ResultSetMappingBinder.java @@ -22,30 +22,27 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Set; -import java.util.HashSet; import java.util.Map; - +import java.util.Set; import org.dom4j.Element; import org.hibernate.LockMode; import org.hibernate.MappingException; -import org.hibernate.engine.query.sql.NativeSQLQueryCollectionReturn; import org.hibernate.engine.ResultSetMappingDefinition; +import org.hibernate.engine.query.sql.NativeSQLQueryCollectionReturn; import org.hibernate.engine.query.sql.NativeSQLQueryJoinReturn; import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn; import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn; import org.hibernate.mapping.Component; import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.Value; import org.hibernate.mapping.Property; import org.hibernate.mapping.ToOne; +import org.hibernate.mapping.Value; import org.hibernate.type.Type; -import org.hibernate.type.TypeFactory; import org.hibernate.util.ArrayHelper; import org.hibernate.util.CollectionHelper; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ResultSetMappingSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/ResultSetMappingSecondPass.java index 6d007efcb2..41019d74b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ResultSetMappingSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ResultSetMappingSecondPass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Map; - import org.dom4j.Element; import org.hibernate.MappingException; import org.hibernate.engine.ResultSetMappingDefinition; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/SecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/SecondPass.java index b64ef22e6e..ab20270c10 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/SecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/SecondPass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.io.Serializable; - import org.hibernate.MappingException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java index 9d17c0d8a2..f02b70e514 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/SecondaryTableSecondPass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Map; - import org.hibernate.MappingException; import org.hibernate.annotations.common.reflection.XAnnotatedElement; import org.hibernate.cfg.annotations.EntityBinder; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/SetSimpleValueTypeSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/SetSimpleValueTypeSecondPass.java index f1667c0f95..115b0f7980 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/SetSimpleValueTypeSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/SetSimpleValueTypeSecondPass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Map; - import org.hibernate.MappingException; import org.hibernate.cfg.annotations.SimpleValueBinder; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java b/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java index 5e8056a6b5..112c2a590d 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/Settings.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Map; - import org.hibernate.ConnectionReleaseMode; import org.hibernate.EntityMode; import org.hibernate.cache.QueryCacheFactory; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java b/hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java index e65e75bef7..f1cf5664e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java @@ -22,14 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.io.Serializable; import java.util.Map; import java.util.Properties; import org.hibernate.ConnectionReleaseMode; import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.bytecode.BytecodeProvider; import org.hibernate.cache.QueryCacheFactory; import org.hibernate.cache.RegionFactory; @@ -48,6 +47,7 @@ import org.hibernate.transaction.TransactionManagerLookupFactory; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Reads configuration properties and builds a {@link Settings} instance. @@ -58,8 +58,7 @@ public class SettingsFactory implements Serializable { private static final long serialVersionUID = -1194386144994524825L; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SettingsFactory.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SettingsFactory.class.getName()); public static final String DEF_CACHE_REG_FACTORY = NoCachingRegionFactory.class.getName(); @@ -278,7 +277,7 @@ else if ( "cglib".equals( providerName ) ) { return new org.hibernate.bytecode.cglib.BytecodeProviderImpl(); } else { - LOG.debug("Using javassist as bytecode provider by default"); + LOG.debugf("Using javassist as bytecode provider by default"); return new org.hibernate.bytecode.javassist.BytecodeProviderImpl(); } } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/ToOneBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/ToOneBinder.java index 99bf0063bd..54064b41b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ToOneBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ToOneBinder.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import javax.persistence.ManyToOne; import javax.persistence.OneToOne; - import org.hibernate.AssertionFailure; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; 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 ac669a6c10..2c6f328f66 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/ToOneFkSecondPass.java @@ -22,20 +22,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Iterator; - import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; import org.hibernate.MappingException; import org.hibernate.cfg.annotations.TableBinder; +import org.hibernate.mapping.Component; +import org.hibernate.mapping.KeyValue; import org.hibernate.mapping.ManyToOne; import org.hibernate.mapping.OneToOne; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.ToOne; -import org.hibernate.mapping.KeyValue; -import org.hibernate.mapping.Component; import org.hibernate.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/UniqueConstraintHolder.java b/hibernate-core/src/main/java/org/hibernate/cfg/UniqueConstraintHolder.java index f4808b238b..5d07a58ed0 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/UniqueConstraintHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/UniqueConstraintHolder.java @@ -23,6 +23,7 @@ */ package org.hibernate.cfg; + /** * {@link javax.persistence.UniqueConstraint} annotations are handled via second pass. I do not * understand the reasons why at this time, so here I use a holder object to hold the information diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java index 0981098e5b..7b148d4723 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg; - import java.util.Map; - import org.hibernate.MappingException; import org.hibernate.annotations.FetchProfile; import org.hibernate.mapping.MetadataSource; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/WrappedInferredData.java b/hibernate-core/src/main/java/org/hibernate/cfg/WrappedInferredData.java index 18d2ad5f95..a43c96f407 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/WrappedInferredData.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/WrappedInferredData.java @@ -21,8 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cfg; - +package org.hibernate.cfg; import org.hibernate.MappingException; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.XProperty; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java index f81d1f5328..f03aebd9bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ArrayBinder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import org.hibernate.mapping.Array; import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/BagBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/BagBinder.java index 534b88adb1..c0490c57e2 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/BagBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/BagBinder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java index 320949470d..64e817b6b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; @@ -44,7 +43,7 @@ import javax.persistence.OneToMany; import org.hibernate.AnnotationException; import org.hibernate.FetchMode; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.Cache; @@ -109,6 +108,7 @@ import org.hibernate.mapping.SingleTableSubclass; import org.hibernate.mapping.Table; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Base class for binding different types of collections to Hibernate configuration objects. @@ -118,8 +118,7 @@ */ @SuppressWarnings({"unchecked", "serial"}) public abstract class CollectionBinder { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - CollectionBinder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, CollectionBinder.class.getName()); protected Collection collection; protected String propertyName; @@ -371,7 +370,7 @@ public void setDeclaringClass(XClass declaringClass) { public void bind() { this.collection = createCollection( propertyHolder.getPersistentClass() ); String role = StringHelper.qualify(propertyHolder.getPath(), propertyName); - LOG.debug("Collection role: " + role); + LOG.debugf("Collection role: %s", role); collection.setRole(role); collection.setNodeName( propertyName ); @@ -715,7 +714,7 @@ protected void bindOneToManySecondPass( String hqlOrderBy, Mappings mappings, Map inheritanceStatePerClass) { - LOG.debug("Binding a OneToMany: " + propertyHolder.getEntityName() + "." + propertyName + " through a foreign key"); + LOG.debugf("Binding a OneToMany: %s.%s through a foreign key", propertyHolder.getEntityName(), propertyName); org.hibernate.mapping.OneToMany oneToMany = new org.hibernate.mapping.OneToMany( mappings, collection.getOwner() ); collection.setElement( oneToMany ); oneToMany.setReferencedEntityName( collectionType.getName() ); @@ -1146,10 +1145,10 @@ protected void bindManyToManySecondPass( ManyToAny anyAnn = property.getAnnotation( ManyToAny.class ); if (LOG.isDebugEnabled()) { String path = collValue.getOwnerEntityName() + "." + joinColumns[0].getPropertyName(); - if (isCollectionOfEntities && unique) LOG.debug("Binding a OneToMany: " + path + " through an association table"); - else if (isCollectionOfEntities) LOG.debug("Binding as ManyToMany: " + path); - else if (anyAnn != null) LOG.debug("Binding a ManyToAny: " + path); - else LOG.debug("Binding a collection of element: " + path); + if (isCollectionOfEntities && unique) LOG.debugf("Binding a OneToMany: %s through an association table", path); + else if (isCollectionOfEntities) LOG.debugf("Binding as ManyToMany: %s", path); + else if (anyAnn != null) LOG.debugf("Binding a ManyToAny: %s", path); + else LOG.debugf("Binding a collection of element: %s", path); } //check for user error if ( !isCollectionOfEntities ) { diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CustomizableColumns.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CustomizableColumns.java index b9c2f8ef2b..5d5dfb29a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CustomizableColumns.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/CustomizableColumns.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.lang.annotation.Annotation; import javax.persistence.Column; - import org.hibernate.annotations.Columns; /** diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java index a2e37d79f0..838e6300f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -37,7 +36,7 @@ import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.Cache; @@ -85,6 +84,7 @@ import org.hibernate.mapping.Value; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Stateful holder and processor for binding Entity information @@ -92,8 +92,7 @@ * @author Emmanuel Bernard */ public class EntityBinder { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - EntityBinder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, EntityBinder.class.getName()); private String name; private XClass annotatedClass; @@ -339,7 +338,7 @@ public void bindEntity() { persistentClass.addFilter( filterName, cond ); } } else if (filters.size() > 0) LOG.filterAnnotationOnSubclass(persistentClass.getEntityName()); - LOG.debug("Import with entity name " + name); + LOG.debugf("Import with entity name %s", name); try { mappings.addImport( persistentClass.getEntityName(), name ); String entityName = persistentClass.getEntityName(); diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java index e5c9219cea..19fe62eb6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/IdBagBinder.java @@ -21,11 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.cfg.annotations; - +package org.hibernate.cfg.annotations; import java.util.Collections; import java.util.Map; - import org.hibernate.AnnotationException; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ListBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ListBinder.java index e5d3d1b121..398c1cb9fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ListBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ListBinder.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.util.Map; import org.hibernate.AnnotationException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.annotations.OrderBy; import org.hibernate.annotations.Sort; @@ -45,6 +44,7 @@ import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.SimpleValue; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Bind a list to the underlying Hibernate configuration @@ -54,8 +54,7 @@ */ @SuppressWarnings({"unchecked", "serial"}) public class ListBinder extends CollectionBinder { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - ListBinder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, ListBinder.class.getName()); public ListBinder() { } 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 b96a21776a..76ce208033 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 @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -30,7 +29,6 @@ import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverrides; import javax.persistence.MapKeyClass; - import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; import org.hibernate.FetchMode; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapKeyColumnDelegator.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapKeyColumnDelegator.java index 9b0782eb76..9905088b4c 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapKeyColumnDelegator.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapKeyColumnDelegator.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.lang.annotation.Annotation; import javax.persistence.Column; import javax.persistence.MapKeyColumn; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapKeyJoinColumnDelegator.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapKeyJoinColumnDelegator.java index c6c0c2bcc9..2d7584d879 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapKeyJoinColumnDelegator.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/MapKeyJoinColumnDelegator.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.lang.annotation.Annotation; import javax.persistence.Column; -import javax.persistence.MapKeyJoinColumn; import javax.persistence.JoinColumn; +import javax.persistence.MapKeyJoinColumn; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/Nullability.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/Nullability.java index cc4a12c830..6d26146c94 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/Nullability.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/Nullability.java @@ -23,6 +23,7 @@ */ package org.hibernate.cfg.annotations; + /** * Are the columns forced to null, not null or not forced * diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java index 5d243d104e..293daa917d 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/PrimitiveArrayBinder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.PrimitiveArray; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java index 8a89b8f412..6e86ea6b38 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java @@ -22,12 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.util.Map; import javax.persistence.EmbeddedId; import javax.persistence.Id; import org.hibernate.AnnotationException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.annotations.Generated; import org.hibernate.annotations.GenerationTime; import org.hibernate.annotations.Immutable; @@ -52,13 +51,13 @@ import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Value; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * @author Emmanuel Bernard */ public class PropertyBinder { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - PropertyBinder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, PropertyBinder.class.getName()); private String name; private String returnedClassName; @@ -171,7 +170,7 @@ private void validateMake() { private Property makePropertyAndValue() { validateBind(); - LOG.debug("Binder property " + name + " with lazy=" + lazy); + LOG.debugf("Binder property %s with lazy=%s", name, lazy); String containerClassName = holder == null ? null : holder.getClassName(); @@ -251,7 +250,7 @@ private Property bind(Property prop) { //used when the value is provided and the binding is done elsewhere public Property makeProperty() { validateMake(); - LOG.debug("Building property " + name); + LOG.debugf("Building property %s", name); Property prop = new Property(); prop.setName( name ); prop.setNodeName( name ); diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java index b490b1308b..7f63db2f74 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.util.HashMap; import javax.persistence.NamedNativeQueries; import javax.persistence.NamedNativeQuery; @@ -35,8 +34,8 @@ import org.hibernate.AssertionFailure; import org.hibernate.CacheMode; import org.hibernate.FlushMode; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.annotations.CacheModeType; import org.hibernate.annotations.FlushModeType; import org.hibernate.cfg.BinderHelper; @@ -46,6 +45,7 @@ import org.hibernate.engine.NamedSQLQueryDefinition; import org.hibernate.engine.query.sql.NativeSQLQueryReturn; import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn; +import org.jboss.logging.Logger; /** * Query binder @@ -53,14 +53,12 @@ * @author Emmanuel Bernard */ public abstract class QueryBinder { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - QueryBinder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, QueryBinder.class.getName()); public static void bindQuery(NamedQuery queryAnn, Mappings mappings, boolean isDefault) { if ( queryAnn == null ) return; - if ( BinderHelper.isEmptyAnnotationValue( queryAnn.name() ) ) { - throw new AnnotationException( "A named query must have a name when used in class or package level" ); - } + if (BinderHelper.isEmptyAnnotationValue(queryAnn.name())) throw new AnnotationException( + "A named query must have a name when used in class or package level"); //EJBQL Query QueryHint[] hints = queryAnn.hints(); String queryName = queryAnn.query(); @@ -89,9 +87,8 @@ public static void bindQuery(NamedQuery queryAnn, Mappings mappings, boolean isD public static void bindNativeQuery(NamedNativeQuery queryAnn, Mappings mappings, boolean isDefault) { if ( queryAnn == null ) return; //ResultSetMappingDefinition mappingDefinition = mappings.getResultSetMapping( queryAnn.resultSetMapping() ); - if ( BinderHelper.isEmptyAnnotationValue( queryAnn.name() ) ) { - throw new AnnotationException( "A named query must have a name when used in class or package level" ); - } + if (BinderHelper.isEmptyAnnotationValue(queryAnn.name())) throw new AnnotationException( + "A named query must have a name when used in class or package level"); NamedSQLQueryDefinition query; String resultSetMapping = queryAnn.resultSetMapping(); QueryHint[] hints = queryAnn.hints(); @@ -150,10 +147,9 @@ else if ( !void.class.equals( queryAnn.resultClass() ) ) { public static void bindNativeQuery(org.hibernate.annotations.NamedNativeQuery queryAnn, Mappings mappings) { if ( queryAnn == null ) return; //ResultSetMappingDefinition mappingDefinition = mappings.getResultSetMapping( queryAnn.resultSetMapping() ); - if ( BinderHelper.isEmptyAnnotationValue( queryAnn.name() ) ) { - throw new AnnotationException( "A named query must have a name when used in class or package level" ); - } - NamedSQLQueryDefinition query; + if (BinderHelper.isEmptyAnnotationValue(queryAnn.name())) throw new AnnotationException( + "A named query must have a name when used in class or package level"); + NamedSQLQueryDefinition query; String resultSetMapping = queryAnn.resultSetMapping(); if ( !BinderHelper.isEmptyAnnotationValue( resultSetMapping ) ) { //sql result set usage @@ -226,10 +222,8 @@ public static void bindNativeQueries( public static void bindQuery(org.hibernate.annotations.NamedQuery queryAnn, Mappings mappings) { if ( queryAnn == null ) return; - if ( BinderHelper.isEmptyAnnotationValue( queryAnn.name() ) ) { - throw new AnnotationException( "A named query must have a name when used in class or package level" ); - } - + if (BinderHelper.isEmptyAnnotationValue(queryAnn.name())) throw new AnnotationException( + "A named query must have a name when used in class or package level"); FlushMode flushMode; flushMode = getFlushMode( queryAnn.flushMode() ); diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java index 5187b1f3b0..09d0ebf8e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -34,8 +33,8 @@ import javax.persistence.EntityResult; import javax.persistence.FieldResult; import javax.persistence.SqlResultSetMapping; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.MappingException; import org.hibernate.cfg.BinderHelper; import org.hibernate.cfg.Mappings; @@ -49,13 +48,14 @@ import org.hibernate.mapping.ToOne; import org.hibernate.mapping.Value; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * @author Emmanuel Bernard */ public class ResultsetMappingSecondPass implements QuerySecondPass { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - ResultsetMappingSecondPass.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + ResultsetMappingSecondPass.class.getName()); private SqlResultSetMapping ann; private Mappings mappings; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/SetBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/SetBinder.java index 2bfbf2b445..ccb5083e7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/SetBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/SetBinder.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.annotations.OrderBy; import org.hibernate.cfg.Environment; import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; +import org.jboss.logging.Logger; /** * Bind a set. @@ -35,8 +35,7 @@ * @author Matthew Inger */ public class SetBinder extends CollectionBinder { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SetBinder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SetBinder.class.getName()); public SetBinder() { } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java index 8cb3294cff..4842c15e27 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.io.Serializable; import java.sql.Types; import java.util.Calendar; @@ -37,7 +36,7 @@ import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; import org.hibernate.Hibernate; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.annotations.Parameter; import org.hibernate.annotations.Type; import org.hibernate.annotations.common.reflection.XClass; @@ -57,13 +56,13 @@ import org.hibernate.type.SerializableToBlobType; import org.hibernate.type.WrappedMaterializedBlobType; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * @author Emmanuel Bernard */ public class SimpleValueBinder { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SimpleValueBinder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SimpleValueBinder.class.getName()); private String propertyName; private String returnedClassName; @@ -299,7 +298,7 @@ private void validate() { public SimpleValue make() { validate(); - LOG.debug("building SimpleValue for " + propertyName); + LOG.debugf("building SimpleValue for %s", propertyName); if ( table == null ) { table = columns[0].getTable(); } @@ -337,7 +336,7 @@ public void linkWithValue() { public void fillSimpleValue() { - LOG.debug("Setting SimpleValue typeName for " + propertyName); + LOG.debugf("Setting SimpleValue typeName for %s", propertyName); String type = BinderHelper.isEmptyAnnotationValue( explicitType ) ? returnedClassName : explicitType; org.hibernate.mapping.TypeDef typeDef = mappings.getTypeDef( type ); diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java index 8066d7020a..e6618dfda1 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java @@ -22,14 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; import javax.persistence.UniqueConstraint; import org.hibernate.AnnotationException; import org.hibernate.AssertionFailure; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.annotations.Index; import org.hibernate.cfg.BinderHelper; import org.hibernate.cfg.Ejb3JoinColumn; @@ -51,6 +50,7 @@ import org.hibernate.mapping.Value; import org.hibernate.util.CollectionHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Table related operations @@ -60,8 +60,7 @@ @SuppressWarnings("unchecked") public class TableBinder { //TODO move it to a getter/setter strategy - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - TableBinder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, TableBinder.class.getName()); private String schema; private String catalog; @@ -339,7 +338,7 @@ public static void bindFk( * Get the columns of the mapped-by property * copy them and link the copy to the actual value */ - LOG.debug("Retrieving property " + associatedClass.getEntityName() + "." + mappedByProperty); + LOG.debugf("Retrieving property %s.%s", associatedClass.getEntityName(), mappedByProperty); final Property property = associatedClass.getRecursiveProperty( columns[0].getMappedBy() ); Iterator mappedByColumns; @@ -446,7 +445,7 @@ else if ( value instanceof DependantValue ) { Iterator idColItr = referencedEntity.getKey().getColumnIterator(); org.hibernate.mapping.Column col; Table table = referencedEntity.getTable(); //works cause the pk has to be on the primary table - if (!idColItr.hasNext()) LOG.debug("No column in the identifier!"); + if (!idColItr.hasNext()) LOG.debugf("No column in the identifier!"); while ( idColItr.hasNext() ) { boolean match = false; //for each PK column, find the associated FK column. diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/Version.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/Version.java index 8fa4a3ed47..615f121848 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/Version.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/Version.java @@ -24,7 +24,8 @@ // $Id$ -package org.hibernate.cfg.annotations; +package org.hibernate.cfg.annotations; + /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java index dd76f1dff8..aa73814f6c 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAMetadataProvider.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.annotations.reflection; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; @@ -37,9 +36,7 @@ import javax.persistence.SequenceGenerator; import javax.persistence.SqlResultSetMapping; import javax.persistence.TableGenerator; - import org.dom4j.Element; - import org.hibernate.annotations.common.reflection.AnnotationReader; import org.hibernate.annotations.common.reflection.MetadataProvider; import org.hibernate.annotations.common.reflection.java.JavaMetadataProvider; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java index 96cb6acf28..7766ca00b0 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java @@ -23,7 +23,6 @@ */ package org.hibernate.cfg.annotations.reflection; - import java.beans.Introspector; import java.lang.annotation.Annotation; import java.lang.reflect.AccessibleObject; @@ -118,7 +117,7 @@ import org.dom4j.Attribute; import org.dom4j.Element; import org.hibernate.AnnotationException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CollectionOfElements; import org.hibernate.annotations.Columns; @@ -129,6 +128,7 @@ import org.hibernate.annotations.common.reflection.ReflectionUtil; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Encapsulates the overriding of Java annotations from an EJB 3.0 descriptor. @@ -140,8 +140,8 @@ */ @SuppressWarnings("unchecked") public class JPAOverridenAnnotationReader implements AnnotationReader { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - JPAOverridenAnnotationReader.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + JPAOverridenAnnotationReader.class.getName()); private static final Map annotationToXml; private static final String SCHEMA_VALIDATION = "Activate schema validation for more information"; private static final Filter FILTER = new Filter() { diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java index ff897de9cf..dfc8b4721d 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java @@ -24,8 +24,7 @@ // $Id$ -package org.hibernate.cfg.annotations.reflection; - +package org.hibernate.cfg.annotations.reflection; import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; @@ -35,15 +34,15 @@ import org.dom4j.Document; import org.dom4j.Element; import org.hibernate.AnnotationException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * @author Emmanuel Bernard */ public class XMLContext implements Serializable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - XMLContext.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, XMLContext.class.getName()); private Default globalDefaults; private Map classOverriding = new HashMap(); private Map defaultsOverriding = new HashMap(); @@ -153,7 +152,7 @@ private void addClass(List entities, String packageName, Default defaul setAccess( access, localDefault ); defaultsOverriding.put( className, localDefault ); - LOG.debug("Adding XML overriding information for " + className); + LOG.debugf("Adding XML overriding information for %s", className); addEntityListenerClasses( element, packageName, addedClasses ); } } @@ -172,15 +171,13 @@ private List addEntityListenerClasses(Element element, String packageNam LOG.duplicateListener(listenerClassName); continue; } - else { - throw new IllegalStateException( "Duplicate XML entry for " + listenerClassName ); - } + throw new IllegalStateException("Duplicate XML entry for " + listenerClassName); } localAddedClasses.add( listenerClassName ); classOverriding.put( listenerClassName, listener ); } } - LOG.debug("Adding XML overriding information for listeners: " + localAddedClasses); + LOG.debugf("Adding XML overriding information for listeners: %s", localAddedClasses); addedClasses.addAll( localAddedClasses ); return localAddedClasses; } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java index d16727a90b..d31364f433 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationActivator.java @@ -22,14 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.beanvalidation; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Collection; import java.util.HashSet; import java.util.Properties; import java.util.Set; - import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.event.EventListeners; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java index ca462f57ff..ba3330c353 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.beanvalidation; - import java.util.HashSet; import java.util.Properties; import java.util.Set; @@ -34,7 +33,7 @@ import javax.validation.Validator; import javax.validation.ValidatorFactory; import org.hibernate.EntityMode; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cfg.Configuration; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.event.Initializable; @@ -45,6 +44,7 @@ import org.hibernate.event.PreUpdateEvent; import org.hibernate.event.PreUpdateEventListener; import org.hibernate.persister.entity.EntityPersister; +import org.jboss.logging.Logger; /** * Event listener used to enable Bean Validation for insert/update/delete events. @@ -56,8 +56,8 @@ public class BeanValidationEventListener implements PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener, Initializable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - BeanValidationEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + BeanValidationEventListener.class.getName()); private ValidatorFactory factory; private ConcurrentHashMap> associationsPerEntityPersister = diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java index 7acb3d579f..ed6315cdfe 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java @@ -22,16 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.beanvalidation; - -import java.util.Properties; -import java.util.List; import java.util.ArrayList; -import java.util.Map; import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; import javax.validation.groups.Default; - -import org.hibernate.util.ReflectHelper; import org.hibernate.HibernateException; +import org.hibernate.util.ReflectHelper; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java index 17e2650fc6..f472217dfc 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java @@ -22,21 +22,19 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.beanvalidation; - import java.lang.annotation.ElementType; -import java.util.Set; import java.util.HashSet; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.validation.TraversableResolver; import javax.validation.Path; - -import org.hibernate.persister.entity.EntityPersister; +import javax.validation.TraversableResolver; import org.hibernate.Hibernate; import org.hibernate.annotations.common.AssertionFailure; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.persister.entity.EntityPersister; +import org.hibernate.type.CollectionType; import org.hibernate.type.CompositeType; import org.hibernate.type.Type; -import org.hibernate.type.CollectionType; /** * Use Hibernate metadata to ignore cascade on entities. diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java index 7addf1bb72..ffb3814365 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.beanvalidation; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -44,7 +43,7 @@ import javax.validation.metadata.PropertyDescriptor; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.event.EventListeners; import org.hibernate.event.PreDeleteEventListener; @@ -57,6 +56,7 @@ import org.hibernate.mapping.SingleTableSubclass; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * @author Emmanuel Bernard @@ -64,8 +64,7 @@ */ class TypeSafeActivator { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - TypeSafeActivator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, TypeSafeActivator.class.getName()); private static final String FACTORY_PROPERTY = "javax.persistence.validation.factory"; @@ -126,7 +125,7 @@ public static void applyDDL(Collection persistentClasses, Prope applyDDL( "", persistentClass, clazz, factory, groups, true ); } catch (Exception e) { - LOG.warn(LOG.unableToApplyConstraints(className), e); + LOG.unableToApplyConstraints(className, e); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java b/hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java index 5c7b459b11..a003c1895d 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.internal; - import java.util.ArrayList; import java.util.List; import java.util.Map; - import org.hibernate.engine.jdbc.internal.JdbcServicesInitiator; import org.hibernate.service.classloading.internal.ClassLoaderServiceInitiator; import org.hibernate.service.internal.ServicesRegistryImpl; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java b/hibernate-core/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java index 5ff0ee89d1..9faa0f4ea9 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/search/HibernateSearchEventListenerRegister.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.cfg.search; - import java.util.Properties; import org.hibernate.AnnotationException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.event.EventListeners; import org.hibernate.event.PostCollectionRecreateEventListener; import org.hibernate.event.PostCollectionRemoveEventListener; @@ -34,6 +33,7 @@ import org.hibernate.event.PostInsertEventListener; import org.hibernate.event.PostUpdateEventListener; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; /** * Helper methods initializing Hibernate Search event listeners. @@ -45,8 +45,8 @@ @Deprecated public class HibernateSearchEventListenerRegister { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - HibernateSearchEventListenerRegister.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + HibernateSearchEventListenerRegister.class.getName()); /** * Class name of the class needed to enable Search. @@ -226,7 +226,7 @@ private static Class attemptToLoadSearchEventListener() { FULL_TEXT_INDEX_EVENT_LISTENER_CLASS, HibernateSearchEventListenerRegister.class); } catch (ClassNotFoundException e) { - LOG.debug("Search not present in classpath, ignoring event listener registration."); + LOG.debugf("Search not present in classpath, ignoring event listener registration."); } return searchEventListenerClass; } diff --git a/hibernate-core/src/main/java/org/hibernate/classic/Lifecycle.java b/hibernate-core/src/main/java/org/hibernate/classic/Lifecycle.java index 92544615c0..1be427f853 100644 --- a/hibernate-core/src/main/java/org/hibernate/classic/Lifecycle.java +++ b/hibernate-core/src/main/java/org/hibernate/classic/Lifecycle.java @@ -23,9 +23,7 @@ * */ package org.hibernate.classic; - import java.io.Serializable; - import org.hibernate.CallbackException; import org.hibernate.Session; diff --git a/hibernate-core/src/main/java/org/hibernate/classic/Session.java b/hibernate-core/src/main/java/org/hibernate/classic/Session.java index 9419708579..77a1613126 100755 --- a/hibernate-core/src/main/java/org/hibernate/classic/Session.java +++ b/hibernate-core/src/main/java/org/hibernate/classic/Session.java @@ -23,15 +23,12 @@ * */ package org.hibernate.classic; - import java.io.Serializable; import java.util.Collection; import java.util.Iterator; import java.util.List; - import org.hibernate.HibernateException; import org.hibernate.Query; -import org.hibernate.SQLQuery; import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/classic/Validatable.java b/hibernate-core/src/main/java/org/hibernate/classic/Validatable.java index b62023d67b..d5cd43bdcc 100644 --- a/hibernate-core/src/main/java/org/hibernate/classic/Validatable.java +++ b/hibernate-core/src/main/java/org/hibernate/classic/Validatable.java @@ -24,6 +24,7 @@ */ package org.hibernate.classic; + /** * Implemented by persistent classes with invariants that must * be checked before inserting into or updating the database. diff --git a/hibernate-core/src/main/java/org/hibernate/classic/ValidationFailure.java b/hibernate-core/src/main/java/org/hibernate/classic/ValidationFailure.java index 2ea50a84f0..b9d156abf5 100644 --- a/hibernate-core/src/main/java/org/hibernate/classic/ValidationFailure.java +++ b/hibernate-core/src/main/java/org/hibernate/classic/ValidationFailure.java @@ -23,7 +23,6 @@ * */ package org.hibernate.classic; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/collection/AbstractPersistentCollection.java b/hibernate-core/src/main/java/org/hibernate/collection/AbstractPersistentCollection.java index fd55345b08..464ad7f8a9 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/AbstractPersistentCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/AbstractPersistentCollection.java @@ -23,7 +23,6 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -31,7 +30,6 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; - import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.LazyInitializationException; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java index dda1ceec8b..c9035613b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java @@ -23,7 +23,6 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.lang.reflect.Array; import java.sql.ResultSet; @@ -33,11 +32,12 @@ import java.util.Iterator; import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.SessionImplementor; import org.hibernate.loader.CollectionAliases; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * A persistent wrapper for an array. Lazy initialization @@ -49,8 +49,7 @@ public class PersistentArrayHolder extends AbstractPersistentCollection { protected Object array; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - PersistentArrayHolder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, PersistentArrayHolder.class.getName()); //just to help out during the load (ugly, i know) private transient Class elementClass; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentBag.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentBag.java index 4a742cf802..908bc1b797 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentBag.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentBag.java @@ -23,7 +23,6 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; @@ -32,7 +31,6 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; - import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentCollection.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentCollection.java index 449ae5ea83..44cdc8c948 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentCollection.java @@ -23,13 +23,11 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import java.util.Iterator; - import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.loader.CollectionAliases; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentElementHolder.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentElementHolder.java index 7b7d90fe5f..2aaa08953a 100755 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentElementHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentElementHolder.java @@ -23,7 +23,6 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; @@ -31,12 +30,11 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; - import org.dom4j.Element; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.loader.CollectionAliases; import org.hibernate.engine.SessionImplementor; +import org.hibernate.loader.CollectionAliases; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.type.Type; import org.hibernate.util.CollectionHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentIdentifierBag.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentIdentifierBag.java index 47c8f0819f..3d0f3333c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentIdentifierBag.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentIdentifierBag.java @@ -23,7 +23,6 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; @@ -34,11 +33,10 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; - import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import org.hibernate.loader.CollectionAliases; import org.hibernate.engine.SessionImplementor; +import org.hibernate.loader.CollectionAliases; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentIndexedElementHolder.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentIndexedElementHolder.java index 1904055d82..b201b653ad 100755 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentIndexedElementHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentIndexedElementHolder.java @@ -23,7 +23,6 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; @@ -33,13 +32,12 @@ import java.util.Iterator; import java.util.List; import java.util.Map; - import org.dom4j.Element; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.loader.CollectionAliases; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; +import org.hibernate.loader.CollectionAliases; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.type.Type; import org.hibernate.type.XmlRepresentableType; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentList.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentList.java index d416615537..8a2ff683dc 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentList.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentList.java @@ -23,7 +23,6 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; @@ -32,7 +31,6 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; - import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentListElementHolder.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentListElementHolder.java index d72e6202f3..440f6726f1 100755 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentListElementHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentListElementHolder.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.collection; - import java.io.Serializable; import java.util.List; - import org.dom4j.Element; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentMap.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentMap.java index df28b2e9e2..d1770d195b 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentMap.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentMap.java @@ -23,7 +23,6 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; @@ -34,7 +33,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentMapElementHolder.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentMapElementHolder.java index f5a6776849..1ba9f8ec53 100755 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentMapElementHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentMapElementHolder.java @@ -23,10 +23,8 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.util.List; - import org.dom4j.Element; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentSet.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentSet.java index 497e1bf5a2..7aefc62df1 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentSet.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentSet.java @@ -23,7 +23,6 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; @@ -33,7 +32,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; - import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentSortedMap.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentSortedMap.java index 695ca1554b..649c048bc2 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentSortedMap.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentSortedMap.java @@ -23,8 +23,6 @@ * */ package org.hibernate.collection; - - import java.io.Serializable; import java.util.Collection; import java.util.Comparator; @@ -33,7 +31,6 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; - import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/collection/PersistentSortedSet.java b/hibernate-core/src/main/java/org/hibernate/collection/PersistentSortedSet.java index 204a3633ec..958153c2b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/collection/PersistentSortedSet.java +++ b/hibernate-core/src/main/java/org/hibernate/collection/PersistentSortedSet.java @@ -23,13 +23,11 @@ * */ package org.hibernate.collection; - import java.io.Serializable; import java.util.Comparator; import java.util.Iterator; import java.util.SortedSet; import java.util.TreeMap; - import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/context/CurrentSessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/CurrentSessionContext.java index bb8202bcf2..230b5f13bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/context/CurrentSessionContext.java +++ b/hibernate-core/src/main/java/org/hibernate/context/CurrentSessionContext.java @@ -23,10 +23,8 @@ * */ package org.hibernate.context; - -import org.hibernate.HibernateException; - import java.io.Serializable; +import org.hibernate.HibernateException; /** * Defines the contract for implementations which know how to scope the notion diff --git a/hibernate-core/src/main/java/org/hibernate/context/JTASessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/JTASessionContext.java index 6bf65c6f88..ab33602db4 100644 --- a/hibernate-core/src/main/java/org/hibernate/context/JTASessionContext.java +++ b/hibernate-core/src/main/java/org/hibernate/context/JTASessionContext.java @@ -23,7 +23,6 @@ * */ package org.hibernate.context; - import java.util.Hashtable; import java.util.Map; import javax.transaction.Synchronization; @@ -31,10 +30,11 @@ import javax.transaction.TransactionManager; import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.classic.Session; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.util.JTAHelper; +import org.jboss.logging.Logger; /** * An implementation of {@link CurrentSessionContext} which scopes the notion @@ -61,8 +61,7 @@ */ public class JTASessionContext implements CurrentSessionContext { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - JTASessionContext.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, JTASessionContext.class.getName()); protected final SessionFactoryImplementor factory; private transient Map currentSessionMap = new Hashtable(); diff --git a/hibernate-core/src/main/java/org/hibernate/context/ManagedSessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/ManagedSessionContext.java index 0302f13c5c..efaa2357aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/context/ManagedSessionContext.java +++ b/hibernate-core/src/main/java/org/hibernate/context/ManagedSessionContext.java @@ -23,15 +23,13 @@ * */ package org.hibernate.context; - -import org.hibernate.classic.Session; +import java.util.HashMap; +import java.util.Map; import org.hibernate.HibernateException; import org.hibernate.SessionFactory; +import org.hibernate.classic.Session; import org.hibernate.engine.SessionFactoryImplementor; -import java.util.Map; -import java.util.HashMap; - /** * Represents a {@link CurrentSessionContext} the notion of a contextual session * is managed by some external entity (generally some form of interceptor, etc). diff --git a/hibernate-core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java b/hibernate-core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java index bc9d8f7883..4585e0088e 100644 --- a/hibernate-core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java +++ b/hibernate-core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java @@ -23,7 +23,6 @@ * */ package org.hibernate.context; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -37,10 +36,11 @@ import javax.transaction.Synchronization; import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.SessionFactory; import org.hibernate.classic.Session; import org.hibernate.engine.SessionFactoryImplementor; +import org.jboss.logging.Logger; /** * A {@link CurrentSessionContext} impl which scopes the notion of current @@ -70,8 +70,8 @@ */ public class ThreadLocalSessionContext implements CurrentSessionContext { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - ThreadLocalSessionContext.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + ThreadLocalSessionContext.class.getName()); private static final Class[] SESS_PROXY_INTERFACES = new Class[] { org.hibernate.classic.Session.class, org.hibernate.engine.SessionImplementor.class, diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/AbstractEmptinessExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/AbstractEmptinessExpression.java index 887e7d9305..b50ab18019 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/AbstractEmptinessExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/AbstractEmptinessExpression.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.MappingException; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/AggregateProjection.java b/hibernate-core/src/main/java/org/hibernate/criterion/AggregateProjection.java index 60a0f88879..7edf47b5e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/AggregateProjection.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/AggregateProjection.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.criterion; - import java.util.Collections; import java.util.List; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.dialect.function.SQLFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/AliasedProjection.java b/hibernate-core/src/main/java/org/hibernate/criterion/AliasedProjection.java index 889a64e356..2c3b565ee6 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/AliasedProjection.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/AliasedProjection.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/AvgProjection.java b/hibernate-core/src/main/java/org/hibernate/criterion/AvgProjection.java index c719a0c434..d10dfbc7f6 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/AvgProjection.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/AvgProjection.java @@ -23,6 +23,7 @@ */ package org.hibernate.criterion; + /** * An avg() projection * diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/BetweenExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/BetweenExpression.java index 337bdc0bc4..ecfe4550db 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/BetweenExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/BetweenExpression.java @@ -23,8 +23,6 @@ * */ package org.hibernate.criterion; - - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.TypedValue; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Conjunction.java b/hibernate-core/src/main/java/org/hibernate/criterion/Conjunction.java index d5d68caad8..971c488014 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Conjunction.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Conjunction.java @@ -24,6 +24,7 @@ */ package org.hibernate.criterion; + /** * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/CountProjection.java b/hibernate-core/src/main/java/org/hibernate/criterion/CountProjection.java index 95f26ff3cb..c594980914 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/CountProjection.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/CountProjection.java @@ -22,14 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.criterion; - import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; - import org.hibernate.Criteria; -import org.hibernate.QueryException; /** * A count diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/CriteriaQuery.java b/hibernate-core/src/main/java/org/hibernate/criterion/CriteriaQuery.java index 9482688e88..229314c30c 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/CriteriaQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/CriteriaQuery.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/CriteriaSpecification.java b/hibernate-core/src/main/java/org/hibernate/criterion/CriteriaSpecification.java index 43872cd2ce..deba98a7fc 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/CriteriaSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/CriteriaSpecification.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.transform.AliasToEntityMapResultTransformer; import org.hibernate.transform.DistinctRootEntityResultTransformer; import org.hibernate.transform.PassThroughResultTransformer; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Criterion.java b/hibernate-core/src/main/java/org/hibernate/criterion/Criterion.java index 63356ceb59..a980407a36 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Criterion.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Criterion.java @@ -23,9 +23,7 @@ * */ package org.hibernate.criterion; - import java.io.Serializable; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.TypedValue; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/DetachedCriteria.java b/hibernate-core/src/main/java/org/hibernate/criterion/DetachedCriteria.java index 1da6d72147..03a9bc9c80 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/DetachedCriteria.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/DetachedCriteria.java @@ -23,9 +23,7 @@ * */ package org.hibernate.criterion; - import java.io.Serializable; - import org.hibernate.Criteria; import org.hibernate.FetchMode; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Disjunction.java b/hibernate-core/src/main/java/org/hibernate/criterion/Disjunction.java index ff921b4ebd..27dcd8feb5 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Disjunction.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Disjunction.java @@ -24,6 +24,7 @@ */ package org.hibernate.criterion; + /** * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Distinct.java b/hibernate-core/src/main/java/org/hibernate/criterion/Distinct.java index 57c8ef0917..1237a8a462 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Distinct.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Distinct.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/EmptyExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/EmptyExpression.java index 39ad96de4c..b1bf13eb64 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/EmptyExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/EmptyExpression.java @@ -24,6 +24,7 @@ */ package org.hibernate.criterion; + /** * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/EnhancedProjection.java b/hibernate-core/src/main/java/org/hibernate/criterion/EnhancedProjection.java index 9c9be70ebe..5c375e01eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/EnhancedProjection.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/EnhancedProjection.java @@ -23,13 +23,7 @@ * */ package org.hibernate.criterion; - - -import java.io.Serializable; - import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.type.Type; /** * An "enhanced" Projection for a {@link Criteria} query. diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Example.java b/hibernate-core/src/main/java/org/hibernate/criterion/Example.java index 0ec55c60cc..dc790c3d49 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Example.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Example.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.criterion; - import java.io.Serializable; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; - import org.hibernate.Criteria; import org.hibernate.EntityMode; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/ExistsSubqueryExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/ExistsSubqueryExpression.java index 84b0464469..61ab9209c4 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/ExistsSubqueryExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/ExistsSubqueryExpression.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; /** diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Expression.java b/hibernate-core/src/main/java/org/hibernate/criterion/Expression.java index 21c679c365..9dd6165979 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Expression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Expression.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/IdentifierEqExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/IdentifierEqExpression.java index 25ec511922..65e87b9244 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/IdentifierEqExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/IdentifierEqExpression.java @@ -23,8 +23,6 @@ * */ package org.hibernate.criterion; - - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.TypedValue; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/IdentifierProjection.java b/hibernate-core/src/main/java/org/hibernate/criterion/IdentifierProjection.java index 7d78f5a9f5..65f6dce692 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/IdentifierProjection.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/IdentifierProjection.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/IlikeExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/IlikeExpression.java index 72df93ac4b..69ce140e9c 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/IlikeExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/IlikeExpression.java @@ -23,8 +23,6 @@ * */ package org.hibernate.criterion; - - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/InExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/InExpression.java index 492b3a788a..146edcc5f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/InExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/InExpression.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.criterion; - import java.util.ArrayList; - import org.hibernate.Criteria; import org.hibernate.EntityMode; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Junction.java b/hibernate-core/src/main/java/org/hibernate/criterion/Junction.java index e968b0c0fe..1d2e303a7d 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Junction.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Junction.java @@ -23,11 +23,9 @@ * */ package org.hibernate.criterion; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.TypedValue; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/LikeExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/LikeExpression.java index 2450e02cea..2c81036194 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/LikeExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/LikeExpression.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.criterion; - +package org.hibernate.criterion; import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/LogicalExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/LogicalExpression.java index 42d993acf5..14bc8eedcc 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/LogicalExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/LogicalExpression.java @@ -23,8 +23,6 @@ * */ package org.hibernate.criterion; - - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.TypedValue; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/MatchMode.java b/hibernate-core/src/main/java/org/hibernate/criterion/MatchMode.java index 8104b45d8c..55eb0da5a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/MatchMode.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/MatchMode.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/NaturalIdentifier.java b/hibernate-core/src/main/java/org/hibernate/criterion/NaturalIdentifier.java index 54ec85e26e..5922b03f6a 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/NaturalIdentifier.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/NaturalIdentifier.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.TypedValue; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/NotEmptyExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/NotEmptyExpression.java index 19a799579b..f3bf90ce93 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/NotEmptyExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/NotEmptyExpression.java @@ -24,6 +24,7 @@ */ package org.hibernate.criterion; + /** * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/NotExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/NotExpression.java index fc3c8f4032..348e797340 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/NotExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/NotExpression.java @@ -23,8 +23,6 @@ * */ package org.hibernate.criterion; - - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.dialect.MySQLDialect; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/NotNullExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/NotNullExpression.java index 9f006d1451..a95fc24f48 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/NotNullExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/NotNullExpression.java @@ -23,8 +23,6 @@ * */ package org.hibernate.criterion; - - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.TypedValue; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/NullExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/NullExpression.java index a26317ea7d..d3dd9ead29 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/NullExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/NullExpression.java @@ -23,8 +23,6 @@ * */ package org.hibernate.criterion; - - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.TypedValue; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Order.java b/hibernate-core/src/main/java/org/hibernate/criterion/Order.java index ee92a317fa..76e2c9397f 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Order.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Order.java @@ -23,10 +23,8 @@ * */ package org.hibernate.criterion; - import java.io.Serializable; import java.sql.Types; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Projection.java b/hibernate-core/src/main/java/org/hibernate/criterion/Projection.java index 6fb896de56..c5ae3d01b5 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Projection.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Projection.java @@ -23,10 +23,7 @@ * */ package org.hibernate.criterion; - - import java.io.Serializable; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/ProjectionList.java b/hibernate-core/src/main/java/org/hibernate/criterion/ProjectionList.java index 091d8d7ea0..f72eabbe0f 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/ProjectionList.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/ProjectionList.java @@ -23,10 +23,8 @@ * */ package org.hibernate.criterion; - import java.util.ArrayList; import java.util.List; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Projections.java b/hibernate-core/src/main/java/org/hibernate/criterion/Projections.java index 4c04073c07..79ce711148 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Projections.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Projections.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Property.java b/hibernate-core/src/main/java/org/hibernate/criterion/Property.java index 3607a29ada..d988d6cc03 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Property.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Property.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import java.util.Collection; /** diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/PropertyExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/PropertyExpression.java index 40f4b05459..dd517fe79e 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/PropertyExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/PropertyExpression.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.TypedValue; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/PropertyProjection.java b/hibernate-core/src/main/java/org/hibernate/criterion/PropertyProjection.java index 8ffa5e2107..0f316da2e1 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/PropertyProjection.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/PropertyProjection.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/PropertySubqueryExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/PropertySubqueryExpression.java index 337c16b663..71ecdf3289 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/PropertySubqueryExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/PropertySubqueryExpression.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; /** diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Restrictions.java b/hibernate-core/src/main/java/org/hibernate/criterion/Restrictions.java index 51391eb0b2..e26f7f82bc 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Restrictions.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Restrictions.java @@ -23,11 +23,9 @@ * */ package org.hibernate.criterion; - import java.util.Collection; import java.util.Iterator; import java.util.Map; - import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/RowCountProjection.java b/hibernate-core/src/main/java/org/hibernate/criterion/RowCountProjection.java index 7d98c99010..56ed9b91d6 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/RowCountProjection.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/RowCountProjection.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.criterion; - import java.util.List; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.dialect.function.SQLFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/SQLCriterion.java b/hibernate-core/src/main/java/org/hibernate/criterion/SQLCriterion.java index 3e1ae526ed..c5ebdcd675 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/SQLCriterion.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/SQLCriterion.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.EntityMode; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/SQLProjection.java b/hibernate-core/src/main/java/org/hibernate/criterion/SQLProjection.java index 70ac6d3b60..45010a97e7 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/SQLProjection.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/SQLProjection.java @@ -23,8 +23,6 @@ * */ package org.hibernate.criterion; - - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/SimpleExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/SimpleExpression.java index 7d8950a78a..7ca233faf7 100644 --- a/hibernate-core/src/main/java/org/hibernate/criterion/SimpleExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/SimpleExpression.java @@ -23,10 +23,7 @@ * */ package org.hibernate.criterion; - - import java.sql.Types; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/SimpleProjection.java b/hibernate-core/src/main/java/org/hibernate/criterion/SimpleProjection.java index 65c945e83d..c1beec0cab 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/SimpleProjection.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/SimpleProjection.java @@ -23,9 +23,6 @@ * */ package org.hibernate.criterion; - -import java.util.Iterator; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/SimpleSubqueryExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/SimpleSubqueryExpression.java index eb3cd4c69f..4e46cc84f8 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/SimpleSubqueryExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/SimpleSubqueryExpression.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.EntityMode; import org.hibernate.HibernateException; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/SizeExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/SizeExpression.java index ee917d18dc..e6cf07d9b8 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/SizeExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/SizeExpression.java @@ -23,7 +23,6 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.EntityMode; import org.hibernate.Hibernate; diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/Subqueries.java b/hibernate-core/src/main/java/org/hibernate/criterion/Subqueries.java index cc691e959b..8cd2696505 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/Subqueries.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/Subqueries.java @@ -24,6 +24,7 @@ */ package org.hibernate.criterion; + /** * Factory class for criterion instances that represent expressions * involving subqueries. diff --git a/hibernate-core/src/main/java/org/hibernate/criterion/SubqueryExpression.java b/hibernate-core/src/main/java/org/hibernate/criterion/SubqueryExpression.java index f77507a356..a32f5779ec 100755 --- a/hibernate-core/src/main/java/org/hibernate/criterion/SubqueryExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/criterion/SubqueryExpression.java @@ -23,14 +23,13 @@ * */ package org.hibernate.criterion; - import org.hibernate.Criteria; import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.engine.TypedValue; import org.hibernate.engine.SessionImplementor; +import org.hibernate.engine.TypedValue; import org.hibernate.impl.CriteriaImpl; import org.hibernate.loader.criteria.CriteriaJoinWalker; import org.hibernate.loader.criteria.CriteriaQueryTranslator; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java index 99651b14b9..420f93694b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java @@ -22,14 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.CallableStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import java.util.Map; import java.util.Iterator; - +import java.util.Map; import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java index 2044b6a5bb..8bde59f325 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Cache71Dialect.java @@ -21,25 +21,30 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.dialect; - +package org.hibernate.dialect; import java.sql.CallableStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; - import org.hibernate.LockMode; import org.hibernate.MappingException; import org.hibernate.cfg.Environment; +import org.hibernate.dialect.function.ConditionalParenthesisFunction; +import org.hibernate.dialect.function.ConvertFunction; import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.NvlFunction; import org.hibernate.dialect.function.SQLFunctionTemplate; +import org.hibernate.dialect.function.StandardJDBCEscapeFunction; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.dialect.function.VarArgsSQLFunction; -import org.hibernate.dialect.function.StandardJDBCEscapeFunction; -import org.hibernate.dialect.function.ConvertFunction; -import org.hibernate.dialect.function.ConditionalParenthesisFunction; -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.PessimisticReadUpdateLockingStrategy; +import org.hibernate.dialect.lock.PessimisticWriteUpdateLockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; +import org.hibernate.dialect.lock.UpdateLockingStrategy; import org.hibernate.exception.CacheSQLStateConverter; import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.exception.TemplatedViolatedConstraintNameExtracter; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2390Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2390Dialect.java index f482a0da9d..c0edbee36c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2390Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2390Dialect.java @@ -23,6 +23,7 @@ */ package org.hibernate.dialect; + /** * An SQL dialect for DB2/390. This class provides support for * DB2 Universal Database for OS/390, also known as DB2/390. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2400Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2400Dialect.java index 77f7c54329..7bdd1ca229 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2400Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2400Dialect.java @@ -23,6 +23,7 @@ */ package org.hibernate.dialect; + /** * An SQL dialect for DB2/400. This class provides support for DB2 Universal Database for iSeries, * also known as DB2/400. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java index 9ed4effa1a..8b045485bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java @@ -22,19 +22,17 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.CallableStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; - import org.hibernate.cfg.Environment; +import org.hibernate.dialect.function.AnsiTrimEmulationFunction; import org.hibernate.dialect.function.AvgWithArgumentCastFunction; import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.dialect.function.VarArgsSQLFunction; -import org.hibernate.dialect.function.AnsiTrimEmulationFunction; import org.hibernate.type.StandardBasicTypes; /** diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DataDirectOracle9Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DataDirectOracle9Dialect.java index 972ab0974b..65d99bd684 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DataDirectOracle9Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DataDirectOracle9Dialect.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.CallableStatement; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java index 5876ef5635..dd0fbbc986 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java @@ -22,15 +22,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.lang.reflect.Method; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.dialect.function.AnsiTrimFunction; import org.hibernate.dialect.function.DerbyConcatFunction; import org.hibernate.sql.CaseFragment; import org.hibernate.sql.DerbyCaseFragment; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; /** * Hibernate Dialect for Cloudscape 10 - aka Derby. This implements both an @@ -42,8 +42,7 @@ */ public class DerbyDialect extends DB2Dialect { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DerbyDialect.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, DerbyDialect.class.getName()); private int driverVersionMajor; private int driverVersionMinor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index 8255b14900..6e24981de1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.CallableStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -33,9 +32,9 @@ import java.util.Properties; import java.util.Set; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.Logger; import org.hibernate.MappingException; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.CastFunction; @@ -66,6 +65,7 @@ import org.hibernate.type.StandardBasicTypes; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Represents a dialect of SQL implemented by a particular RDBMS. @@ -80,7 +80,7 @@ */ public abstract class Dialect { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Dialect.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Dialect.class.getName()); public static final String DEFAULT_BATCH_SIZE = "15"; public static final String NO_BATCH = "0"; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java index c0c19c18d0..3ffe810be8 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java @@ -23,6 +23,7 @@ */ package org.hibernate.dialect; + /** * An SQL dialect for Firebird. * diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/FrontBaseDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/FrontBaseDialect.java index 7ecdefb4f9..82348c1564 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/FrontBaseDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/FrontBaseDialect.java @@ -22,12 +22,17 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - -import org.hibernate.dialect.lock.*; -import org.hibernate.persister.entity.Lockable; -import org.hibernate.LockMode; - import java.sql.Types; +import org.hibernate.LockMode; +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.PessimisticReadUpdateLockingStrategy; +import org.hibernate.dialect.lock.PessimisticWriteUpdateLockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; +import org.hibernate.dialect.lock.UpdateLockingStrategy; +import org.hibernate.persister.entity.Lockable; /** * An SQL Dialect for Frontbase. Assumes you're using the latest version diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java index f10df9885e..f9f14c7112 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.SQLException; import java.sql.Types; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.AvgWithArgumentCastFunction; import org.hibernate.dialect.function.NoArgSQLFunction; @@ -35,6 +34,7 @@ import org.hibernate.exception.ViolatedConstraintNameExtracter; import org.hibernate.type.StandardBasicTypes; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; /** * A dialect compatible with the H2 database. @@ -43,8 +43,7 @@ */ public class H2Dialect extends Dialect { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - H2Dialect.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, H2Dialect.class.getName()); private String querySequenceString; 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 258735e543..a4ddc7100b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java @@ -22,13 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.io.Serializable; import java.sql.SQLException; import java.sql.Types; +import org.hibernate.HibernateLogger; import org.hibernate.JDBCException; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.StaleObjectStateException; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.AvgWithArgumentCastFunction; @@ -50,6 +49,7 @@ import org.hibernate.persister.entity.Lockable; import org.hibernate.type.StandardBasicTypes; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; /** * An SQL dialect compatible with HSQLDB (HyperSQL). @@ -65,8 +65,7 @@ */ public class HSQLDialect extends Dialect { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - HSQLDialect.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, HSQLDialect.class.getName()); /** * version is 18 for 1.8 or 20 for 2.0 diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java index 5ef02a69eb..992564798d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.SQLException; import java.sql.Types; - import org.hibernate.MappingException; import org.hibernate.dialect.function.VarArgsSQLFunction; import org.hibernate.exception.JDBCExceptionHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Ingres10Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Ingres10Dialect.java index 8b093b0a60..f6127f24ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Ingres10Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Ingres10Dialect.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; import java.util.Properties; - import org.hibernate.cfg.Environment; /** diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Ingres9Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Ingres9Dialect.java index 14d144188d..86e4ce9ef6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Ingres9Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Ingres9Dialect.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.VarArgsSQLFunction; import org.hibernate.type.StandardBasicTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/IngresDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/IngresDialect.java index bd73503bba..a7e5da2625 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/IngresDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/IngresDialect.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.cfg.Environment; -import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.function.NoArgSQLFunction; +import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.dialect.function.VarArgsSQLFunction; import org.hibernate.type.StandardBasicTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/InterbaseDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/InterbaseDialect.java index 93931e24e1..83efc2901e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/InterbaseDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/InterbaseDialect.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.VarArgsSQLFunction; import org.hibernate.type.StandardBasicTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/JDataStoreDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/JDataStoreDialect.java index b2e8969acf..a162b30c16 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/JDataStoreDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/JDataStoreDialect.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.cfg.Environment; /** diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MckoiDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MckoiDialect.java index 2b0ed4487e..483ba60934 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MckoiDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MckoiDialect.java @@ -22,14 +22,19 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.LockMode; -import org.hibernate.persister.entity.Lockable; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.StandardSQLFunction; -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.PessimisticReadUpdateLockingStrategy; +import org.hibernate.dialect.lock.PessimisticWriteUpdateLockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; +import org.hibernate.dialect.lock.UpdateLockingStrategy; +import org.hibernate.persister.entity.Lockable; import org.hibernate.sql.CaseFragment; import org.hibernate.sql.MckoiCaseFragment; import org.hibernate.type.StandardBasicTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java index 67b6cfc314..69f712e4ff 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MimerSQLDialect.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.type.StandardBasicTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQL5Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQL5Dialect.java index 56deec2a67..c5001f1557 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQL5Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQL5Dialect.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; /** diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQL5InnoDBDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQL5InnoDBDialect.java index 5c16809632..81cbe4146b 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQL5InnoDBDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQL5InnoDBDialect.java @@ -23,6 +23,7 @@ */ package org.hibernate.dialect; + /** * @author Gavin King, Scott Marlow */ diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java index 4368cb1fe1..006cbe77d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.CallableStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; - import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.StandardSQLFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLInnoDBDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLInnoDBDialect.java index bfde409fec..37a13d271b 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLInnoDBDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLInnoDBDialect.java @@ -23,6 +23,7 @@ */ package org.hibernate.dialect; + /** * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLMyISAMDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLMyISAMDialect.java index 80fe5bbc21..d2f53be4e9 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLMyISAMDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLMyISAMDialect.java @@ -23,6 +23,7 @@ */ package org.hibernate.dialect; + /** * @author Gavin King */ diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle10gDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle10gDialect.java index c0339e55f9..9086ec00d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle10gDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle10gDialect.java @@ -22,9 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - -import org.hibernate.sql.JoinFragment; import org.hibernate.sql.ANSIJoinFragment; +import org.hibernate.sql.JoinFragment; /** diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java index 7b2b120c34..a683e0465c 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java @@ -22,28 +22,26 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - -import java.sql.Types; -import java.sql.SQLException; -import java.sql.ResultSet; import java.sql.CallableStatement; - +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; +import org.hibernate.HibernateException; +import org.hibernate.cfg.Environment; +import org.hibernate.dialect.function.NoArgSQLFunction; +import org.hibernate.dialect.function.NvlFunction; +import org.hibernate.dialect.function.SQLFunctionTemplate; +import org.hibernate.dialect.function.StandardSQLFunction; +import org.hibernate.dialect.function.VarArgsSQLFunction; +import org.hibernate.exception.JDBCExceptionHelper; +import org.hibernate.exception.TemplatedViolatedConstraintNameExtracter; +import org.hibernate.exception.ViolatedConstraintNameExtracter; import org.hibernate.sql.CaseFragment; import org.hibernate.sql.DecodeCaseFragment; import org.hibernate.sql.JoinFragment; import org.hibernate.sql.OracleJoinFragment; -import org.hibernate.cfg.Environment; -import org.hibernate.dialect.function.StandardSQLFunction; -import org.hibernate.dialect.function.NoArgSQLFunction; -import org.hibernate.dialect.function.VarArgsSQLFunction; -import org.hibernate.dialect.function.SQLFunctionTemplate; -import org.hibernate.dialect.function.NvlFunction; -import org.hibernate.HibernateException; import org.hibernate.type.StandardBasicTypes; import org.hibernate.util.ReflectHelper; -import org.hibernate.exception.ViolatedConstraintNameExtracter; -import org.hibernate.exception.TemplatedViolatedConstraintNameExtracter; -import org.hibernate.exception.JDBCExceptionHelper; /** * A dialect for Oracle 8i. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java index c809e5f726..d089833edd 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java @@ -22,13 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.CallableStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.NvlFunction; @@ -40,6 +39,7 @@ import org.hibernate.exception.ViolatedConstraintNameExtracter; import org.hibernate.type.StandardBasicTypes; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; /** * An SQL dialect for Oracle 9 (uses ANSI-style syntax where possible). @@ -50,8 +50,7 @@ @Deprecated public class Oracle9Dialect extends Dialect { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - Oracle9Dialect.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Oracle9Dialect.class.getName()); public Oracle9Dialect() { super(); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java index 8ba954d753..5fe9fd416a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.LockOptions; -import org.hibernate.sql.CaseFragment; import org.hibernate.sql.ANSICaseFragment; +import org.hibernate.sql.CaseFragment; /** * A dialect for Oracle 9i databases. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java index 36f07bed1c..12dc76023d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java @@ -22,13 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.sql.CaseFragment; import org.hibernate.sql.DecodeCaseFragment; import org.hibernate.sql.JoinFragment; import org.hibernate.sql.OracleJoinFragment; +import org.jboss.logging.Logger; /** * An SQL dialect for Oracle, compatible with Oracle 8. @@ -39,8 +39,7 @@ @Deprecated public class OracleDialect extends Oracle9Dialect { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - OracleDialect.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, OracleDialect.class.getName()); public OracleDialect() { super(); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PointbaseDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PointbaseDialect.java index f00548bc58..a7d0e292a4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PointbaseDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/PointbaseDialect.java @@ -22,12 +22,17 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - -import org.hibernate.dialect.lock.*; -import org.hibernate.persister.entity.Lockable; -import org.hibernate.LockMode; - import java.sql.Types; +import org.hibernate.LockMode; +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.PessimisticReadUpdateLockingStrategy; +import org.hibernate.dialect.lock.PessimisticWriteUpdateLockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; +import org.hibernate.dialect.lock.UpdateLockingStrategy; +import org.hibernate.persister.entity.Lockable; /** * A Dialect for Pointbase. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java index 81a3a25e4e..dfc612c8eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.CallableStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; - import org.hibernate.Hibernate; import org.hibernate.LockOptions; import org.hibernate.cfg.Environment; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java index e6fa8cfe05..2fd15fc82a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgresPlusDialect.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - -import java.sql.Types; -import java.sql.SQLException; import java.sql.CallableStatement; import java.sql.ResultSet; - +import java.sql.SQLException; +import java.sql.Types; import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.NvlFunction; import org.hibernate.dialect.function.StandardSQLFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/ProgressDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/ProgressDialect.java index 0d52ee24a9..cae9befaad 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/ProgressDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/ProgressDialect.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; /** diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java index 9948938573..f3c5df4ac1 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.function.StandardSQLFunction; @@ -41,6 +40,7 @@ import org.hibernate.sql.CaseFragment; import org.hibernate.sql.DecodeCaseFragment; import org.hibernate.type.StandardBasicTypes; +import org.jboss.logging.Logger; /** * This is the Hibernate dialect for the Unisys 2200 Relational Database (RDMS). @@ -56,8 +56,7 @@ */ public class RDMSOS2200Dialect extends Dialect { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - RDMSOS2200Dialect.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, RDMSOS2200Dialect.class.getName()); public RDMSOS2200Dialect() { super(); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java index 95023d60e3..4e599e9337 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/ResultColumnReferenceStrategy.java @@ -21,12 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.dialect; - -import java.io.Serializable; +package org.hibernate.dialect; import java.io.ObjectStreamException; -import java.util.Map; +import java.io.Serializable; import java.util.HashMap; +import java.util.Map; /** * Defines how we need to reference columns in the group-by, having, and order-by diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SAPDBDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SAPDBDialect.java index d36398054e..698e486a19 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SAPDBDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SAPDBDialect.java @@ -22,14 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.NoArgSQLFunction; +import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.dialect.function.VarArgsSQLFunction; -import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.sql.CaseFragment; import org.hibernate.sql.DecodeCaseFragment; import org.hibernate.type.StandardBasicTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2005Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2005Dialect.java index 911b053248..73daf0a614 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2005Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2005Dialect.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.type.StandardBasicTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2008Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2008Dialect.java index 022c44826a..798e57598f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2008Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServer2008Dialect.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.type.StandardBasicTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java index 43267ff72e..2e3ff46254 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SQLServerDialect.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.LockMode; +import org.hibernate.dialect.function.AnsiTrimEmulationFunction; import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.dialect.function.StandardSQLFunction; -import org.hibernate.dialect.function.AnsiTrimEmulationFunction; import org.hibernate.type.StandardBasicTypes; /** diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Sybase11Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Sybase11Dialect.java index 39be02c5c8..42dbbaf949 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Sybase11Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Sybase11Dialect.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import org.hibernate.sql.JoinFragment; import org.hibernate.sql.Sybase11JoinFragment; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java index 191b7de0eb..aebc610c5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASE15Dialect.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.dialect.function.AnsiTrimEmulationFunction; import org.hibernate.dialect.function.SQLFunctionTemplate; import org.hibernate.type.StandardBasicTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseAnywhereDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseAnywhereDialect.java index 3267cecfee..a10a7da155 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseAnywhereDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseAnywhereDialect.java @@ -23,6 +23,7 @@ */ package org.hibernate.dialect; + /** * SQL Dialect for Sybase Anywhere * extending Sybase (Enterprise) Dialect diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java index 01b767bc89..a651f59d5e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java @@ -23,6 +23,7 @@ */ package org.hibernate.dialect; + /** * This dialect is being deprecated; it had been used both as the base class * for TransactSQL-based dialects as well as the physical dialect for handling diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java index 16dd2a8a23..de267a1990 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java @@ -21,10 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.dialect; - +package org.hibernate.dialect; import java.sql.Types; - import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.SQLFunctionTemplate; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java index 511db83e3c..6a3d25de75 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/TimesTenDialect.java @@ -22,16 +22,21 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - import java.sql.Types; - import org.hibernate.Hibernate; import org.hibernate.LockMode; -import org.hibernate.persister.entity.Lockable; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.NoArgSQLFunction; import org.hibernate.dialect.function.StandardSQLFunction; -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.PessimisticReadUpdateLockingStrategy; +import org.hibernate.dialect.lock.PessimisticWriteUpdateLockingStrategy; +import org.hibernate.dialect.lock.SelectLockingStrategy; +import org.hibernate.dialect.lock.UpdateLockingStrategy; +import org.hibernate.persister.entity.Lockable; import org.hibernate.sql.JoinFragment; import org.hibernate.sql.OracleJoinFragment; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TypeNames.java b/hibernate-core/src/main/java/org/hibernate/dialect/TypeNames.java index f5d06fa3d8..0b85b51210 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/TypeNames.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/TypeNames.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect; - -import java.util.Map; import java.util.HashMap; +import java.util.Map; import java.util.TreeMap; - import org.hibernate.MappingException; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/AbstractAnsiTrimEmulationFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/AbstractAnsiTrimEmulationFunction.java index 8e6d934490..9d2e041cfb 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/AbstractAnsiTrimEmulationFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/AbstractAnsiTrimEmulationFunction.java @@ -22,16 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - +import java.util.ArrayList; +import java.util.List; import org.hibernate.Hibernate; import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.type.Type; -import java.util.List; -import java.util.ArrayList; - /** * A {@link org.hibernate.dialect.function.SQLFunction} providing support for implementing TRIM functionality * (as defined by both the ANSI SQL and JPA specs) in cases where the dialect may not support the full trim diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/AnsiTrimEmulationFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/AnsiTrimEmulationFunction.java index fc092b00af..ab566bbcc0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/AnsiTrimEmulationFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/AnsiTrimEmulationFunction.java @@ -21,8 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.dialect.function; - +package org.hibernate.dialect.function; import org.hibernate.type.StandardBasicTypes; /** diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/AnsiTrimFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/AnsiTrimFunction.java index 8613702176..561d0c08c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/AnsiTrimFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/AnsiTrimFunction.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import org.hibernate.engine.SessionFactoryImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgWithArgumentCastFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgWithArgumentCastFunction.java index f75311e9b8..81415cb87b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgWithArgumentCastFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/AvgWithArgumentCastFunction.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.sql.Types; /** diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java index ec6fdd38f3..fb0a2fd00d 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.util.List; - import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/CharIndexFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/CharIndexFunction.java index fca1153a42..9b28848713 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/CharIndexFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/CharIndexFunction.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.util.List; - import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicAvgFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicAvgFunction.java index cec46037bb..f1153e3551 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicAvgFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicAvgFunction.java @@ -21,10 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.dialect.function; - +package org.hibernate.dialect.function; import java.sql.Types; - import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.engine.Mapping; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicCountFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicCountFunction.java index fb981d7744..31ab5921d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicCountFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicCountFunction.java @@ -21,8 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.dialect.function; - +package org.hibernate.dialect.function; import org.hibernate.engine.Mapping; import org.hibernate.type.StandardBasicTypes; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicSumFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicSumFunction.java index 81e0c51184..1da180f9b0 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicSumFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ClassicSumFunction.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.dialect.function; +package org.hibernate.dialect.function; + /** * Classic SUM sqlfunction that return types as it was done in Hibernate 3.1 diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ConditionalParenthesisFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ConditionalParenthesisFunction.java index a9f1548182..9cd794223a 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ConditionalParenthesisFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ConditionalParenthesisFunction.java @@ -21,10 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.dialect.function; - +package org.hibernate.dialect.function; import java.util.List; - import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/ConvertFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/ConvertFunction.java index 271d730ad3..374c4e3b81 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/ConvertFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/ConvertFunction.java @@ -21,10 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.dialect.function; - +package org.hibernate.dialect.function; import java.util.List; - import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/DerbyConcatFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/DerbyConcatFunction.java index 11cdacb596..ac094417b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/DerbyConcatFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/DerbyConcatFunction.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - -import java.util.List; import java.util.Iterator; - +import java.util.List; import org.hibernate.Hibernate; import org.hibernate.QueryException; import org.hibernate.engine.Mapping; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/NoArgSQLFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/NoArgSQLFunction.java index 8489a6e0ea..8ddaaa7cba 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/NoArgSQLFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/NoArgSQLFunction.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.util.List; - import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlFunction.java index ca3c3a334c..672b46281c 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/NvlFunction.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.util.List; - import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/PositionSubstringFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/PositionSubstringFunction.java index c77851ca29..7e7a0ddef8 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/PositionSubstringFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/PositionSubstringFunction.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.util.List; - import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunction.java index 366b5e4242..b62246b740 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunction.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.util.List; - import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunctionRegistry.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunctionRegistry.java index 99d756f85c..1a384ab740 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunctionRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunctionRegistry.java @@ -21,11 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.dialect.function; - +package org.hibernate.dialect.function; import java.util.HashMap; import java.util.Map; - import org.hibernate.dialect.Dialect; public class SQLFunctionRegistry { diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunctionTemplate.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunctionTemplate.java index 765c563e1b..6f18e0f0ea 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunctionTemplate.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/SQLFunctionTemplate.java @@ -22,14 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - +import java.util.List; import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.type.Type; -import java.util.List; - /** * Represents HQL functions that can have different representations in different SQL dialects. * E.g. in HQL we can define function concat(?1, ?2) to concatenate two strings diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardAnsiSqlAggregationFunctions.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardAnsiSqlAggregationFunctions.java index 5e7a668f1c..fe8275d07e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardAnsiSqlAggregationFunctions.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardAnsiSqlAggregationFunctions.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.sql.Types; import java.util.Iterator; import java.util.List; import java.util.Map; - import org.hibernate.Hibernate; import org.hibernate.MappingException; import org.hibernate.QueryException; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardJDBCEscapeFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardJDBCEscapeFunction.java index fd653d1752..e55cf6bf0d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardJDBCEscapeFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardJDBCEscapeFunction.java @@ -21,12 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.dialect.function; - +package org.hibernate.dialect.function; import java.util.List; - -import org.hibernate.type.Type; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.type.Type; /** * Analogous to {@link org.hibernate.dialect.function.StandardSQLFunction} diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java index 9f03d62f8b..5bc681b326 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/StandardSQLFunction.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.util.List; - import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TemplateRenderer.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TemplateRenderer.java index 7859daf5e2..b9a57fdb31 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TemplateRenderer.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TemplateRenderer.java @@ -22,11 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.util.ArrayList; import java.util.List; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.SessionFactoryImplementor; +import org.jboss.logging.Logger; /** * Delegate for handling function "templates". @@ -35,8 +35,7 @@ */ public class TemplateRenderer { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - TemplateRenderer.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, TemplateRenderer.class.getName()); private final String template; private final String[] chunks; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunctionTemplate.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunctionTemplate.java index d6b1e551fa..c0a5429b62 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunctionTemplate.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/TrimFunctionTemplate.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.util.List; - import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/function/VarArgsSQLFunction.java b/hibernate-core/src/main/java/org/hibernate/dialect/function/VarArgsSQLFunction.java index 1ebbf84b8d..865641eac4 100755 --- a/hibernate-core/src/main/java/org/hibernate/dialect/function/VarArgsSQLFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/function/VarArgsSQLFunction.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.function; - import java.util.List; - import org.hibernate.QueryException; import org.hibernate.engine.Mapping; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java index d49ee9f81d..6beb3c40f6 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; - import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.persister.entity.Lockable; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java index f5926e194d..ebcea6dea5 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/LockingStrategy.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; - -import org.hibernate.engine.SessionImplementor; -import org.hibernate.StaleObjectStateException; -import org.hibernate.JDBCException; - import java.io.Serializable; +import org.hibernate.JDBCException; +import org.hibernate.StaleObjectStateException; +import org.hibernate.engine.SessionImplementor; /** * A strategy abstraction for how locks are obtained in the underlying database. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java index 42401491aa..fc90f6a852 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticForceIncrementLockingStrategy.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.JDBCException; import org.hibernate.LockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java index 733b38fde2..951133e719 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/OptimisticLockingStrategy.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; - import java.io.Serializable; import org.hibernate.HibernateException; import org.hibernate.JDBCException; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java index 30cd0c63f7..d8bb789c47 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticForceIncrementLockingStrategy.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.JDBCException; import org.hibernate.LockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java index 12e7b4c575..a4ce33e64f 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadSelectLockingStrategy.java @@ -22,22 +22,20 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; - -import org.hibernate.LockOptions; -import org.hibernate.persister.entity.Lockable; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.sql.SimpleSelect; -import org.hibernate.pretty.MessageHelper; -import org.hibernate.LockMode; -import org.hibernate.StaleObjectStateException; -import org.hibernate.JDBCException; -import org.hibernate.PessimisticLockException; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import org.hibernate.JDBCException; +import org.hibernate.LockMode; +import org.hibernate.LockOptions; +import org.hibernate.PessimisticLockException; +import org.hibernate.StaleObjectStateException; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.persister.entity.Lockable; +import org.hibernate.pretty.MessageHelper; +import org.hibernate.sql.SimpleSelect; /** * A pessimistic locking strategy where the locks are obtained through select statements. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java index 478cca5f60..52c7cf7967 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java @@ -22,14 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.SQLException; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.JDBCException; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.PessimisticLockException; import org.hibernate.StaleObjectStateException; import org.hibernate.engine.SessionFactoryImplementor; @@ -37,6 +36,7 @@ import org.hibernate.persister.entity.Lockable; import org.hibernate.pretty.MessageHelper; import org.hibernate.sql.Update; +import org.jboss.logging.Logger; /** * A pessimistic locking strategy where the locks are obtained through update statements. @@ -52,8 +52,8 @@ */ public class PessimisticReadUpdateLockingStrategy implements LockingStrategy { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - PessimisticReadUpdateLockingStrategy.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + PessimisticReadUpdateLockingStrategy.class.getName()); private final Lockable lockable; private final LockMode lockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java index d7cd8e96c2..dfb707172b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteSelectLockingStrategy.java @@ -22,22 +22,20 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; - -import org.hibernate.LockOptions; -import org.hibernate.persister.entity.Lockable; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.StaleObjectStateException; -import org.hibernate.JDBCException; -import org.hibernate.LockMode; -import org.hibernate.PessimisticLockException; -import org.hibernate.sql.SimpleSelect; -import org.hibernate.pretty.MessageHelper; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import org.hibernate.JDBCException; +import org.hibernate.LockMode; +import org.hibernate.LockOptions; +import org.hibernate.PessimisticLockException; +import org.hibernate.StaleObjectStateException; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.persister.entity.Lockable; +import org.hibernate.pretty.MessageHelper; +import org.hibernate.sql.SimpleSelect; /** * A pessimistic locking strategy where the locks are obtained through select statements. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java index 66de468dc9..2440508c89 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java @@ -22,14 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.SQLException; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.JDBCException; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.PessimisticLockException; import org.hibernate.StaleObjectStateException; import org.hibernate.engine.SessionFactoryImplementor; @@ -37,6 +36,7 @@ import org.hibernate.persister.entity.Lockable; import org.hibernate.pretty.MessageHelper; import org.hibernate.sql.Update; +import org.jboss.logging.Logger; /** * A pessimistic locking strategy where the locks are obtained through update statements. @@ -52,8 +52,8 @@ */ public class PessimisticWriteUpdateLockingStrategy implements LockingStrategy { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - PessimisticWriteUpdateLockingStrategy.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + PessimisticWriteUpdateLockingStrategy.class.getName()); private final Lockable lockable; private final LockMode lockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java index 65e563f76b..4b9d1abb38 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/SelectLockingStrategy.java @@ -22,21 +22,19 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; - -import org.hibernate.LockOptions; -import org.hibernate.persister.entity.Lockable; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.StaleObjectStateException; -import org.hibernate.JDBCException; -import org.hibernate.LockMode; -import org.hibernate.sql.SimpleSelect; -import org.hibernate.pretty.MessageHelper; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import org.hibernate.JDBCException; +import org.hibernate.LockMode; +import org.hibernate.LockOptions; +import org.hibernate.StaleObjectStateException; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.persister.entity.Lockable; +import org.hibernate.pretty.MessageHelper; +import org.hibernate.sql.SimpleSelect; /** * A locking strategy where the locks are obtained through select statements. diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java index 33ca712fc8..068646a16e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java @@ -22,20 +22,20 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.lock; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.SQLException; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.JDBCException; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.StaleObjectStateException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.entity.Lockable; import org.hibernate.pretty.MessageHelper; import org.hibernate.sql.Update; +import org.jboss.logging.Logger; /** * A locking strategy where the locks are obtained through update statements. @@ -48,8 +48,7 @@ */ public class UpdateLockingStrategy implements LockingStrategy { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - UpdateLockingStrategy.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, UpdateLockingStrategy.class.getName()); private final Lockable lockable; private final LockMode lockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/resolver/BasicSQLExceptionConverter.java b/hibernate-core/src/main/java/org/hibernate/dialect/resolver/BasicSQLExceptionConverter.java index e46a864d5a..786cc0de81 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/resolver/BasicSQLExceptionConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/resolver/BasicSQLExceptionConverter.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.dialect.resolver; - import java.sql.SQLException; +import org.hibernate.HibernateLogger; import org.hibernate.JDBCException; -import org.hibernate.Logger; import org.hibernate.exception.SQLStateConverter; import org.hibernate.exception.ViolatedConstraintNameExtracter; +import org.jboss.logging.Logger; /** * A helper to centralize conversion of {@link java.sql.SQLException}s to {@link org.hibernate.JDBCException}s. @@ -36,8 +36,8 @@ */ public class BasicSQLExceptionConverter { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - BasicSQLExceptionConverter.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + BasicSQLExceptionConverter.class.getName()); public static final BasicSQLExceptionConverter INSTANCE = new BasicSQLExceptionConverter(); public static final String MSG = LOG.unableToQueryDatabaseMetadata(); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/ActionQueue.java index be9e9ba7da..b7725db93f 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/ActionQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/ActionQueue.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -35,7 +34,7 @@ import java.util.Set; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.action.AfterTransactionCompletionProcess; import org.hibernate.action.BeforeTransactionCompletionProcess; import org.hibernate.action.BulkOperationCleanupAction; @@ -49,6 +48,7 @@ import org.hibernate.action.Executable; import org.hibernate.cache.CacheException; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * Responsible for maintaining the queue of actions related to events. @@ -61,8 +61,7 @@ */ public class ActionQueue { - static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - ActionQueue.class.getPackage().getName()); + static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, ActionQueue.class.getName()); private static final int INIT_QUEUE_LIST_SIZE = 5; private SessionImplementor session; @@ -247,7 +246,7 @@ private static boolean areTablesToUpdated(List actions, Set tableSpaces) { final Serializable[] spaces = action.getPropertySpaces(); for ( Serializable space : spaces ) { if ( tableSpaces.contains( space ) ) { - LOG.debug("Changes must be flushed to space: " + space); + LOG.debugf("Changes must be flushed to space: %s", space); return true; } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/AssociationKey.java b/hibernate-core/src/main/java/org/hibernate/engine/AssociationKey.java index 5732115a9b..a19e60dbe0 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/AssociationKey.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/AssociationKey.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/BatchFetchQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/BatchFetchQueue.java index a66db8ae7f..53276e9c81 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/BatchFetchQueue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/BatchFetchQueue.java @@ -23,13 +23,11 @@ * */ package org.hibernate.engine; - import java.io.Serializable; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; - import org.hibernate.EntityMode; import org.hibernate.cache.CacheKey; import org.hibernate.collection.PersistentCollection; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/Cascade.java b/hibernate-core/src/main/java/org/hibernate/engine/Cascade.java index c210cae66b..97230d9f98 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/Cascade.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/Cascade.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine; - import java.io.Serializable; import java.util.Collection; import java.util.HashSet; @@ -30,7 +29,7 @@ import java.util.Stack; import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.collection.PersistentCollection; import org.hibernate.event.EventSource; import org.hibernate.persister.collection.CollectionPersister; @@ -42,6 +41,7 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.util.CollectionHelper; +import org.jboss.logging.Logger; /** * Delegate responsible for, in conjunction with the various @@ -95,7 +95,7 @@ public final class Cascade { */ public static final int BEFORE_MERGE = 0; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Cascade.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Cascade.class.getName()); private int cascadeTo; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/CascadeStyle.java b/hibernate-core/src/main/java/org/hibernate/engine/CascadeStyle.java index b6edf78c1f..b5dc99ade8 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/CascadeStyle.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/CascadeStyle.java @@ -23,11 +23,9 @@ * */ package org.hibernate.engine; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; - import org.hibernate.MappingException; import org.hibernate.util.ArrayHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/CascadingAction.java b/hibernate-core/src/main/java/org/hibernate/engine/CascadingAction.java index c71ed3ef84..0962b32165 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/CascadingAction.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/CascadingAction.java @@ -23,14 +23,13 @@ * */ package org.hibernate.engine; - import java.util.Iterator; import java.util.Map; import java.util.Set; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.Logger; import org.hibernate.ReplicationMode; import org.hibernate.TransientObjectException; import org.hibernate.collection.PersistentCollection; @@ -40,6 +39,7 @@ import org.hibernate.type.CollectionType; import org.hibernate.type.EntityType; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * A session action that may be cascaded from parent entity to its children @@ -48,8 +48,7 @@ */ public abstract class CascadingAction { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - CascadingAction.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, CascadingAction.class.getName()); // the CascadingAction contract ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/hibernate-core/src/main/java/org/hibernate/engine/CollectionEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/CollectionEntry.java index bdf9f43001..3011c46270 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/CollectionEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/CollectionEntry.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -31,11 +30,12 @@ import java.util.Collection; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; +import org.jboss.logging.Logger; /** * We need an entry to tell us all about the current state @@ -45,8 +45,7 @@ */ public final class CollectionEntry implements Serializable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - CollectionEntry.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, CollectionEntry.class.getName()); //ATTRIBUTES MAINTAINED BETWEEN FLUSH CYCLES @@ -195,9 +194,9 @@ public void preFlush(PersistentCollection collection) throws HibernateException dirty(collection); - if (LOG.isDebugEnabled() && collection.isDirty() && getLoadedPersister() != null) LOG.debug("Collection dirty: " - + MessageHelper.collectionInfoString(getLoadedPersister().getRole(), - getLoadedKey())); + if (LOG.isDebugEnabled() && collection.isDirty() && getLoadedPersister() != null) LOG.debugf("Collection dirty: %s", + MessageHelper.collectionInfoString(getLoadedPersister().getRole(), + getLoadedKey())); setDoupdate(false); setDoremove(false); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/CollectionKey.java b/hibernate-core/src/main/java/org/hibernate/engine/CollectionKey.java index 62dd28f84a..ae184c5fe3 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/CollectionKey.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/CollectionKey.java @@ -23,17 +23,15 @@ * */ package org.hibernate.engine; - +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; import org.hibernate.EntityMode; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; -import java.io.Serializable; -import java.io.ObjectOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; - /** * Uniquely identifies a collection instance in a particular session. * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/Collections.java b/hibernate-core/src/main/java/org/hibernate/engine/Collections.java index 41b8741e8e..100b33512d 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/Collections.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/Collections.java @@ -23,16 +23,16 @@ * */ package org.hibernate.engine; - import java.io.Serializable; import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.CollectionType; +import org.jboss.logging.Logger; /** * Implements book-keeping for the collection persistence by reachability algorithm @@ -40,8 +40,7 @@ */ public final class Collections { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - Collections.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Collections.class.getName()); private Collections() {} @@ -70,10 +69,10 @@ private static void processDereferencedCollection(PersistentCollection coll, Ses CollectionEntry entry = persistenceContext.getCollectionEntry(coll); final CollectionPersister loadedPersister = entry.getLoadedPersister(); - if (LOG.isDebugEnabled() && loadedPersister != null) LOG.debug("Collection dereferenced: " - + MessageHelper.collectionInfoString(loadedPersister, - entry.getLoadedKey(), - session.getFactory())); + if (LOG.isDebugEnabled() && loadedPersister != null) LOG.debugf("Collection dereferenced: %s", + MessageHelper.collectionInfoString(loadedPersister, + entry.getLoadedKey(), + session.getFactory())); // do a check boolean hasOrphanDelete = loadedPersister != null && @@ -129,8 +128,8 @@ private static void processNeverReferencedCollection(PersistentCollection coll, final PersistenceContext persistenceContext = session.getPersistenceContext(); CollectionEntry entry = persistenceContext.getCollectionEntry(coll); - LOG.debug("Found collection with unloaded owner: " - + MessageHelper.collectionInfoString(entry.getLoadedPersister(), entry.getLoadedKey(), session.getFactory())); + LOG.debugf("Found collection with unloaded owner: %s", + MessageHelper.collectionInfoString(entry.getLoadedPersister(), entry.getLoadedKey(), session.getFactory())); entry.setCurrentPersister( entry.getLoadedPersister() ); entry.setCurrentKey( entry.getLoadedKey() ); @@ -183,15 +182,14 @@ public static void processReachableCollection( ce.setCurrentKey( type.getKeyOfOwner(entity, session) ); //TODO: better to pass the id in as an argument? if (LOG.isDebugEnabled()) { - if (collection.wasInitialized()) LOG.debug("Collection found: " - + MessageHelper.collectionInfoString(persister, ce.getCurrentKey(), factory) - + ", was: " - + MessageHelper.collectionInfoString(ce.getLoadedPersister(), - ce.getLoadedKey(), - factory) + " (initialized)"); - else LOG.debug("Collection found: " + MessageHelper.collectionInfoString(persister, ce.getCurrentKey(), factory) - + ", was: " + MessageHelper.collectionInfoString(ce.getLoadedPersister(), ce.getLoadedKey(), factory) - + " (uninitialized)"); + if (collection.wasInitialized()) LOG.debugf("Collection found: %s, was: %s (initialized)", + MessageHelper.collectionInfoString(persister, ce.getCurrentKey(), factory), + MessageHelper.collectionInfoString(ce.getLoadedPersister(), + ce.getLoadedKey(), + factory)); + else LOG.debugf("Collection found: %s, was: %s (uninitialized)", + MessageHelper.collectionInfoString(persister, ce.getCurrentKey(), factory), + MessageHelper.collectionInfoString(ce.getLoadedPersister(), ce.getLoadedKey(), factory)); } prepareCollectionForUpdate( collection, ce, session.getEntityMode(), factory ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/EntityEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/EntityEntry.java index 7667ece2dd..9c1a082de7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/EntityEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/EntityEntry.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine; - -import java.io.Serializable; -import java.io.ObjectOutputStream; import java.io.IOException; import java.io.ObjectInputStream; - +import java.io.ObjectOutputStream; +import java.io.Serializable; import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.LockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/EntityKey.java b/hibernate-core/src/main/java/org/hibernate/engine/EntityKey.java index ebe5bc6c64..a450284714 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/EntityKey.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/EntityKey.java @@ -23,12 +23,10 @@ * */ package org.hibernate.engine; - -import java.io.Serializable; -import java.io.ObjectOutputStream; import java.io.IOException; import java.io.ObjectInputStream; - +import java.io.ObjectOutputStream; +import java.io.Serializable; import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/EntityUniqueKey.java b/hibernate-core/src/main/java/org/hibernate/engine/EntityUniqueKey.java index 5b12d506d8..834e27a831 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/EntityUniqueKey.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/EntityUniqueKey.java @@ -23,16 +23,14 @@ * */ package org.hibernate.engine; - +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; import org.hibernate.EntityMode; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; -import java.io.Serializable; -import java.io.ObjectOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; - /** * Used to uniquely key an entity instance in relation to a particular session * by some unique property reference, as opposed to identifier. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/ExecuteUpdateResultCheckStyle.java b/hibernate-core/src/main/java/org/hibernate/engine/ExecuteUpdateResultCheckStyle.java index 57be065bd6..7470f0a015 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/ExecuteUpdateResultCheckStyle.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/ExecuteUpdateResultCheckStyle.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine; - -import java.io.Serializable; -import java.io.ObjectStreamException; +package org.hibernate.engine; import java.io.InvalidObjectException; +import java.io.ObjectStreamException; +import java.io.Serializable; /** * For persistence operations (INSERT, UPDATE, DELETE) what style of determining diff --git a/hibernate-core/src/main/java/org/hibernate/engine/FilterDefinition.java b/hibernate-core/src/main/java/org/hibernate/engine/FilterDefinition.java index 223856ddd6..70d003adeb 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/FilterDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/FilterDefinition.java @@ -23,13 +23,11 @@ * */ package org.hibernate.engine; - -import org.hibernate.type.Type; - import java.io.Serializable; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import java.util.Set; +import org.hibernate.type.Type; /** * A FilterDefinition defines the global attributes of a dynamic filter. This diff --git a/hibernate-core/src/main/java/org/hibernate/engine/ForeignKeys.java b/hibernate-core/src/main/java/org/hibernate/engine/ForeignKeys.java index 488726a298..7d44216c09 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/ForeignKeys.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/ForeignKeys.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.TransientObjectException; import org.hibernate.intercept.LazyPropertyInitializer; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/HibernateIterator.java b/hibernate-core/src/main/java/org/hibernate/engine/HibernateIterator.java index 1fa203a7c1..a5d9172385 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/HibernateIterator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/HibernateIterator.java @@ -23,10 +23,8 @@ * */ package org.hibernate.engine; - -import org.hibernate.JDBCException; - import java.util.Iterator; +import org.hibernate.JDBCException; /** * An iterator that may be "closed" diff --git a/hibernate-core/src/main/java/org/hibernate/engine/IdentifierValue.java b/hibernate-core/src/main/java/org/hibernate/engine/IdentifierValue.java index c35ebf3dcd..3ba194f3f2 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/IdentifierValue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/IdentifierValue.java @@ -23,9 +23,9 @@ * */ package org.hibernate.engine; - import java.io.Serializable; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; +import org.jboss.logging.Logger; /** * A strategy for determining if an identifier value is an identifier of @@ -37,8 +37,7 @@ */ public class IdentifierValue { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - IdentifierValue.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, IdentifierValue.class.getName()); private final Serializable value; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/JoinHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/JoinHelper.java index 38dc78c147..c8438981fd 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/JoinHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/JoinHelper.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine; - import org.hibernate.persister.entity.Joinable; import org.hibernate.persister.entity.OuterJoinLoadable; import org.hibernate.persister.entity.PropertyMapping; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/JoinSequence.java b/hibernate-core/src/main/java/org/hibernate/engine/JoinSequence.java index 468d1641e0..125f0f0b32 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/JoinSequence.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/JoinSequence.java @@ -23,15 +23,13 @@ * */ package org.hibernate.engine; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; - import org.hibernate.MappingException; -import org.hibernate.persister.entity.Joinable; import org.hibernate.persister.collection.QueryableCollection; +import org.hibernate.persister.entity.Joinable; import org.hibernate.sql.JoinFragment; import org.hibernate.sql.QueryJoinFragment; import org.hibernate.type.AssociationType; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/LoadQueryInfluencers.java b/hibernate-core/src/main/java/org/hibernate/engine/LoadQueryInfluencers.java index b279d69b61..cd487952ee 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/LoadQueryInfluencers.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/LoadQueryInfluencers.java @@ -23,18 +23,16 @@ * */ package org.hibernate.engine; - -import java.util.Map; -import java.util.Set; -import java.util.Iterator; +import java.io.Serializable; import java.util.HashMap; import java.util.HashSet; -import java.io.Serializable; - +import java.util.Iterator; +import java.util.Map; +import java.util.Set; import org.hibernate.Filter; import org.hibernate.UnknownProfileException; -import org.hibernate.type.Type; import org.hibernate.impl.FilterImpl; +import org.hibernate.type.Type; /** * Centralize all options which can influence the SQL query needed to load an diff --git a/hibernate-core/src/main/java/org/hibernate/engine/Mapping.java b/hibernate-core/src/main/java/org/hibernate/engine/Mapping.java index 1189e31678..407e646353 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/Mapping.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/Mapping.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine; - import org.hibernate.MappingException; import org.hibernate.id.factory.IdentifierGeneratorFactory; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/NamedQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/engine/NamedQueryDefinition.java index 0ff5d45c20..b6fcddf4c1 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/NamedQueryDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/NamedQueryDefinition.java @@ -23,10 +23,8 @@ * */ package org.hibernate.engine; - import java.io.Serializable; import java.util.Map; - import org.hibernate.CacheMode; import org.hibernate.FlushMode; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/NamedSQLQueryDefinition.java b/hibernate-core/src/main/java/org/hibernate/engine/NamedSQLQueryDefinition.java index 89d0b62c21..ecf40e56af 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/NamedSQLQueryDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/NamedSQLQueryDefinition.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine; - import java.util.List; import java.util.Map; - -import org.hibernate.FlushMode; import org.hibernate.CacheMode; +import org.hibernate.FlushMode; import org.hibernate.engine.query.sql.NativeSQLQueryReturn; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/NonFlushedChanges.java b/hibernate-core/src/main/java/org/hibernate/engine/NonFlushedChanges.java index d964e501a3..47c81438bb 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/NonFlushedChanges.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/NonFlushedChanges.java @@ -22,14 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine; - -/** - * This interface defines the public API for changes to an EventSource that have not - * been flushed to the database. - * - * @author Gail Badner - */ - import java.io.Serializable; import org.hibernate.event.EventSource; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/Nullability.java b/hibernate-core/src/main/java/org/hibernate/engine/Nullability.java index 3e323c5ddb..b6540d1f78 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/Nullability.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/Nullability.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine; - import java.util.Iterator; - import org.hibernate.HibernateException; import org.hibernate.PropertyValueException; import org.hibernate.intercept.LazyPropertyInitializer; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/ParameterBinder.java b/hibernate-core/src/main/java/org/hibernate/engine/ParameterBinder.java index 9dc232b836..5e45dc0800 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/ParameterBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/ParameterBinder.java @@ -23,14 +23,14 @@ * */ package org.hibernate.engine; - import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Iterator; import java.util.Map; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * Centralizes the commonality regarding binding of parameter values into @@ -43,8 +43,7 @@ */ public class ParameterBinder { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - ParameterBinder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, ParameterBinder.class.getName()); public static interface NamedParameterSource { public int[] getNamedParameterLocations(String name); @@ -118,7 +117,7 @@ public static int bindNamedParameters( TypedValue typedval = ( TypedValue ) e.getValue(); int[] locations = source.getNamedParameterLocations( name ); for ( int i = 0; i < locations.length; i++ ) { - LOG.debug("bindNamedParameters() " + typedval.getValue() + " -> " + name + " [" + (locations[i] + start) + "]"); + LOG.debugf("bindNamedParameters() %s -> %s [%s]", typedval.getValue(), name, locations[i] + start); typedval.getType().nullSafeSet( ps, typedval.getValue(), locations[i] + start, session ); } result += locations.length; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/PersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/PersistenceContext.java index d2247e3971..c7fe989e1d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/PersistenceContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/PersistenceContext.java @@ -23,16 +23,14 @@ * */ package org.hibernate.engine; - import java.io.Serializable; import java.util.HashSet; import java.util.Map; - import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.MappingException; -import org.hibernate.engine.loading.LoadContexts; import org.hibernate.collection.PersistentCollection; +import org.hibernate.engine.loading.LoadContexts; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/QueryParameters.java b/hibernate-core/src/main/java/org/hibernate/engine/QueryParameters.java index 1f71f31043..6a81d3d02e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/QueryParameters.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/QueryParameters.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine; - import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -32,8 +31,8 @@ import java.util.Map; import java.util.StringTokenizer; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockOptions; -import org.hibernate.Logger; import org.hibernate.QueryException; import org.hibernate.ScrollMode; import org.hibernate.dialect.Dialect; @@ -43,14 +42,14 @@ import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; +import org.jboss.logging.Logger; /** * @author Gavin King */ public final class QueryParameters { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - QueryParameters.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, QueryParameters.class.getName()); private Type[] positionalParameterTypes; private Object[] positionalParameterValues; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/ResultSetMappingDefinition.java b/hibernate-core/src/main/java/org/hibernate/engine/ResultSetMappingDefinition.java index 9f44fa9e83..6f3a34ae8e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/ResultSetMappingDefinition.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/ResultSetMappingDefinition.java @@ -23,11 +23,9 @@ * */ package org.hibernate.engine; - +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import java.io.Serializable; - import org.hibernate.engine.query.sql.NativeSQLQueryReturn; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/RowSelection.java b/hibernate-core/src/main/java/org/hibernate/engine/RowSelection.java index c9ffc450e5..a11219fa17 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/RowSelection.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/RowSelection.java @@ -24,6 +24,7 @@ */ package org.hibernate.engine; + /** * Represents a selection of rows in a JDBC ResultSet * @author Gavin King diff --git a/hibernate-core/src/main/java/org/hibernate/engine/SessionFactoryImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/SessionFactoryImplementor.java index 4a8eba6789..86748bdb7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/SessionFactoryImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/SessionFactoryImplementor.java @@ -23,35 +23,32 @@ * */ package org.hibernate.engine; - +import java.sql.Connection; import java.util.Map; import java.util.Properties; import java.util.Set; -import java.sql.Connection; - import javax.transaction.TransactionManager; - +import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.MappingException; import org.hibernate.SessionFactory; -import org.hibernate.ConnectionReleaseMode; -import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.engine.jdbc.spi.SQLExceptionHelper; -import org.hibernate.proxy.EntityNotFoundDelegate; -import org.hibernate.engine.query.QueryPlanCache; -import org.hibernate.engine.profile.FetchProfile; -import org.hibernate.persister.collection.CollectionPersister; -import org.hibernate.persister.entity.EntityPersister; import org.hibernate.cache.QueryCache; -import org.hibernate.cache.UpdateTimestampsCache; import org.hibernate.cache.Region; +import org.hibernate.cache.UpdateTimestampsCache; import org.hibernate.cfg.Settings; -import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.function.SQLFunctionRegistry; +import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.engine.jdbc.spi.SQLExceptionHelper; +import org.hibernate.engine.profile.FetchProfile; +import org.hibernate.engine.query.QueryPlanCache; import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.id.IdentifierGenerator; +import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.persister.entity.EntityPersister; +import org.hibernate.proxy.EntityNotFoundDelegate; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.stat.StatisticsImplementor; import org.hibernate.type.Type; import org.hibernate.type.TypeResolver; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/SessionImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/SessionImplementor.java index ca3a585439..de9f854d0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/SessionImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/SessionImplementor.java @@ -23,13 +23,11 @@ * */ package org.hibernate.engine; - import java.io.Serializable; import java.sql.Connection; import java.util.Iterator; import java.util.List; import java.util.Map; - import org.hibernate.CacheMode; import org.hibernate.EntityMode; import org.hibernate.FlushMode; @@ -39,9 +37,9 @@ import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.Transaction; +import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.jdbc.spi.JDBCContext; import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; -import org.hibernate.collection.PersistentCollection; import org.hibernate.event.EventListeners; import org.hibernate.impl.CriteriaImpl; import org.hibernate.loader.custom.CustomQuery; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java b/hibernate-core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java index 6c51fd87dd..d8648df639 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine; - import static org.jboss.logging.Logger.Level.WARN; import java.io.IOException; import java.io.InvalidObjectException; @@ -41,8 +40,8 @@ import org.hibernate.AssertionFailure; import org.hibernate.Hibernate; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.MappingException; import org.hibernate.NonUniqueObjectException; import org.hibernate.PersistentObjectException; @@ -57,6 +56,7 @@ import org.hibernate.tuple.ElementWrapper; import org.hibernate.util.IdentityMap; import org.hibernate.util.MarkerObject; +import org.jboss.logging.Logger; /** * A PersistenceContext represents the state of persistent "stuff" which @@ -74,8 +74,8 @@ public class StatefulPersistenceContext implements PersistenceContext { public static final Object NO_ROW = new MarkerObject( "NO_ROW" ); - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - StatefulPersistenceContext.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + StatefulPersistenceContext.class.getName()); private static final int INIT_COLL_SIZE = 8; private SessionImplementor session; @@ -548,7 +548,7 @@ public void reassociateProxy(Object value, Serializable id) throws MappingExcept } if ( value instanceof HibernateProxy ) { - LOG.debug("setting proxy identifier: " + id); + LOG.debugf("Setting proxy identifier: %s", id); HibernateProxy proxy = (HibernateProxy) value; LazyInitializer li = proxy.getHibernateLazyInitializer(); li.setIdentifier(id); @@ -884,7 +884,7 @@ public void addNonLazyCollection(PersistentCollection collection) { */ public void initializeNonLazyCollections() throws HibernateException { if ( loadCounter == 0 ) { - LOG.debug("Initializing non-lazy collections"); + LOG.debugf("Initializing non-lazy collections"); //do this work only at the very highest level of the load loadCounter++; //don't let this method be called recursively try { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/Status.java b/hibernate-core/src/main/java/org/hibernate/engine/Status.java index ffd3ec33df..1e2fe070cc 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/Status.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/Status.java @@ -23,10 +23,9 @@ * */ package org.hibernate.engine; - -import java.io.Serializable; -import java.io.ObjectStreamException; import java.io.InvalidObjectException; +import java.io.ObjectStreamException; +import java.io.Serializable; /** * Represents the status of an entity with respect to diff --git a/hibernate-core/src/main/java/org/hibernate/engine/SubselectFetch.java b/hibernate-core/src/main/java/org/hibernate/engine/SubselectFetch.java index 2dfbdd93cb..b1e0f4dd47 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/SubselectFetch.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/SubselectFetch.java @@ -23,10 +23,8 @@ * */ package org.hibernate.engine; - import java.util.Map; import java.util.Set; - import org.hibernate.persister.entity.Loadable; import org.hibernate.persister.entity.PropertyMapping; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/TransactionHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/TransactionHelper.java index 0c7df45cdc..eda39a70cb 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/TransactionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/TransactionHelper.java @@ -23,15 +23,12 @@ * */ package org.hibernate.engine; - import java.io.Serializable; import java.sql.Connection; import java.sql.SQLException; - import org.hibernate.HibernateException; import org.hibernate.engine.transaction.IsolatedWork; import org.hibernate.engine.transaction.Isolater; -import org.hibernate.exception.JDBCExceptionHelper; /** * Allows work to be done outside the current transaction, by suspending it, diff --git a/hibernate-core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java b/hibernate-core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java index 17e9c6ebea..8578fe5a95 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java @@ -22,13 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine; - import java.io.Serializable; import org.hibernate.AssertionFailure; import org.hibernate.CacheMode; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.cache.CacheKey; import org.hibernate.cache.entry.CacheEntry; import org.hibernate.event.PostLoadEvent; @@ -42,6 +41,7 @@ import org.hibernate.proxy.HibernateProxy; import org.hibernate.type.Type; import org.hibernate.type.TypeHelper; +import org.jboss.logging.Logger; /** * Functionality relating to Hibernate's two-phase loading process, @@ -52,8 +52,7 @@ */ public final class TwoPhaseLoad { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - TwoPhaseLoad.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, TwoPhaseLoad.class.getName()); private TwoPhaseLoad() {} @@ -125,8 +124,8 @@ public static void initializeEntity( Serializable id = entityEntry.getId(); Object[] hydratedState = entityEntry.getLoadedState(); - if (LOG.isDebugEnabled()) LOG.debug("Resolving associations for " - + MessageHelper.infoString(persister, id, session.getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Resolving associations for %s", + MessageHelper.infoString(persister, id, session.getFactory())); Type[] types = persister.getPropertyTypes(); for ( int i = 0; i < hydratedState.length; i++ ) { @@ -150,8 +149,8 @@ public static void initializeEntity( final SessionFactoryImplementor factory = session.getFactory(); if ( persister.hasCache() && session.getCacheMode().isPutEnabled() ) { - if (LOG.isDebugEnabled()) LOG.debug("Adding entity to second-level cache: " - + MessageHelper.infoString(persister, id, session.getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Adding entity to second-level cache: %s", + MessageHelper.infoString(persister, id, session.getFactory())); Object version = Versioning.getVersion(hydratedState, persister); CacheEntry entry = new CacheEntry( @@ -244,8 +243,8 @@ public static void initializeEntity( } } - if (LOG.isDebugEnabled()) LOG.debug("Done materializing entity " - + MessageHelper.infoString(persister, id, session.getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Done materializing entity %s", + MessageHelper.infoString(persister, id, session.getFactory())); if ( factory.getStatistics().isStatisticsEnabled() ) { factory.getStatisticsImplementor().loadEntity( persister.getEntityName() ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/TypedValue.java b/hibernate-core/src/main/java/org/hibernate/engine/TypedValue.java index ae5a84ae89..68f6b8af07 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/TypedValue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/TypedValue.java @@ -23,9 +23,7 @@ * */ package org.hibernate.engine; - import java.io.Serializable; - import org.hibernate.EntityMode; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/UnsavedValueFactory.java b/hibernate-core/src/main/java/org/hibernate/engine/UnsavedValueFactory.java index f32c36dd4e..0d3d11c621 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/UnsavedValueFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/UnsavedValueFactory.java @@ -23,10 +23,8 @@ * */ package org.hibernate.engine; - import java.io.Serializable; import java.lang.reflect.Constructor; - import org.hibernate.InstantiationException; import org.hibernate.MappingException; import org.hibernate.property.Getter; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/ValueInclusion.java b/hibernate-core/src/main/java/org/hibernate/engine/ValueInclusion.java index bc34505243..520d6f20cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/ValueInclusion.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/ValueInclusion.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine; - -import java.io.Serializable; +package org.hibernate.engine; import java.io.ObjectStreamException; +import java.io.Serializable; import java.io.StreamCorruptedException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/VersionValue.java b/hibernate-core/src/main/java/org/hibernate/engine/VersionValue.java index ea69ef2d33..b4b9a4c8ca 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/VersionValue.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/VersionValue.java @@ -23,10 +23,10 @@ * */ package org.hibernate.engine; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.id.IdentifierGeneratorHelper; +import org.jboss.logging.Logger; /** * A strategy for determining if a version value is an version of @@ -38,8 +38,7 @@ */ public class VersionValue { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - VersionValue.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, VersionValue.class.getName()); private final Object value; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/Versioning.java b/hibernate-core/src/main/java/org/hibernate/engine/Versioning.java index d56c672f11..81932c7704 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/Versioning.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/Versioning.java @@ -23,10 +23,10 @@ * */ package org.hibernate.engine; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.type.VersionType; +import org.jboss.logging.Logger; /** * Utilities for dealing with optimisitic locking values. @@ -57,8 +57,7 @@ public final class Versioning { */ public static final int OPTIMISTIC_LOCK_DIRTY = 1; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - Versioning.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Versioning.class.getName()); /** * Private constructor disallowing instantiation. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/AbstractLobCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/AbstractLobCreator.java index e8f2a7091d..d4e463ffa7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/AbstractLobCreator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/AbstractLobCreator.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - import java.sql.Blob; import java.sql.Clob; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobImplementer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobImplementer.java index 76dd4a8e4b..2f10a3f8aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobImplementer.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobImplementer.java @@ -23,6 +23,7 @@ */ package org.hibernate.engine.jdbc; + /** * Marker interface for non-contextually created {@link java.sql.Blob} instances.. * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java index f81e4b48b9..073fd2960a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java @@ -22,15 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - +import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.sql.Blob; import java.sql.SQLException; -import java.io.InputStream; -import java.io.IOException; - import org.hibernate.type.descriptor.java.BinaryStreamImpl; import org.hibernate.type.descriptor.java.DataHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobImplementer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobImplementer.java index 5bf378a8b1..4beed7a499 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobImplementer.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobImplementer.java @@ -23,6 +23,7 @@ */ package org.hibernate.engine.jdbc; + /** * Marker interface for non-contextually created {@link java.sql.Clob} instances.. * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java index 97ae85aafb..b347b21039 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ClobProxy.java @@ -22,17 +22,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.io.StringReader; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.sql.Clob; import java.sql.SQLException; -import java.io.Reader; -import java.io.StringReader; -import java.io.InputStream; -import java.io.IOException; - import org.hibernate.type.descriptor.java.DataHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java index 5b65757708..35580a97a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ColumnNameCache.java @@ -22,9 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - -import java.sql.SQLException; import java.sql.ResultSet; +import java.sql.SQLException; import java.util.HashMap; import java.util.Map; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java index 9bc261aac5..bffb56cf9c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ContextualLobCreator.java @@ -22,18 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - -import java.sql.Blob; -import java.sql.NClob; -import java.sql.SQLException; -import java.sql.Clob; -import java.sql.Connection; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.IOException; import java.io.Reader; import java.io.Writer; - +import java.sql.Blob; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.NClob; +import java.sql.SQLException; import org.hibernate.HibernateException; import org.hibernate.JDBCException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcSupport.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcSupport.java index 0dd2999bfc..596b66c397 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcSupport.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/JdbcSupport.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - import java.sql.ResultSet; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreationContext.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreationContext.java index 1d352e134e..42a764e7b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreationContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreationContext.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - import java.sql.Connection; import java.sql.SQLException; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java index 0250cdcd83..74a8d72c7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/LobCreator.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - -import java.sql.Blob; -import java.sql.Clob; import java.io.InputStream; import java.io.Reader; +import java.sql.Blob; +import java.sql.Clob; import java.sql.NClob; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobImplementer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobImplementer.java index 9676ea2778..f7de45cda4 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobImplementer.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobImplementer.java @@ -23,6 +23,7 @@ */ package org.hibernate.engine.jdbc; + /** * Marker interface for non-contextually created java.sql.NClob instances.. *

diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java index 6ae78d1b31..cbd7ac3a15 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NClobProxy.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - -import java.sql.Clob; import java.io.Reader; import java.lang.reflect.Proxy; +import java.sql.Clob; import java.sql.NClob; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java index c5ec8b966a..8b370e48a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/NonContextualLobCreator.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - -import java.sql.Blob; -import java.sql.Clob; import java.io.InputStream; import java.io.Reader; +import java.sql.Blob; +import java.sql.Clob; import java.sql.NClob; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java index 02a65f95d0..7728bd4bae 100755 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ReaderInputStream.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine.jdbc; - import java.io.IOException; import java.io.InputStream; import java.io.Reader; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java index 77b80f8bbc..682016a1ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java @@ -22,16 +22,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - -import static org.jboss.logging.Logger.Level.WARN; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.sql.ResultSet; import java.sql.SQLException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.util.JDBCExceptionReporter; +import org.jboss.logging.Logger; /** * A proxy for a ResultSet delegate, responsible for locally caching the columnName-to-columnIndex resolution that @@ -42,8 +41,7 @@ */ public class ResultSetWrapperProxy implements InvocationHandler { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - ResultSetWrapperProxy.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, ResultSetWrapperProxy.class.getName()); private static final Class[] PROXY_INTERFACES = new Class[] { ResultSet.class }; private final ResultSet rs; @@ -110,10 +108,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl JDBCExceptionReporter.logExceptions( ex, buf.toString() ); } catch ( NoSuchMethodException ex ) { - if (LOG.isEnabled(WARN)) { - StringBuffer buf = new StringBuffer().append("Exception switching from method: [").append(method).append("] to a method using the column index. Reverting to using: [").append(method).append("]"); - LOG.warn(buf.toString()); - } + LOG.unableToSwitchToMethodUsingColumnIndex(method); } } return invokeMethod( method, args ); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java index 1f857ee619..59656a0a1b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableBlobProxy.java @@ -22,14 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - -import java.sql.Blob; -import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Proxy; -import java.lang.reflect.InvocationHandler; import java.io.Serializable; - +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.sql.Blob; import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java index 87ee1eec18..6d076d42e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableClobProxy.java @@ -22,14 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - +import java.io.Serializable; import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.sql.Clob; -import java.io.Serializable; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java index 3e205055f9..954bb80d64 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/SerializableNClobProxy.java @@ -22,9 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - -import java.sql.Clob; import java.lang.reflect.Proxy; +import java.sql.Clob; /** * Manages aspects of proxying java.sql.NClobs to add serializability. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/StreamUtils.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/StreamUtils.java index 5a6f5f3123..dad827d309 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/StreamUtils.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/StreamUtils.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.IOException; import java.io.Reader; import java.io.Writer; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedBlob.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedBlob.java index 0885e46697..7b3e282728 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedBlob.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedBlob.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - import java.sql.Blob; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedClob.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedClob.java index 97f621d78b..8dfb72f78d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedClob.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/WrappedClob.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc; - import java.sql.Clob; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java index 5ff012c8e5..a6ddce1cd5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java @@ -22,16 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.batch.internal; - import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.jdbc.batch.spi.Batch; import org.hibernate.engine.jdbc.batch.spi.BatchObserver; import org.hibernate.engine.jdbc.spi.SQLExceptionHelper; import org.hibernate.engine.jdbc.spi.SQLStatementLogger; +import org.jboss.logging.Logger; /** * Convenience base class for implementors of the Batch interface. @@ -40,8 +40,7 @@ */ public abstract class AbstractBatchImpl implements Batch { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AbstractBatchImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, AbstractBatchImpl.class.getName()); private final SQLStatementLogger statementLogger; private final SQLExceptionHelper exceptionHelper; @@ -119,7 +118,7 @@ public final PreparedStatement getBatchStatement(Object key, String sql) { } PreparedStatement statement = statements.get( sql ); if ( statement != null ) { - LOG.debug("Reusing prepared statement"); + LOG.debugf("Reusing prepared statement"); statementLogger.logStatement( sql ); } return statement; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilder.java index cb1fd90431..d4e21d3e84 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilder.java @@ -22,11 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.batch.internal; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.jdbc.batch.spi.Batch; import org.hibernate.engine.jdbc.spi.SQLExceptionHelper; import org.hibernate.engine.jdbc.spi.SQLStatementLogger; +import org.jboss.logging.Logger; /** * A builder for {@link Batch} instances. @@ -35,8 +35,7 @@ */ public class BatchBuilder { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - BatchBuilder.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, BatchBuilder.class.getName()); private int size; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java index da7f7ea33e..2101e31ec2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.batch.internal; - import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.ArrayList; @@ -31,10 +30,11 @@ import java.util.Map; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.jdbc.spi.SQLExceptionHelper; import org.hibernate.engine.jdbc.spi.SQLStatementLogger; import org.hibernate.jdbc.Expectation; +import org.jboss.logging.Logger; /** * A {@link org.hibernate.engine.jdbc.batch.spi.Batch} implementation which does @@ -45,8 +45,7 @@ */ public class BatchingBatch extends AbstractBatchImpl { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - BatchingBatch.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, BatchingBatch.class.getName()); private final int batchSize; @@ -107,9 +106,9 @@ public void addToBatch(Object key, String sql, Expectation expectation) { */ @Override protected void doExecuteBatch() { - if (maxBatchPosition == 0) LOG.debug("No batched statements to execute"); + if (maxBatchPosition == 0) LOG.debugf("No batched statements to execute"); else { - LOG.debug("Executing " + getStatements().size() + " statements with maximum batch size " + maxBatchPosition); + LOG.debugf("Executing %s statements with maximum batch size %s", getStatements().size(), maxBatchPosition); try { executeStatements(); @@ -141,10 +140,10 @@ private void executeStatements() { ); } if ( expectations.size() > 0 ) { - LOG.debug("Executing with batch of size " + expectations.size() + ": " + sql); + LOG.debugf("Executing with batch of size %s: %s", expectations.size(), sql); executeStatement( sql, statement, expectations ); expectations.clear(); - } else LOG.debug("Skipped executing because batch size is 0: " + sql); + } else LOG.debugf("Skipped executing because batch size is 0: %s", sql); } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java index 1099cd0010..f12e60a558 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java @@ -22,13 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.batch.internal; - import java.sql.PreparedStatement; import java.sql.SQLException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.jdbc.spi.SQLExceptionHelper; import org.hibernate.engine.jdbc.spi.SQLStatementLogger; import org.hibernate.jdbc.Expectation; +import org.jboss.logging.Logger; /** * An implementation of {@link org.hibernate.engine.jdbc.batch.spi.Batch} which does not perform batching. It simply executes each statement as it is @@ -38,8 +38,7 @@ */ public class NonBatchingBatch extends AbstractBatchImpl { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - NonBatchingBatch.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, NonBatchingBatch.class.getName()); protected NonBatchingBatch(Object key, SQLStatementLogger statementLogger, diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java index 7c99332100..ea33904056 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/Batch.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.batch.spi; - import java.sql.PreparedStatement; - import org.hibernate.jdbc.Expectation; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchObserver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchObserver.java index 28f68917ec..a37bc5a701 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchObserver.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/spi/BatchObserver.java @@ -23,6 +23,7 @@ */ package org.hibernate.engine.jdbc.batch.spi; + /** * An observer contract for batch events. * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ConnectionManagerImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ConnectionManagerImpl.java index 5912f085fe..817f4c299b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ConnectionManagerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ConnectionManagerImpl.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine.jdbc.internal; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -34,8 +33,8 @@ import org.hibernate.AssertionFailure; import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.Interceptor; -import org.hibernate.Logger; import org.hibernate.ScrollMode; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.jdbc.batch.internal.BatchBuilder; @@ -43,6 +42,7 @@ import org.hibernate.engine.jdbc.spi.ConnectionManager; import org.hibernate.engine.jdbc.spi.ConnectionObserver; import org.hibernate.jdbc.Expectation; +import org.jboss.logging.Logger; /** * Encapsulates JDBC Connection management logic needed by Hibernate. @@ -54,7 +54,7 @@ */ public class ConnectionManagerImpl implements ConnectionManager { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, ConnectionManagerImpl.class.getName()); public static interface Callback extends ConnectionObserver { public boolean isTransactionInProgress(); @@ -253,7 +253,7 @@ public void afterTransaction() { if ( logicalConnection != null ) { if (isAfterTransactionRelease() || isAggressiveReleaseNoTransactionCheck()) logicalConnection.afterTransaction(); // log a message about potential connection leaks - else if (isOnCloseRelease()) LOG.debug("Transaction completed on session with on_close connection release mode; be sure to close the session to release JDBC resources!"); + else if (isOnCloseRelease()) LOG.debugf("Transaction completed on session with on_close connection release mode; be sure to close the session to release JDBC resources!"); } if (statementPreparer != null) statementPreparer.unsetTransactionTimeout(); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JDBCContextImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JDBCContextImpl.java index 75b99f933f..c0533a344d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JDBCContextImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JDBCContextImpl.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine.jdbc.internal; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -32,8 +31,8 @@ import javax.transaction.TransactionManager; import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.Interceptor; -import org.hibernate.Logger; import org.hibernate.SessionException; import org.hibernate.Transaction; import org.hibernate.TransactionException; @@ -43,6 +42,7 @@ import org.hibernate.transaction.synchronization.CallbackCoordinator; import org.hibernate.transaction.synchronization.HibernateSynchronizationImpl; import org.hibernate.util.JTAHelper; +import org.jboss.logging.Logger; /** * Acts as the intermediary between "entity-mode related" sessions in terms of their interaction with the JDBC data store. @@ -59,8 +59,7 @@ public class JDBCContextImpl implements ConnectionManagerImpl.Callback, JDBCCont // ConnectionManager is a "JDBCContext"? A "SessionContext" should // live in the impl package... - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - JDBCContext.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, JDBCContextImpl.class.getName()); private Context owner; private ConnectionManagerImpl connectionManager; @@ -186,7 +185,7 @@ public boolean registerSynchronizationIfPossible() { javax.transaction.Transaction tx = tm.getTransaction(); if (JTAHelper.isMarkedForRollback(tx)) { // transactions marked for rollback-only cause some TM impls to throw exceptions - LOG.debug("Transaction is marked for rollback; skipping Synchronization registration"); + LOG.debugf("Transaction is marked for rollback; skipping Synchronization registration"); return false; } if (hibernateTransaction == null) hibernateTransaction = owner.getFactory().getSettings().getTransactionFactory().createTransaction(this, @@ -194,7 +193,7 @@ public boolean registerSynchronizationIfPossible() { tx.registerSynchronization(new HibernateSynchronizationImpl(getJtaSynchronizationCallbackCoordinator(tx))); // tx.registerSynchronization( new CacheSynchronization(owner, this, tx, hibernateTransaction) ); isTransactionCallbackRegistered = true; - LOG.debug("Successfully registered Synchronization"); + LOG.debugf("Successfully registered Synchronization"); return true; } catch (HibernateException e) { throw e; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcResourceRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcResourceRegistryImpl.java index e8a3d38d39..7a529fd7b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcResourceRegistryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcResourceRegistryImpl.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal; - import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; @@ -31,11 +30,12 @@ import java.util.Map; import java.util.Set; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.jdbc.spi.InvalidatableWrapper; import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry; import org.hibernate.engine.jdbc.spi.JdbcWrapper; import org.hibernate.engine.jdbc.spi.SQLExceptionHelper; +import org.jboss.logging.Logger; import org.jboss.logging.Logger.Level; /** @@ -45,8 +45,8 @@ */ public class JdbcResourceRegistryImpl implements JdbcResourceRegistry { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - JdbcResourceRegistryImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + JdbcResourceRegistryImpl.class.getName()); private final HashMap> xref = new HashMap>(); private final Set unassociatedResultSets = new HashSet(); @@ -265,7 +265,7 @@ protected void close(Statement statement) { } catch( SQLException sqle ) { // there was a problem "cleaning" the prepared statement - LOG.debug("Exception clearing maxRows/queryTimeout [" + sqle.getMessage() + "]"); + LOG.debugf("Exception clearing maxRows/queryTimeout [%s]", sqle.getMessage()); return; // EARLY EXIT!!! } statement.close(); @@ -274,7 +274,7 @@ protected void close(Statement statement) { } } catch( SQLException sqle ) { - LOG.debug("Unable to release statement [" + sqle.getMessage() + "]"); + LOG.debugf("Unable to release statement [%s]", sqle.getMessage()); } } @@ -292,7 +292,7 @@ protected void close(ResultSet resultSet) { resultSet.close(); } catch( SQLException e ) { - LOG.debug("Unable to release result set [" + e.getMessage() + "]"); + LOG.debugf("Unable to release result set [%s]", e.getMessage()); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java index e2187e68af..ffdaa95ec7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal; - import java.lang.reflect.InvocationTargetException; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -32,7 +31,7 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.spi.ExtractedDatabaseMetaData; @@ -48,6 +47,7 @@ import org.hibernate.service.spi.Configurable; import org.hibernate.service.spi.InjectService; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; /** * Standard implementation of the {@link JdbcServices} contract @@ -56,8 +56,7 @@ */ public class JdbcServicesImpl implements JdbcServices, Configurable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - JdbcServicesImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, JdbcServicesImpl.class.getName()); private ConnectionProvider connectionProvider; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java index b97c9f9756..a369981e8c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesInitiator.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal; - import java.util.Map; - import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.service.spi.ServicesRegistry; import org.hibernate.service.spi.ServiceInitiator; +import org.hibernate.service.spi.ServicesRegistry; /** * Standard initiator for the standard {@link JdbcServices} service diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LogicalConnectionImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LogicalConnectionImpl.java index 8ed87047d8..795f8ee7e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LogicalConnectionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LogicalConnectionImpl.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -32,14 +31,15 @@ import java.util.List; import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.JDBCException; -import org.hibernate.Logger; import org.hibernate.engine.jdbc.spi.ConnectionObserver; import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor; import org.hibernate.jdbc.BorrowedConnectionProxy; import org.hibernate.stat.StatisticsImplementor; +import org.jboss.logging.Logger; /** * LogicalConnectionImpl implementation @@ -48,8 +48,7 @@ */ public class LogicalConnectionImpl implements LogicalConnectionImplementor { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - LogicalConnectionImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, LogicalConnectionImpl.class.getName()); private Connection physicalConnection; private Connection borrowedConnection; @@ -105,7 +104,7 @@ private static ConnectionReleaseMode determineConnectionReleaseMode(JdbcServices } else if ( connectionReleaseMode == ConnectionReleaseMode.AFTER_STATEMENT && ! jdbcServices.getConnectionProvider().supportsAggressiveRelease() ) { - LOG.debug("Connection provider reports to not support aggressive release; overriding"); + LOG.debugf("Connection provider reports to not support aggressive release; overriding"); return ConnectionReleaseMode.AFTER_TRANSACTION; } else { @@ -247,13 +246,13 @@ public void afterStatementExecution() { LOG.trace("Starting after statement execution processing [" + connectionReleaseMode + "]"); if ( connectionReleaseMode == ConnectionReleaseMode.AFTER_STATEMENT ) { if ( ! releasesEnabled ) { - LOG.debug("Skipping aggressive release due to manual disabling"); + LOG.debugf("Skipping aggressive release due to manual disabling"); return; } if ( jdbcResourceRegistry.hasRegisteredResources() ) { - LOG.debug("Skipping aggressive release due to registered resources"); + LOG.debugf("Skipping aggressive release due to registered resources"); return; - } else if (borrowedConnection != null) LOG.debug("Skipping aggressive release due to borrowed connection"); + } else if (borrowedConnection != null) LOG.debugf("Skipping aggressive release due to borrowed connection"); releaseConnection(); } } @@ -285,9 +284,9 @@ public void enableReleases() { * Force aggresive release of the underlying connection. */ public void aggressiveRelease() { - if (isUserSuppliedConnection) LOG.debug("Cannot aggressively release user-supplied connection; skipping"); + if (isUserSuppliedConnection) LOG.debugf("Cannot aggressively release user-supplied connection; skipping"); else { - LOG.debug("Aggressively releasing JDBC connection"); + LOG.debugf("Aggressively releasing JDBC connection"); if ( physicalConnection != null ) { releaseConnection(); } @@ -301,13 +300,13 @@ public void aggressiveRelease() { * @throws org.hibernate.JDBCException Indicates problem opening a connection */ private void obtainConnection() throws JDBCException { - LOG.debug("Obtaining JDBC connection"); + LOG.debugf("Obtaining JDBC connection"); try { physicalConnection = getJdbcServices().getConnectionProvider().getConnection(); for ( ConnectionObserver observer : observers ) { observer.physicalConnectionObtained( physicalConnection ); } - LOG.debug("Obtained JDBC connection"); + LOG.debugf("Obtained JDBC connection"); } catch ( SQLException sqle) { throw getJdbcServices().getSqlExceptionHelper().convert( sqle, "Could not open connection" ); @@ -320,7 +319,7 @@ private void obtainConnection() throws JDBCException { * @throws JDBCException Indicates problem closing a connection */ private void releaseConnection() throws JDBCException { - LOG.debug("Releasing JDBC connection"); + LOG.debugf("Releasing JDBC connection"); if ( physicalConnection == null ) return; try { if (!physicalConnection.isClosed()) getJdbcServices().getSqlExceptionHelper().logAndClearWarnings(physicalConnection); @@ -332,7 +331,7 @@ private void releaseConnection() throws JDBCException { finally { physicalConnection = null; } - LOG.debug("Released JDBC connection"); + LOG.debugf("Released JDBC connection"); for ( ConnectionObserver observer : observers ) { observer.physicalConnectionReleased(); } @@ -369,11 +368,11 @@ public void reconnect(Connection suppliedConnection) { else if (physicalConnection != null) throw new IllegalArgumentException( "cannot reconnect to a new user-supplied connection because currently connected; must disconnect before reconnecting."); physicalConnection = suppliedConnection; - LOG.debug("Reconnected JDBC connection"); + LOG.debugf("Reconnected JDBC connection"); } else { if (suppliedConnection != null) throw new IllegalStateException("unexpected user-supplied connection"); - LOG.debug("Called reconnect() with null connection (not user-supplied)"); + LOG.debugf("Called reconnect() with null connection (not user-supplied)"); } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparer.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparer.java index dfadc05b10..936f1883c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparer.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparer.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -30,13 +29,14 @@ import java.sql.Statement; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.ScrollMode; import org.hibernate.TransactionException; import org.hibernate.cfg.Settings; import org.hibernate.engine.jdbc.internal.proxy.ProxyBuilder; import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor; import org.hibernate.engine.jdbc.spi.SQLExceptionHelper; +import org.jboss.logging.Logger; /** * Prepares statements. @@ -45,7 +45,7 @@ */ public class StatementPreparer { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, StatementPreparer.class.getName()); // TODO: Move JDBC settings into a different object... private final Settings settings; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractProxyHandler.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractProxyHandler.java index cd613e8691..c24c74c8fe 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractProxyHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractProxyHandler.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractResultSetProxyHandler.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractResultSetProxyHandler.java index c46acb67f6..13b03218f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractResultSetProxyHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractResultSetProxyHandler.java @@ -22,15 +22,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry; import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.jboss.logging.Logger; /** * Basic support for building {@link ResultSet}-based proxy handlers @@ -39,8 +39,8 @@ */ public abstract class AbstractResultSetProxyHandler extends AbstractProxyHandler { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AbstractResultSetProxyHandler.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + AbstractResultSetProxyHandler.class.getName()); private ResultSet resultSet; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractStatementProxyHandler.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractStatementProxyHandler.java index b9f4b50426..7205917db0 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractStatementProxyHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractStatementProxyHandler.java @@ -22,17 +22,17 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor; +import org.jboss.logging.Logger; /** * Basic support for building {@link Statement}-based proxy handlers @@ -41,8 +41,8 @@ */ public abstract class AbstractStatementProxyHandler extends AbstractProxyHandler { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AbstractStatementProxyHandler.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + AbstractStatementProxyHandler.class.getName()); private ConnectionProxyHandler connectionProxyHandler; private Connection connectionProxy; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/BasicStatementProxyHandler.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/BasicStatementProxyHandler.java index 834ec0b61a..39a7e65fba 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/BasicStatementProxyHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/BasicStatementProxyHandler.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - import java.lang.reflect.Method; import java.sql.Connection; import java.sql.Statement; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/CallableStatementProxyHandler.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/CallableStatementProxyHandler.java index 62af047056..9f22f908a0 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/CallableStatementProxyHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/CallableStatementProxyHandler.java @@ -22,18 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.sql.CallableStatement; import java.sql.Connection; -import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Statement; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Invocation handler for {@link java.sql.CallableStatement} proxies * @@ -41,8 +35,6 @@ */ public class CallableStatementProxyHandler extends PreparedStatementProxyHandler { - private static final Logger log = LoggerFactory.getLogger( CallableStatementProxyHandler.class ); - protected CallableStatementProxyHandler( String sql, Statement statement, @@ -51,7 +43,8 @@ protected CallableStatementProxyHandler( super( sql, statement, connectionProxyHandler, connectionProxy ); } - protected Object continueInvocation(Object proxy, Method method, Object[] args) throws Throwable { + @Override + protected Object continueInvocation(Object proxy, Method method, Object[] args) throws Throwable { if ( ! "executeQuery".equals( method.getName() ) ) { return super.continueInvocation( proxy, method, args ); // EARLY RETURN! } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ConnectionProxyHandler.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ConnectionProxyHandler.java index 86f8524d1f..545321cb76 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ConnectionProxyHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ConnectionProxyHandler.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -32,12 +31,13 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Statement; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.jdbc.spi.ConnectionObserver; import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor; import org.hibernate.stat.StatisticsImplementor; +import org.jboss.logging.Logger; /** * The {@link InvocationHandler} for intercepting messages to {@link java.sql.Connection} proxies. @@ -46,8 +46,8 @@ */ public class ConnectionProxyHandler extends AbstractProxyHandler implements InvocationHandler, ConnectionObserver { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - ConnectionProxyHandler.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + ConnectionProxyHandler.class.getName()); private LogicalConnectionImplementor logicalConnection; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/DatabaseMetaDataProxyHandler.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/DatabaseMetaDataProxyHandler.java index 4128b90973..db74b8e243 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/DatabaseMetaDataProxyHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/DatabaseMetaDataProxyHandler.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.sql.Connection; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ImplicitResultSetProxyHandler.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ImplicitResultSetProxyHandler.java index 719ce25a6f..eb5c5c4253 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ImplicitResultSetProxyHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ImplicitResultSetProxyHandler.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; - import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry; import org.hibernate.engine.jdbc.spi.JdbcServices; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ImplicitStatementProxyHandler.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ImplicitStatementProxyHandler.java index 277a7d22e0..a046ab5631 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ImplicitStatementProxyHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ImplicitStatementProxyHandler.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - import java.lang.reflect.Method; import java.sql.Connection; import java.sql.Statement; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/PreparedStatementProxyHandler.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/PreparedStatementProxyHandler.java index cc7da725a9..09b594d910 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/PreparedStatementProxyHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/PreparedStatementProxyHandler.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - import java.lang.reflect.Method; import java.sql.Connection; import java.sql.Statement; import java.util.Arrays; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; +import org.jboss.logging.Logger; /** * Invocation handler for {@link java.sql.PreparedStatement} proxies @@ -36,8 +36,8 @@ */ public class PreparedStatementProxyHandler extends AbstractStatementProxyHandler { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - PreparedStatementProxyHandler.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + PreparedStatementProxyHandler.class.getName()); private final String sql; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ProxyBuilder.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ProxyBuilder.java index de2f27592f..2680ae6484 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ProxyBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ProxyBuilder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - import java.lang.reflect.Proxy; import java.sql.CallableStatement; import java.sql.Connection; @@ -30,10 +29,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; - -import org.hibernate.Interceptor; -import org.hibernate.engine.jdbc.spi.JdbcWrapper; import org.hibernate.engine.jdbc.spi.InvalidatableWrapper; +import org.hibernate.engine.jdbc.spi.JdbcWrapper; import org.hibernate.engine.jdbc.spi.LogicalConnectionImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ResultSetProxyHandler.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ResultSetProxyHandler.java index 46d86b5bcc..5cb61f6dc8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ResultSetProxyHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ResultSetProxyHandler.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.internal.proxy; - import java.sql.ResultSet; import java.sql.Statement; - import org.hibernate.engine.jdbc.spi.JdbcResourceRegistry; import org.hibernate.engine.jdbc.spi.JdbcServices; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ConnectionManager.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ConnectionManager.java index 9e7d35fb8a..b76fcf467c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ConnectionManager.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ConnectionManager.java @@ -22,13 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.spi; - import java.io.Serializable; import java.sql.CallableStatement; import java.sql.Connection; import java.sql.PreparedStatement; -import java.sql.SQLException; - import org.hibernate.HibernateException; import org.hibernate.ScrollMode; import org.hibernate.jdbc.Expectation; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ConnectionObserver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ConnectionObserver.java index 20abcbf038..d1f5b1028e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ConnectionObserver.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ConnectionObserver.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.spi; - import java.sql.Connection; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ExtractedDatabaseMetaData.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ExtractedDatabaseMetaData.java index 2a9cda5a1d..ea9d00e2d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ExtractedDatabaseMetaData.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/ExtractedDatabaseMetaData.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.spi; - import java.util.LinkedHashSet; import java.util.Set; - import org.hibernate.internal.util.jdbc.TypeInfo; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/InvalidatableWrapper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/InvalidatableWrapper.java index 7c011be4d7..2965330d35 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/InvalidatableWrapper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/InvalidatableWrapper.java @@ -23,6 +23,7 @@ */ package org.hibernate.engine.jdbc.spi; + /** * Specialized {@link JdbcWrapper} contract for wrapped objects that can additioanlly be invalidated * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JDBCContext.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JDBCContext.java index 4e177d44a0..378cbd1b5c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JDBCContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JDBCContext.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.spi; - import java.io.Serializable; import java.sql.Connection; - import org.hibernate.ConnectionReleaseMode; import org.hibernate.HibernateException; import org.hibernate.Transaction; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcResourceRegistry.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcResourceRegistry.java index 078c6d48ec..01830a9c03 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcResourceRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcResourceRegistry.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.spi; - import java.sql.ResultSet; import java.sql.Statement; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java index 9a5747996d..fdfbe9accc 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.spi; - import java.sql.Connection; - import org.hibernate.dialect.Dialect; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.Service; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcWrapper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcWrapper.java index 0857396f77..55aa4c186e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcWrapper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcWrapper.java @@ -23,6 +23,7 @@ */ package org.hibernate.engine.jdbc.spi; + /** * Generic contract for wrapped JDBC objects. * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/LogicalConnection.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/LogicalConnection.java index 1c54e3f6aa..a0046c4720 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/LogicalConnection.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/LogicalConnection.java @@ -22,8 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.spi; - -import java.io.Serializable; import java.sql.Connection; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/LogicalConnectionImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/LogicalConnectionImplementor.java index 288554ff35..11676c709c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/LogicalConnectionImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/LogicalConnectionImplementor.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.spi; - import org.hibernate.ConnectionReleaseMode; import org.hibernate.stat.StatisticsImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionHelper.java index 61d4af90e7..c773b19888 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLExceptionHelper.java @@ -22,18 +22,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.spi; - import static org.jboss.logging.Logger.Level.ERROR; import static org.jboss.logging.Logger.Level.WARN; import java.sql.Connection; import java.sql.SQLException; import java.sql.SQLWarning; +import org.hibernate.HibernateLogger; import org.hibernate.JDBCException; -import org.hibernate.Logger; import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.exception.SQLStateConverter; import org.hibernate.exception.ViolatedConstraintNameExtracter; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Helper for handling SQLExceptions in various manners. @@ -42,8 +42,7 @@ */ public class SQLExceptionHelper { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SQLExceptionHelper.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SQLExceptionHelper.class.getName()); public static final String DEFAULT_EXCEPTION_MSG = "SQL Exception"; public static final String DEFAULT_WARNING_MSG = "SQL Warning"; @@ -130,7 +129,7 @@ public void logAndClearWarnings(Connection connection) { } catch ( SQLException sqle ) { //workaround for WebLogic - LOG.warn(LOG.unableToLogWarnings(), sqle); + LOG.unableToLogWarnings(sqle); } } try { @@ -138,7 +137,7 @@ public void logAndClearWarnings(Connection connection) { connection.clearWarnings(); } catch ( SQLException sqle ) { - LOG.debug("Could not clear warnings : " + sqle); + LOG.debugf("Could not clear warnings : %s", sqle); } } @@ -160,14 +159,9 @@ public void logWarnings(SQLWarning warning) { */ public void logWarnings(SQLWarning warning, String message) { if (LOG.isEnabled(WARN)) { - if (warning != null) LOG.debug((StringHelper.isNotEmpty(message) ? message : DEFAULT_WARNING_MSG) + " : " + warning); + if (warning != null) LOG.debugf("%s : %s", (StringHelper.isNotEmpty(message) ? message : DEFAULT_WARNING_MSG), warning); while ( warning != null ) { - StringBuffer buf = new StringBuffer( 30 ) - .append( "SQL Warning: " ) - .append( warning.getErrorCode() ) - .append( ", SQLState: " ) - .append( warning.getSQLState() ); - LOG.warn(buf.toString()); + LOG.sqlWarning(warning.getErrorCode(), warning.getSQLState()); LOG.warn(warning.getMessage()); warning = warning.getNextWarning(); } @@ -191,9 +185,9 @@ public void logExceptions(SQLException sqlException) { */ public void logExceptions(SQLException sqlException, String message) { if (LOG.isEnabled(ERROR)) { - LOG.debug((StringHelper.isNotEmpty(message) ? message : DEFAULT_EXCEPTION_MSG) + " : " + sqlException); + LOG.debugf("%s : %s", (StringHelper.isNotEmpty(message) ? message : DEFAULT_EXCEPTION_MSG), sqlException); while ( sqlException != null ) { - LOG.sqlException(sqlException.getErrorCode(), sqlException.getSQLState()); + LOG.sqlWarning(sqlException.getErrorCode(), sqlException.getSQLState()); LOG.error(sqlException.getMessage()); sqlException = sqlException.getNextException(); } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLStatementLogger.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLStatementLogger.java index e7a87cea7a..a234a84976 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLStatementLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SQLStatementLogger.java @@ -22,9 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.spi; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.jdbc.util.FormatStyle; +import org.jboss.logging.Logger; /** * Centralize logging for SQL statements. @@ -33,8 +33,7 @@ */ public class SQLStatementLogger { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SQLStatementLogger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SQLStatementLogger.class.getName()); private boolean logToStdout; private boolean format; @@ -91,7 +90,7 @@ public void setFormat(boolean format) { public void logStatement(String statement) { // for now just assume a DML log for formatting if (format && (logToStdout || LOG.isDebugEnabled())) statement = FormatStyle.BASIC.getFormatter().format(statement); - LOG.debug(statement); + LOG.debugf(statement); if (logToStdout) System.out.println("Hibernate: " + statement); } } diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java index 746c2d359e..096d3e75e8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SchemaNameResolver.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.jdbc.spi; - import java.sql.Connection; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java b/hibernate-core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java index fea4c534f2..420a895096 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine.loading; - +package org.hibernate.engine.loading; import java.io.Serializable; import java.sql.ResultSet; import java.util.ArrayList; @@ -33,7 +32,7 @@ import java.util.Set; import org.hibernate.CacheMode; import org.hibernate.EntityMode; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cache.CacheKey; import org.hibernate.cache.entry.CollectionCacheEntry; import org.hibernate.collection.PersistentCollection; @@ -44,6 +43,7 @@ import org.hibernate.engine.Status; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; +import org.jboss.logging.Logger; /** * Represents state associated with the processing of a given {@link ResultSet} @@ -57,8 +57,7 @@ */ public class CollectionLoadContext { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - CollectionLoadContext.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, CollectionLoadContext.class.getName()); private final LoadContexts loadContexts; private final ResultSet resultSet; @@ -213,19 +212,19 @@ else if ( lce.getResultSet() == resultSet && lce.getPersister() == persister ) { private void endLoadingCollections(CollectionPersister persister, List matchedCollectionEntries) { if ( matchedCollectionEntries == null ) { - LOG.debug("No collections were found in result set for role: " + persister.getRole()); + LOG.debugf("No collections were found in result set for role: %s", persister.getRole()); return; } final int count = matchedCollectionEntries.size(); - LOG.debug(count + " collections were found in result set for role: " + persister.getRole()); + LOG.debugf("%s collections were found in result set for role: %s", count, persister.getRole()); for ( int i = 0; i < count; i++ ) { LoadingCollectionEntry lce = ( LoadingCollectionEntry ) matchedCollectionEntries.get( i ); endLoadingCollection( lce, persister ); } - LOG.debug(count + " collections initialized for role: " + persister.getRole()); + LOG.debugf("%s collections initialized for role: %s", count, persister.getRole()); } private void endLoadingCollection(LoadingCollectionEntry lce, CollectionPersister persister) { @@ -253,8 +252,8 @@ private void endLoadingCollection(LoadingCollectionEntry lce, CollectionPersiste !ce.isDoremove(); // and this is not a forced initialization during flush if (addToCache) addCollectionToCache(lce, persister); - if (LOG.isDebugEnabled()) LOG.debug("Collection fully initialized: " - + MessageHelper.collectionInfoString(persister, lce.getKey(), session.getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Collection fully initialized: %s", + MessageHelper.collectionInfoString(persister, lce.getKey(), session.getFactory())); if (session.getFactory().getStatistics().isStatisticsEnabled()) session.getFactory().getStatisticsImplementor().loadCollection(persister.getRole()); } @@ -268,12 +267,12 @@ private void addCollectionToCache(LoadingCollectionEntry lce, CollectionPersiste final SessionImplementor session = getLoadContext().getPersistenceContext().getSession(); final SessionFactoryImplementor factory = session.getFactory(); - if (LOG.isDebugEnabled()) LOG.debug("Caching collection: " - + MessageHelper.collectionInfoString(persister, lce.getKey(), factory)); + if (LOG.isDebugEnabled()) LOG.debugf("Caching collection: %s", + MessageHelper.collectionInfoString(persister, lce.getKey(), factory)); if ( !session.getEnabledFilters().isEmpty() && persister.isAffectedByEnabledFilters( session ) ) { // some filters affecting the collection are enabled on the session, so do not do the put into the cache. - LOG.debug("Refusing to add to cache due to enabled filters"); + LOG.debugf("Refusing to add to cache due to enabled filters"); // todo : add the notion of enabled filters to the CacheKey to differentiate filtered collections from non-filtered; // but CacheKey is currently used for both collections and entities; would ideally need to define two seperate ones; // currently this works in conjuction with the check on diff --git a/hibernate-core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java b/hibernate-core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java index c11dcdee8c..24199806aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine.loading; - +package org.hibernate.engine.loading; import java.sql.ResultSet; import java.util.ArrayList; import java.util.List; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; +import org.jboss.logging.Logger; /** * {@inheritDoc} @@ -36,8 +36,7 @@ */ public class EntityLoadContext { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - EntityLoadContext.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, EntityLoadContext.class.getName()); private final LoadContexts loadContexts; private final ResultSet resultSet; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/loading/LoadContexts.java b/hibernate-core/src/main/java/org/hibernate/engine/loading/LoadContexts.java index 3767985e14..0cf22039a4 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/loading/LoadContexts.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/loading/LoadContexts.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine.loading; - +package org.hibernate.engine.loading; import java.io.Serializable; import java.sql.ResultSet; import java.util.HashMap; @@ -31,7 +30,7 @@ import java.util.Map; import java.util.Set; import org.hibernate.EntityMode; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.CollectionKey; import org.hibernate.engine.PersistenceContext; @@ -39,6 +38,7 @@ import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.util.IdentityMap; +import org.jboss.logging.Logger; /** * Maps {@link ResultSet result-sets} to specific contextual data @@ -58,8 +58,7 @@ */ public class LoadContexts { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - LoadContexts.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, LoadContexts.class.getName()); private final PersistenceContext persistenceContext; private Map collectionLoadContexts; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/loading/LoadingCollectionEntry.java b/hibernate-core/src/main/java/org/hibernate/engine/loading/LoadingCollectionEntry.java index 60ec29beaf..99fba4ee9c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/loading/LoadingCollectionEntry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/loading/LoadingCollectionEntry.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine.loading; - +package org.hibernate.engine.loading; import java.io.Serializable; import java.sql.ResultSet; - import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/profile/Association.java b/hibernate-core/src/main/java/org/hibernate/engine/profile/Association.java index fe91e41d70..e0b80e891d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/profile/Association.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/profile/Association.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.profile; - import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/profile/Fetch.java b/hibernate-core/src/main/java/org/hibernate/engine/profile/Fetch.java index 428c92520a..423c78126a 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/profile/Fetch.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/profile/Fetch.java @@ -23,6 +23,7 @@ */ package org.hibernate.engine.profile; + /** * Models an individual fetch within a profile. * diff --git a/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java b/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java index e69afddea6..c59ebccaf8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java @@ -22,13 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.profile; - import java.util.HashMap; import java.util.Map; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.type.BagType; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * A 'fetch profile' allows a user to dynamically modify the fetching strategy used for particular associations at @@ -40,8 +40,7 @@ */ public class FetchProfile { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - FetchProfile.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, FetchProfile.class.getName()); private final String name; private Map fetches = new HashMap(); diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/FilterQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/engine/query/FilterQueryPlan.java index 3ca143b16a..ba5a7e7f9c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/FilterQueryPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/FilterQueryPlan.java @@ -23,11 +23,9 @@ * */ package org.hibernate.engine.query; - -import org.hibernate.engine.SessionFactoryImplementor; - import java.io.Serializable; import java.util.Map; +import org.hibernate.engine.SessionFactoryImplementor; /** * Extends an HQLQueryPlan to maintain a reference to the collection-role name diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java index c152d7fbfa..b8b8ffb994 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine.query; - import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; @@ -33,7 +32,7 @@ import java.util.Map; import java.util.Set; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.QueryException; import org.hibernate.ScrollableResults; import org.hibernate.engine.QueryParameters; @@ -50,6 +49,7 @@ import org.hibernate.util.EmptyIterator; import org.hibernate.util.IdentitySet; import org.hibernate.util.JoinedIterator; +import org.jboss.logging.Logger; /** * Defines a query execution plan for an HQL query (or filter). @@ -60,8 +60,7 @@ public class HQLQueryPlan implements Serializable { // TODO : keep separate notions of QT[] here for shallow/non-shallow queries... - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - HQLQueryPlan.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, HQLQueryPlan.class.getName()); private final String sourceQuery; private final QueryTranslator[] translators; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/NamedParameterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/engine/query/NamedParameterDescriptor.java index 132410b275..ec862601ff 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/NamedParameterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/NamedParameterDescriptor.java @@ -23,10 +23,8 @@ * */ package org.hibernate.engine.query; - -import org.hibernate.type.Type; - import java.io.Serializable; +import org.hibernate.type.Type; /** * Descriptor regarding a named parameter. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java index d74d74b3d5..7b18c2bd51 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine.query; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -31,7 +30,7 @@ import java.util.List; import java.util.Map; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.QueryException; import org.hibernate.action.BulkOperationCleanupAction; import org.hibernate.engine.QueryParameters; @@ -43,6 +42,7 @@ import org.hibernate.loader.custom.sql.SQLCustomQuery; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; +import org.jboss.logging.Logger; /** * Defines a query execution plan for a native-SQL query. @@ -54,8 +54,7 @@ public class NativeSQLQueryPlan implements Serializable { private final SQLCustomQuery customQuery; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - NativeSQLQueryPlan.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, NativeSQLQueryPlan.class.getName()); public NativeSQLQueryPlan( NativeSQLQuerySpecification specification, @@ -153,7 +152,7 @@ private int bindNamedParameters( TypedValue typedval = (TypedValue) e.getValue(); int[] locs = getNamedParameterLocs( name ); for (int i = 0; i < locs.length; i++) { - LOG.debug("bindNamedParameters() " + typedval.getValue() + " -> " + name + " [" + (locs[i] + start) + "]"); + LOG.debugf("bindNamedParameters() %s -> %s [%s]", typedval.getValue(), name, locs[i] + start); typedval.getType().nullSafeSet( ps, typedval.getValue(), locs[i] + start, session ); } @@ -161,9 +160,7 @@ private int bindNamedParameters( } return result; } - else { - return 0; - } + return 0; } protected void coordinateSharedCacheCleanup(SessionImplementor session) { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/OrdinalParameterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/engine/query/OrdinalParameterDescriptor.java index 234fbf731e..4b10e21838 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/OrdinalParameterDescriptor.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/OrdinalParameterDescriptor.java @@ -23,10 +23,8 @@ * */ package org.hibernate.engine.query; - -import org.hibernate.type.Type; - import java.io.Serializable; +import org.hibernate.type.Type; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/ParamLocationRecognizer.java b/hibernate-core/src/main/java/org/hibernate/engine/query/ParamLocationRecognizer.java index 659c168dca..e24963d726 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/ParamLocationRecognizer.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/ParamLocationRecognizer.java @@ -23,13 +23,11 @@ * */ package org.hibernate.engine.query; - -import org.hibernate.util.ArrayHelper; - -import java.util.Map; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.ArrayList; +import java.util.Map; +import org.hibernate.util.ArrayHelper; /** * Implements a parameter parser recognizer specifically for the purpose diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterMetadata.java b/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterMetadata.java index 81652165ea..ce0b59c865 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterMetadata.java @@ -23,12 +23,10 @@ * */ package org.hibernate.engine.query; - import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.Set; - import org.hibernate.QueryParameterException; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterParser.java b/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterParser.java index 647c4d1edf..134a282687 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterParser.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/ParameterParser.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine.query; - import org.hibernate.QueryException; import org.hibernate.hql.classic.ParserHelper; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/QueryMetadata.java b/hibernate-core/src/main/java/org/hibernate/engine/query/QueryMetadata.java index 723d89c46d..84ab79844f 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/QueryMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/QueryMetadata.java @@ -23,11 +23,9 @@ * */ package org.hibernate.engine.query; - -import org.hibernate.type.Type; - import java.io.Serializable; import java.util.Set; +import org.hibernate.type.Type; /** * Defines metadata regarding a translated HQL or native-SQL query. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java b/hibernate-core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java index 29677dbd25..41b4ec76c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.query; - import java.io.Serializable; import java.util.Collection; import java.util.Collections; @@ -31,7 +30,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.cfg.Environment; @@ -42,6 +41,7 @@ import org.hibernate.util.CollectionHelper; import org.hibernate.util.SimpleMRUCache; import org.hibernate.util.SoftLimitMRUCache; +import org.jboss.logging.Logger; /** * Acts as a cache for compiled query plans, as well as query-parameter metadata. @@ -53,8 +53,7 @@ */ public class QueryPlanCache implements Serializable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - QueryPlanCache.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, QueryPlanCache.class.getName()); private SessionFactoryImplementor factory; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/ReturnMetadata.java b/hibernate-core/src/main/java/org/hibernate/engine/query/ReturnMetadata.java index 6126c0b248..e92b62d77c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/ReturnMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/ReturnMetadata.java @@ -23,10 +23,8 @@ * */ package org.hibernate.engine.query; - -import org.hibernate.type.Type; - import java.io.Serializable; +import org.hibernate.type.Type; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryCollectionReturn.java b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryCollectionReturn.java index 89c55ca0eb..56a0092863 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryCollectionReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryCollectionReturn.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine.query.sql; - +package org.hibernate.engine.query.sql; import java.util.Map; - import org.hibernate.LockMode; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryJoinReturn.java b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryJoinReturn.java index eaa950267c..bddb0c60a6 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryJoinReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryJoinReturn.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine.query.sql; - +package org.hibernate.engine.query.sql; import java.util.Map; - import org.hibernate.LockMode; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryNonScalarReturn.java b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryNonScalarReturn.java index 220d2a6784..9b58f35ec9 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryNonScalarReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryNonScalarReturn.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine.query.sql; - +package org.hibernate.engine.query.sql; import java.io.Serializable; import java.util.Collections; import java.util.HashMap; import java.util.Map; - import org.hibernate.HibernateException; import org.hibernate.LockMode; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryReturn.java b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryReturn.java index 9a5b54c64b..4f0b3f0932 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryReturn.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine.query.sql; +package org.hibernate.engine.query.sql; + /** * Describes a return in a native SQL query. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryRootReturn.java b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryRootReturn.java index 87e15636c8..22b9a2a873 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryRootReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryRootReturn.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine.query.sql; - +package org.hibernate.engine.query.sql; import java.util.Map; - import org.hibernate.LockMode; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryScalarReturn.java b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryScalarReturn.java index 1ba109c533..c2917181b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryScalarReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQueryScalarReturn.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine.query.sql; - +package org.hibernate.engine.query.sql; import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQuerySpecification.java b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQuerySpecification.java index 74fc56bf42..48e45b44af 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQuerySpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/query/sql/NativeSQLQuerySpecification.java @@ -22,15 +22,13 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.engine.query.sql; - -import org.hibernate.util.ArrayHelper; - -import java.util.Set; -import java.util.Collection; -import java.util.HashSet; +package org.hibernate.engine.query.sql; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import org.hibernate.util.ArrayHelper; /** * Defines the specification or blue-print for a native-sql query. diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/IsolatedWork.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/IsolatedWork.java index 94269d99f4..ad34d6930b 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/IsolatedWork.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/IsolatedWork.java @@ -23,10 +23,8 @@ * */ package org.hibernate.engine.transaction; - -import org.hibernate.HibernateException; - import java.sql.Connection; +import org.hibernate.HibernateException; /** * Represents work that needs to be performed in a manner diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/Isolater.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/Isolater.java index 7002e0e8b1..b988cf6f9c 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/Isolater.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/Isolater.java @@ -23,7 +23,6 @@ * */ package org.hibernate.engine.transaction; - import java.sql.Connection; import java.sql.SQLException; import javax.transaction.NotSupportedException; @@ -31,9 +30,10 @@ import javax.transaction.Transaction; import javax.transaction.TransactionManager; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.jdbc.spi.SQLExceptionHelper; +import org.jboss.logging.Logger; /** * Class which provides the isolation semantics required by @@ -48,7 +48,7 @@ */ public class Isolater { - static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Isolater.class.getPackage().getName()); + static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Isolater.class.getName()); /** * Ensures that all processing actually performed by the given work will @@ -112,7 +112,7 @@ public void delegateWork(IsolatedWork work, boolean transacted) throws Hibernate try { // First we suspend any current JTA transaction Transaction surroundingTransaction = transactionManager.suspend(); - LOG.debug("Surrounding JTA transaction suspended [" + surroundingTransaction + "]"); + LOG.debugf("Surrounding JTA transaction suspended [%s]", surroundingTransaction); boolean hadProblems = false; try { @@ -131,7 +131,7 @@ public void delegateWork(IsolatedWork work, boolean transacted) throws Hibernate finally { try { transactionManager.resume( surroundingTransaction ); - LOG.debug("Surrounding JTA transaction resumed [" + surroundingTransaction + "]"); + LOG.debugf("Surrounding JTA transaction resumed [%s]", surroundingTransaction); } catch( Throwable t ) { // if the actually work had an error use that, otherwise error based on t @@ -273,7 +273,7 @@ else if ( e instanceof SQLException ) { connection.setAutoCommit( true ); } catch( Exception ignore ) { - LOG.unableToResetConnectionToAutoCommit(); + LOG.trace("Unable to reset connection back to auto-commit"); } } try { diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/NullSynchronizationException.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/NullSynchronizationException.java index 083ba68072..2533a7111f 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/NullSynchronizationException.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/NullSynchronizationException.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.transaction; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/engine/transaction/SynchronizationRegistry.java b/hibernate-core/src/main/java/org/hibernate/engine/transaction/SynchronizationRegistry.java index 496ede391a..8ccc0d81ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/transaction/SynchronizationRegistry.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/transaction/SynchronizationRegistry.java @@ -22,11 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.engine.transaction; - import java.util.LinkedHashSet; import javax.transaction.Synchronization; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; +import org.jboss.logging.Logger; /** * Manages a registry of {@link Synchronization Synchronizations}. @@ -35,8 +35,8 @@ */ public class SynchronizationRegistry { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SynchronizationRegistry.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + SynchronizationRegistry.class.getName()); private LinkedHashSet synchronizations; diff --git a/hibernate-core/src/main/java/org/hibernate/event/AbstractCollectionEvent.java b/hibernate-core/src/main/java/org/hibernate/event/AbstractCollectionEvent.java index ca74fde99e..becb484e3a 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/AbstractCollectionEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/AbstractCollectionEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.CollectionEntry; import org.hibernate.engine.EntityEntry; diff --git a/hibernate-core/src/main/java/org/hibernate/event/AbstractEvent.java b/hibernate-core/src/main/java/org/hibernate/event/AbstractEvent.java index 1eeba303c2..a966aebae5 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/AbstractEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/AbstractEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; diff --git a/hibernate-core/src/main/java/org/hibernate/event/AbstractPreDatabaseOperationEvent.java b/hibernate-core/src/main/java/org/hibernate/event/AbstractPreDatabaseOperationEvent.java index 20a9bc22f6..6310228352 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/AbstractPreDatabaseOperationEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/AbstractPreDatabaseOperationEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/AutoFlushEvent.java b/hibernate-core/src/main/java/org/hibernate/event/AutoFlushEvent.java index 219424fdce..79c8716639 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/AutoFlushEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/AutoFlushEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.util.Set; diff --git a/hibernate-core/src/main/java/org/hibernate/event/AutoFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/AutoFlushEventListener.java index 7c6f1f5bcc..1caee5c5f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/AutoFlushEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/AutoFlushEventListener.java @@ -23,10 +23,8 @@ * */ package org.hibernate.event; - -import org.hibernate.HibernateException; - import java.io.Serializable; +import org.hibernate.HibernateException; /** * Defines the contract for handling of session auto-flush events. diff --git a/hibernate-core/src/main/java/org/hibernate/event/DeleteEvent.java b/hibernate-core/src/main/java/org/hibernate/event/DeleteEvent.java index bba6332235..2f1bc384ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/DeleteEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/DeleteEvent.java @@ -25,6 +25,7 @@ package org.hibernate.event; + /** Defines an event class for the deletion of an entity. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/event/DeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/DeleteEventListener.java index 9666feb6ca..c1d92f0819 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/DeleteEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/DeleteEventListener.java @@ -23,11 +23,9 @@ * */ package org.hibernate.event; - -import org.hibernate.HibernateException; - import java.io.Serializable; import java.util.Set; +import org.hibernate.HibernateException; /** * Defines the contract for handling of deletion events generated from a session. diff --git a/hibernate-core/src/main/java/org/hibernate/event/Destructible.java b/hibernate-core/src/main/java/org/hibernate/event/Destructible.java index 73c8d36532..48b3b333e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/Destructible.java +++ b/hibernate-core/src/main/java/org/hibernate/event/Destructible.java @@ -24,6 +24,7 @@ */ package org.hibernate.event; + /** * Contract for listeners which require notification of SessionFactory closing, * presumably to destroy internal state. diff --git a/hibernate-core/src/main/java/org/hibernate/event/DirtyCheckEvent.java b/hibernate-core/src/main/java/org/hibernate/event/DirtyCheckEvent.java index f825ac4a7e..9546338516 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/DirtyCheckEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/DirtyCheckEvent.java @@ -25,6 +25,7 @@ package org.hibernate.event; + /** Defines an event class for the dirty-checking of a session. * * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/event/DirtyCheckEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/DirtyCheckEventListener.java index 6c2c8420f0..6add586137 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/DirtyCheckEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/DirtyCheckEventListener.java @@ -23,10 +23,8 @@ * */ package org.hibernate.event; - -import org.hibernate.HibernateException; - import java.io.Serializable; +import org.hibernate.HibernateException; /** * Defines the contract for handling of session dirty-check events. diff --git a/hibernate-core/src/main/java/org/hibernate/event/EventListeners.java b/hibernate-core/src/main/java/org/hibernate/event/EventListeners.java index c2757146b7..006b9227b5 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/EventListeners.java +++ b/hibernate-core/src/main/java/org/hibernate/event/EventListeners.java @@ -23,15 +23,13 @@ * */ package org.hibernate.event; - import java.io.Serializable; import java.lang.reflect.Field; import java.util.Collections; import java.util.HashMap; import java.util.Map; - -import org.hibernate.MappingException; import org.hibernate.HibernateException; +import org.hibernate.MappingException; import org.hibernate.cfg.Configuration; import org.hibernate.event.def.DefaultAutoFlushEventListener; import org.hibernate.event.def.DefaultDeleteEventListener; @@ -44,6 +42,7 @@ import org.hibernate.event.def.DefaultLockEventListener; import org.hibernate.event.def.DefaultMergeEventListener; import org.hibernate.event.def.DefaultPersistEventListener; +import org.hibernate.event.def.DefaultPersistOnFlushEventListener; import org.hibernate.event.def.DefaultPostLoadEventListener; import org.hibernate.event.def.DefaultPreLoadEventListener; import org.hibernate.event.def.DefaultRefreshEventListener; @@ -52,7 +51,6 @@ import org.hibernate.event.def.DefaultSaveOrUpdateCopyEventListener; import org.hibernate.event.def.DefaultSaveOrUpdateEventListener; import org.hibernate.event.def.DefaultUpdateEventListener; -import org.hibernate.event.def.DefaultPersistOnFlushEventListener; import org.hibernate.util.Cloneable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/EventSource.java b/hibernate-core/src/main/java/org/hibernate/event/EventSource.java index 84fbe1defb..2e1341474d 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/EventSource.java +++ b/hibernate-core/src/main/java/org/hibernate/event/EventSource.java @@ -23,11 +23,9 @@ * */ package org.hibernate.event; - import java.io.Serializable; import java.util.Map; import java.util.Set; - import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.engine.ActionQueue; diff --git a/hibernate-core/src/main/java/org/hibernate/event/EvictEvent.java b/hibernate-core/src/main/java/org/hibernate/event/EvictEvent.java index 842caf13ff..c834d5a2ca 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/EvictEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/EvictEvent.java @@ -25,6 +25,7 @@ package org.hibernate.event; + /** * Defines an event class for the evicting of an entity. * diff --git a/hibernate-core/src/main/java/org/hibernate/event/EvictEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/EvictEventListener.java index 1b9f66a76d..ed3ec869de 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/EvictEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/EvictEventListener.java @@ -23,10 +23,8 @@ * */ package org.hibernate.event; - -import org.hibernate.HibernateException; - import java.io.Serializable; +import org.hibernate.HibernateException; /** * Defines the contract for handling of evict events generated from a session. diff --git a/hibernate-core/src/main/java/org/hibernate/event/FlushEntityEvent.java b/hibernate-core/src/main/java/org/hibernate/event/FlushEntityEvent.java index 3d333294db..dcf6cda621 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/FlushEntityEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/FlushEntityEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.engine.EntityEntry; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/FlushEntityEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/FlushEntityEventListener.java index 9d119496c9..781d01f46a 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/FlushEntityEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/FlushEntityEventListener.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/FlushEvent.java b/hibernate-core/src/main/java/org/hibernate/event/FlushEvent.java index cb2d672424..66150993c2 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/FlushEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/FlushEvent.java @@ -25,6 +25,7 @@ package org.hibernate.event; + /** * Defines an event class for the flushing of a session. * diff --git a/hibernate-core/src/main/java/org/hibernate/event/FlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/FlushEventListener.java index b4b58c7f30..cab03e2116 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/FlushEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/FlushEventListener.java @@ -23,10 +23,8 @@ * */ package org.hibernate.event; - -import org.hibernate.HibernateException; - import java.io.Serializable; +import org.hibernate.HibernateException; /** * Defines the contract for handling of session flush events. diff --git a/hibernate-core/src/main/java/org/hibernate/event/Initializable.java b/hibernate-core/src/main/java/org/hibernate/event/Initializable.java index 49c056910b..1f77bdfeda 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/Initializable.java +++ b/hibernate-core/src/main/java/org/hibernate/event/Initializable.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.cfg.Configuration; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/InitializeCollectionEvent.java b/hibernate-core/src/main/java/org/hibernate/event/InitializeCollectionEvent.java index 2d0a0ffd9e..b95f52476c 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/InitializeCollectionEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/InitializeCollectionEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.collection.PersistentCollection; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/InitializeCollectionEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/InitializeCollectionEventListener.java index d2f26b7098..cd1c4d6560 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/InitializeCollectionEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/InitializeCollectionEventListener.java @@ -23,10 +23,8 @@ * */ package org.hibernate.event; - -import org.hibernate.HibernateException; - import java.io.Serializable; +import org.hibernate.HibernateException; /** * Defines the contract for handling of collection initialization events diff --git a/hibernate-core/src/main/java/org/hibernate/event/LoadEvent.java b/hibernate-core/src/main/java/org/hibernate/event/LoadEvent.java index 78769b769a..9fa403e2c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/LoadEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/LoadEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/event/LoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/LoadEventListener.java index a724f5e6aa..c8476b4e33 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/LoadEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/LoadEventListener.java @@ -23,10 +23,8 @@ * */ package org.hibernate.event; - -import org.hibernate.HibernateException; - import java.io.Serializable; +import org.hibernate.HibernateException; /** * Defines the contract for handling of load events generated from a session. diff --git a/hibernate-core/src/main/java/org/hibernate/event/LockEvent.java b/hibernate-core/src/main/java/org/hibernate/event/LockEvent.java index 677093f7e2..526802265f 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/LockEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/LockEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/event/LockEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/LockEventListener.java index f0eac6221a..ee9868bb61 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/LockEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/LockEventListener.java @@ -23,10 +23,8 @@ * */ package org.hibernate.event; - -import org.hibernate.HibernateException; - import java.io.Serializable; +import org.hibernate.HibernateException; /** * Defines the contract for handling of lock events generated from a session. diff --git a/hibernate-core/src/main/java/org/hibernate/event/MergeEvent.java b/hibernate-core/src/main/java/org/hibernate/event/MergeEvent.java index 2f62d56790..f021228a70 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/MergeEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/MergeEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/MergeEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/MergeEventListener.java index c71360a4a8..a892e03830 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/MergeEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/MergeEventListener.java @@ -23,10 +23,8 @@ * */ package org.hibernate.event; - import java.io.Serializable; import java.util.Map; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PersistEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PersistEvent.java index 62ff4be821..c94059c148 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PersistEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PersistEvent.java @@ -24,6 +24,7 @@ */ package org.hibernate.event; + /** * An event class for persist() * diff --git a/hibernate-core/src/main/java/org/hibernate/event/PersistEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PersistEventListener.java index 9529899076..0afbe3a28f 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PersistEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PersistEventListener.java @@ -23,10 +23,8 @@ * */ package org.hibernate.event; - import java.io.Serializable; import java.util.Map; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRecreateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRecreateEvent.java index 60f54c8b64..ea478886f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRecreateEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRecreateEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRecreateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRecreateEventListener.java index dd4d22392a..ef205473c1 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRecreateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRecreateEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRemoveEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRemoveEvent.java index 3336d2efa4..c5de3a86c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRemoveEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRemoveEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRemoveEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRemoveEventListener.java index 82929f15cb..2e4827a1a8 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRemoveEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionRemoveEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionUpdateEvent.java index a7ce71d93c..0c1a974b84 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionUpdateEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionUpdateEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionUpdateEventListener.java index aa6c194e4b..7990faefc5 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PostCollectionUpdateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostCollectionUpdateEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostDeleteEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PostDeleteEvent.java index 250809bd1e..c34c71047a 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PostDeleteEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostDeleteEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostDeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PostDeleteEventListener.java index 06cf677130..f56e26f0b9 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PostDeleteEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostDeleteEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostInsertEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PostInsertEvent.java index 7d76118052..0e4342adc7 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PostInsertEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostInsertEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostInsertEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PostInsertEventListener.java index de6a65b5fe..b2f5079a3c 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PostInsertEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostInsertEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostLoadEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PostLoadEvent.java index fa408ddbe9..df6019d562 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PostLoadEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostLoadEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PostLoadEventListener.java index 04a7d92add..d52a8ba76b 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PostLoadEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostLoadEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PostUpdateEvent.java index 139832b81e..52b4d5f832 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PostUpdateEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostUpdateEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PostUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PostUpdateEventListener.java index 235721e52a..36be83c69e 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PostUpdateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PostUpdateEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRecreateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRecreateEvent.java index 09bb0694b9..92e2bbfb7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRecreateEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRecreateEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRecreateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRecreateEventListener.java index 5812b8bd18..6af38c2c7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRecreateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRecreateEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRemoveEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRemoveEvent.java index 932f45a914..de0ec6115a 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRemoveEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRemoveEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRemoveEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRemoveEventListener.java index 72b379a6dd..77d87bb9a5 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRemoveEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionRemoveEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionUpdateEvent.java index 2bd1459b4a..fc3f964b72 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionUpdateEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionUpdateEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.collection.PersistentCollection; import org.hibernate.persister.collection.CollectionPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionUpdateEventListener.java index b1d3585403..e0748bbf3a 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/PreCollectionUpdateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreCollectionUpdateEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreDeleteEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PreDeleteEvent.java index d543712a1b..ce938ea98e 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PreDeleteEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreDeleteEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreDeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PreDeleteEventListener.java index 116ae74a77..5885838df6 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PreDeleteEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreDeleteEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreInsertEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PreInsertEvent.java index 5dd3edf95a..ad92f5858d 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PreInsertEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreInsertEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreInsertEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PreInsertEventListener.java index 292dd6062b..9403665b98 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PreInsertEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreInsertEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreLoadEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PreLoadEvent.java index bef93ffc2d..f11a42c236 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PreLoadEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreLoadEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PreLoadEventListener.java index 78d095d098..a4289de869 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PreLoadEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreLoadEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/PreUpdateEvent.java index 0e9eb7425b..3a546b9b79 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PreUpdateEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreUpdateEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/PreUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/PreUpdateEventListener.java index fe423ef422..4991f3af96 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/PreUpdateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/PreUpdateEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/RefreshEvent.java b/hibernate-core/src/main/java/org/hibernate/event/RefreshEvent.java index 5fcb0a3e76..7af132aaa6 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/RefreshEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/RefreshEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/event/RefreshEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/RefreshEventListener.java index a482c20edb..7de7d75166 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/RefreshEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/RefreshEventListener.java @@ -23,11 +23,9 @@ * */ package org.hibernate.event; - -import org.hibernate.HibernateException; - import java.io.Serializable; import java.util.Map; +import org.hibernate.HibernateException; /** * Defines the contract for handling of refresh events generated from a session. diff --git a/hibernate-core/src/main/java/org/hibernate/event/ReplicateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/ReplicateEvent.java index 99ada3417c..0341c60de9 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/ReplicateEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/ReplicateEvent.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event; - import org.hibernate.ReplicationMode; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/ReplicateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/ReplicateEventListener.java index 351c871560..8a60167a62 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/ReplicateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/ReplicateEventListener.java @@ -23,10 +23,8 @@ * */ package org.hibernate.event; - -import org.hibernate.HibernateException; - import java.io.Serializable; +import org.hibernate.HibernateException; /** * Defines the contract for handling of replicate events generated from a session. diff --git a/hibernate-core/src/main/java/org/hibernate/event/SaveOrUpdateEvent.java b/hibernate-core/src/main/java/org/hibernate/event/SaveOrUpdateEvent.java index 71f8929e25..c61137e777 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/SaveOrUpdateEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/SaveOrUpdateEvent.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.engine.EntityEntry; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/SaveOrUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/SaveOrUpdateEventListener.java index 45c3e1870a..d1e8e89e2e 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/SaveOrUpdateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/SaveOrUpdateEventListener.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event; - import java.io.Serializable; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java index 5b7fc7da9c..3902d3a508 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java @@ -23,13 +23,12 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; import java.util.Iterator; import java.util.List; import java.util.Map; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.action.CollectionRecreateAction; import org.hibernate.action.CollectionRemoveAction; import org.hibernate.action.CollectionUpdateAction; @@ -52,6 +51,7 @@ import org.hibernate.pretty.Printer; import org.hibernate.util.IdentityMap; import org.hibernate.util.LazyIterator; +import org.jboss.logging.Logger; /** * A convenience base class for listeners whose functionality results in flushing. @@ -60,8 +60,8 @@ */ public abstract class AbstractFlushingEventListener implements Serializable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AbstractFlushingEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + AbstractFlushingEventListener.class.getName()); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Pre-flushing section @@ -104,13 +104,16 @@ protected void flushEverythingToExecutions(FlushEvent event) throws HibernateExc //some statistics if (LOG.isDebugEnabled()) { - LOG.debug("Flushed: " + session.getActionQueue().numberOfInsertions() + " insertions, " - + session.getActionQueue().numberOfUpdates() + " updates, " + session.getActionQueue().numberOfDeletions() - + " deletions to " + persistenceContext.getEntityEntries().size() + " objects"); - LOG.debug("Flushed: " + session.getActionQueue().numberOfCollectionCreations() + " (re)creations, " - + session.getActionQueue().numberOfCollectionUpdates() + " updates, " - + session.getActionQueue().numberOfCollectionRemovals() + " removals to " - + persistenceContext.getCollectionEntries().size() + " collections"); + LOG.debugf("Flushed: %s insertions, %s updates, %s deletions to %s objects", + session.getActionQueue().numberOfInsertions(), + session.getActionQueue().numberOfUpdates(), + session.getActionQueue().numberOfDeletions(), + persistenceContext.getEntityEntries().size()); + LOG.debugf("Flushed: %s (re)creations, %s updates, %s removals to %s collections", + session.getActionQueue().numberOfCollectionCreations(), + session.getActionQueue().numberOfCollectionUpdates(), + session.getActionQueue().numberOfCollectionRemovals(), + persistenceContext.getCollectionEntries().size()); new Printer( session.getFactory() ).toString( persistenceContext.getEntitiesByKey().values().iterator(), session.getEntityMode() @@ -125,7 +128,7 @@ protected void flushEverythingToExecutions(FlushEvent event) throws HibernateExc */ private void prepareEntityFlushes(EventSource session) throws HibernateException { - LOG.debug("Processing flush-time cascades"); + LOG.debugf("Processing flush-time cascades"); final Map.Entry[] list = IdentityMap.concurrentEntries( session.getPersistenceContext().getEntityEntries() ); //safe from concurrent modification because of how entryList() is implemented on IdentityMap @@ -168,7 +171,7 @@ private void prepareCollectionFlushes(SessionImplementor session) throws Hiberna // Initialize dirty flags for arrays + collections with composite elements // and reset reached, doupdate, etc. - LOG.debug("Dirty checking collections"); + LOG.debugf("Dirty checking collections"); final List list = IdentityMap.entries( session.getPersistenceContext().getCollectionEntries() ); final int size = list.size(); diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java index 7b759c41e2..5c696225be 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java @@ -23,10 +23,9 @@ * */ package org.hibernate.event.def; - +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.Logger; import org.hibernate.ObjectDeletedException; import org.hibernate.cache.CacheKey; import org.hibernate.cache.access.SoftLock; @@ -35,6 +34,7 @@ import org.hibernate.event.EventSource; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; +import org.jboss.logging.Logger; /** * A convenience base class for listeners that respond to requests to perform a @@ -44,8 +44,8 @@ */ public class AbstractLockUpgradeEventListener extends AbstractReassociateEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AbstractLockUpgradeEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + AbstractLockUpgradeEventListener.class.getName()); /** * Performs a pessimistic lock upgrade on a given entity, if needed. diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java index 80e0043670..c257cb8e06 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.event.def; - import java.io.Serializable; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.engine.EntityEntry; import org.hibernate.engine.EntityKey; import org.hibernate.engine.Status; @@ -35,6 +34,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.TypeHelper; +import org.jboss.logging.Logger; /** * A convenience base class for listeners that respond to requests to reassociate an entity @@ -44,8 +44,8 @@ */ public class AbstractReassociateEventListener implements Serializable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AbstractReassociateEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + AbstractReassociateEventListener.class.getName()); /** * Associates a given entity (either transient or associated with another session) to diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java index 66308d8767..0a30f271a3 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.event.def; - import java.io.Serializable; import java.util.Map; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.NonUniqueObjectException; import org.hibernate.action.EntityIdentityInsertAction; import org.hibernate.action.EntityInsertAction; @@ -50,6 +49,7 @@ import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; import org.hibernate.type.TypeHelper; +import org.jboss.logging.Logger; /** * A convenience bas class for listeners responding to save events. @@ -63,8 +63,8 @@ public abstract class AbstractSaveEventListener extends AbstractReassociateEvent protected static final int DETACHED = 2; protected static final int DELETED = 3; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AbstractSaveEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + AbstractSaveEventListener.class.getName()); /** * Prepares the save call using the given requested id. @@ -128,9 +128,9 @@ else if ( generatedId == IdentifierGeneratorHelper.POST_INSERT_INDICATOR ) { } else { // TODO: define toString()s for generators - if (LOG.isDebugEnabled()) LOG.debug("Generated identifier: " - + persister.getIdentifierType().toLoggableString(generatedId, source.getFactory()) - + ", using strategy: " + persister.getIdentifierGenerator().getClass().getName()); + if (LOG.isDebugEnabled()) LOG.debugf("Generated identifier: %s, using strategy: %s", + persister.getIdentifierType().toLoggableString(generatedId, source.getFactory()), + persister.getIdentifierGenerator().getClass().getName()); return performSave( entity, generatedId, persister, false, anything, source, true ); } @@ -202,9 +202,9 @@ protected boolean invokeSaveLifecycle(Object entity, EntityPersister persister, // Sub-insertions should occur before containing insertion so // Try to do the callback now if ( persister.implementsLifecycle( source.getEntityMode() ) ) { - LOG.debug("Calling onSave()"); + LOG.debugf("Calling onSave()"); if ( ( ( Lifecycle ) entity ).onSave( source ) ) { - LOG.debug("Insertion vetoed by onSave()"); + LOG.debugf("Insertion vetoed by onSave()"); return true; } } @@ -303,14 +303,14 @@ protected Serializable performSaveOrReplicate( values, entity, persister, source, shouldDelayIdentityInserts ); if ( !shouldDelayIdentityInserts ) { - LOG.debug("Executing identity-insert immediately"); + LOG.debugf("Executing identity-insert immediately"); source.getActionQueue().execute( insert ); id = insert.getGeneratedId(); key = new EntityKey( id, persister, source.getEntityMode() ); source.getPersistenceContext().checkUniqueness( key, entity ); } else { - LOG.debug("Delaying identity-insert due to no transaction in progress"); + LOG.debugf("Delaying identity-insert due to no transaction in progress"); source.getActionQueue().addAction( insert ); key = insert.getDelayedEntityKey(); } diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/AbstractVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/def/AbstractVisitor.java index b870ac957f..1d8f8e2141 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/AbstractVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/AbstractVisitor.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.event.def; - import org.hibernate.HibernateException; import org.hibernate.event.EventSource; import org.hibernate.intercept.LazyPropertyInitializer; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java index 866d07f0b7..a09dee0b84 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java @@ -23,13 +23,13 @@ * */ package org.hibernate.event.def; - import org.hibernate.FlushMode; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.event.AutoFlushEvent; import org.hibernate.event.AutoFlushEventListener; import org.hibernate.event.EventSource; +import org.jboss.logging.Logger; /** * Defines the default flush event listeners used by hibernate for @@ -39,8 +39,8 @@ */ public class DefaultAutoFlushEventListener extends AbstractFlushingEventListener implements AutoFlushEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultAutoFlushEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultAutoFlushEventListener.class.getName()); /** Handle the given auto-flush event. * diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java index a9675dcc90..8e93452499 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java @@ -22,13 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.event.def; - import java.io.Serializable; import java.util.Set; import org.hibernate.CacheMode; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.TransientObjectException; import org.hibernate.action.EntityDeleteAction; import org.hibernate.classic.Lifecycle; @@ -48,6 +47,7 @@ import org.hibernate.type.Type; import org.hibernate.type.TypeHelper; import org.hibernate.util.IdentitySet; +import org.jboss.logging.Logger; /** * Defines the default delete event listener used by hibernate for deleting entities @@ -57,8 +57,8 @@ */ public class DefaultDeleteEventListener implements DeleteEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultDeleteEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultDeleteEventListener.class.getName()); /** * Handle the given delete event. @@ -296,9 +296,9 @@ private Object[] createDeletedState(EntityPersister persister, Object[] currentS protected boolean invokeDeleteLifecycle(EventSource session, Object entity, EntityPersister persister) { if ( persister.implementsLifecycle( session.getEntityMode() ) ) { - LOG.debug("Calling onDelete()"); + LOG.debugf("Calling onDelete()"); if ( ( ( Lifecycle ) entity ).onDelete( session ) ) { - LOG.debug("Deletion vetoed by onDelete()"); + LOG.debugf("Deletion vetoed by onDelete()"); return true; } } diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultDirtyCheckEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultDirtyCheckEventListener.java index c8f3fad721..af16d00232 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultDirtyCheckEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultDirtyCheckEventListener.java @@ -23,11 +23,11 @@ * */ package org.hibernate.event.def; - import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.event.DirtyCheckEvent; import org.hibernate.event.DirtyCheckEventListener; +import org.jboss.logging.Logger; /** * Defines the default dirty-check event listener used by hibernate for @@ -38,8 +38,8 @@ */ public class DefaultDirtyCheckEventListener extends AbstractFlushingEventListener implements DirtyCheckEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultDirtyCheckEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultDirtyCheckEventListener.class.getName()); /** Handle the given dirty-check event. * @@ -53,8 +53,8 @@ public void onDirtyCheck(DirtyCheckEvent event) throws HibernateException { try { flushEverythingToExecutions(event); boolean wasNeeded = event.getSession().getActionQueue().hasAnyQueuedActions(); - if (wasNeeded) LOG.debug("Session dirty"); - else LOG.debug("Session not dirty"); + if (wasNeeded) LOG.debugf("Session dirty"); + else LOG.debugf("Session not dirty"); event.setDirty( wasNeeded ); } finally { diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java index 70d672ca1c..97646fb5ca 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java @@ -23,10 +23,9 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.Cascade; import org.hibernate.engine.CascadingAction; import org.hibernate.engine.EntityEntry; @@ -39,6 +38,7 @@ import org.hibernate.pretty.MessageHelper; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; +import org.jboss.logging.Logger; /** * Defines the default evict event listener used by hibernate for evicting entities @@ -50,8 +50,8 @@ */ public class DefaultEvictEventListener implements EvictEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultEvictEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultEvictEventListener.class.getName()); /** * Handle the given evict event. diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java index 20102dd926..88617c17bc 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java @@ -23,12 +23,11 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.StaleObjectStateException; import org.hibernate.action.DelayedPostInsertIdentifier; import org.hibernate.action.EntityUpdateAction; @@ -47,6 +46,7 @@ import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; +import org.jboss.logging.Logger; /** * An event that occurs for each entity instance at flush time @@ -55,8 +55,8 @@ */ public class DefaultFlushEntityEventListener implements FlushEntityEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultFlushEntityEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultFlushEntityEventListener.class.getName()); /** * make sure user didn't mangle the id diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultFlushEventListener.java index 7122c6af3d..db14e76b99 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultFlushEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultFlushEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event.def; - import org.hibernate.HibernateException; import org.hibernate.event.EventSource; import org.hibernate.event.FlushEvent; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java index 1bb7f145ee..3d2aa40fcd 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java @@ -23,10 +23,9 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cache.CacheKey; import org.hibernate.cache.entry.CollectionCacheEntry; import org.hibernate.collection.PersistentCollection; @@ -38,14 +37,15 @@ import org.hibernate.event.InitializeCollectionEventListener; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; +import org.jboss.logging.Logger; /** * @author Gavin King */ public class DefaultInitializeCollectionEventListener implements InitializeCollectionEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultInitializeCollectionEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultInitializeCollectionEventListener.class.getName()); /** * called by a collection that wants to initialize itself diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java index 63d5c152a8..6bf9599746 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java @@ -22,12 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.event.def; - import java.io.Serializable; import org.hibernate.EntityMode; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.NonUniqueObjectException; import org.hibernate.PersistentObjectException; import org.hibernate.TypeMismatchException; @@ -55,6 +54,7 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.type.TypeHelper; +import org.jboss.logging.Logger; /** * Defines the default load event listeners used by hibernate for loading entities @@ -68,8 +68,8 @@ public class DefaultLoadEventListener extends AbstractLockUpgradeEventListener i public static final Object INCONSISTENT_RTN_CLASS_MARKER = new Object(); public static final LockMode DEFAULT_LOCK_MODE = LockMode.NONE; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultLoadEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultLoadEventListener.class.getName()); /** @@ -419,11 +419,11 @@ protected Object doLoad( Object entity = loadFromSessionCache( event, keyToLoad, options ); if ( entity == REMOVED_ENTITY_MARKER ) { - LOG.debug("Load request found matching entity in context, but it is scheduled for removal; returning null"); + LOG.debugf("Load request found matching entity in context, but it is scheduled for removal; returning null"); return null; } if ( entity == INCONSISTENT_RTN_CLASS_MARKER ) { - LOG.debug("Load request found matching entity in context, but the matched entity was of an inconsistent return type; returning null"); + LOG.debugf("Load request found matching entity in context, but the matched entity was of an inconsistent return type; returning null"); return null; } if ( entity != null ) { diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultLockEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultLockEventListener.java index 39fc1e9c22..906b71e817 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultLockEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultLockEventListener.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.LockMode; import org.hibernate.TransientObjectException; @@ -33,10 +31,10 @@ import org.hibernate.engine.CascadingAction; import org.hibernate.engine.EntityEntry; import org.hibernate.engine.ForeignKeys; +import org.hibernate.engine.SessionImplementor; import org.hibernate.event.EventSource; import org.hibernate.event.LockEvent; import org.hibernate.event.LockEventListener; -import org.hibernate.engine.SessionImplementor; import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java index f347542a25..a2131b114a 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; import java.util.HashSet; import java.util.Iterator; @@ -31,7 +30,7 @@ import java.util.Set; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.ObjectDeletedException; import org.hibernate.PropertyValueException; import org.hibernate.StaleObjectStateException; @@ -54,6 +53,7 @@ import org.hibernate.type.ForeignKeyDirection; import org.hibernate.type.Type; import org.hibernate.type.TypeHelper; +import org.jboss.logging.Logger; /** * Defines the default copy event listener used by hibernate for copying entities @@ -64,8 +64,8 @@ public class DefaultMergeEventListener extends AbstractSaveEventListener implements MergeEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultMergeEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultMergeEventListener.class.getName()); @Override protected Map getMergeMap(Object anything) { diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java index 771cff4b50..711bb22edd 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.event.def; - import java.util.Map; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.ObjectDeletedException; import org.hibernate.PersistentObjectException; import org.hibernate.engine.CascadingAction; @@ -39,6 +38,7 @@ import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; import org.hibernate.util.IdentityMap; +import org.jboss.logging.Logger; /** * Defines the default create event listener used by hibernate for creating @@ -48,8 +48,8 @@ */ public class DefaultPersistEventListener extends AbstractSaveEventListener implements PersistEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultPersistEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultPersistEventListener.class.getName()); /** * Handle the given create event. @@ -112,7 +112,7 @@ public void onPersist(PersistEvent event, Map createCache) throws HibernateExcep // NOTE: entityEntry must be null to get here, so we cannot use any of its values EntityPersister persister = source.getFactory().getEntityPersister( entityName ); if ( ForeignGenerator.class.isInstance( persister.getIdentifierGenerator() ) ) { - if (LOG.isDebugEnabled() && persister.getIdentifier(entity, source) != null) LOG.debug("Resetting entity id attribute to null for foreign generator"); + if (LOG.isDebugEnabled() && persister.getIdentifier(entity, source) != null) LOG.debugf("Resetting entity id attribute to null for foreign generator"); persister.setIdentifier( entity, null, source ); entityState = getEntityState( entity, entityName, entityEntry, source ); } diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPersistOnFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPersistOnFlushEventListener.java index f0d19fef7e..5e0d8f028d 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPersistOnFlushEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPersistOnFlushEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event.def; - import org.hibernate.engine.CascadingAction; /** diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPostLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPostLoadEventListener.java index 238c558002..dc7ef41c31 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPostLoadEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPostLoadEventListener.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.event.def; - import org.hibernate.AssertionFailure; import org.hibernate.LockMode; import org.hibernate.action.EntityIncrementVersionProcess; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPreLoadEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPreLoadEventListener.java index 8a4a14cbba..4dfd64f5c8 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPreLoadEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultPreLoadEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event.def; - import org.hibernate.event.PreLoadEvent; import org.hibernate.event.PreLoadEventListener; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java index e613f4ef10..2aa3a48782 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.event.def; - import java.io.Serializable; import java.util.Map; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.PersistentObjectException; import org.hibernate.UnresolvableObjectException; import org.hibernate.cache.CacheKey; @@ -44,6 +43,7 @@ import org.hibernate.type.CompositeType; import org.hibernate.type.Type; import org.hibernate.util.IdentityMap; +import org.jboss.logging.Logger; /** * Defines the default refresh event listener used by hibernate for refreshing entities @@ -53,8 +53,8 @@ */ public class DefaultRefreshEventListener implements RefreshEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultRefreshEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultRefreshEventListener.class.getName()); public void onRefresh(RefreshEvent event) throws HibernateException { onRefresh( event, IdentityMap.instantiate(10) ); diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java index 3f5c984d7f..29f8a1d0ad 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java @@ -23,11 +23,10 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.ReplicationMode; import org.hibernate.TransientObjectException; import org.hibernate.engine.Cascade; @@ -41,6 +40,7 @@ import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * Defines the default replicate event listener used by Hibernate to replicate @@ -50,8 +50,8 @@ */ public class DefaultReplicateEventListener extends AbstractSaveEventListener implements ReplicateEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultReplicateEventListener.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultReplicateEventListener.class.getName()); /** * Handle the given replicate event. diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveEventListener.java index c407386250..e0c10ffc5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveEventListener.java @@ -23,15 +23,13 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; - import org.hibernate.Hibernate; import org.hibernate.PersistentObjectException; import org.hibernate.engine.EntityEntry; +import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.Status; import org.hibernate.event.SaveOrUpdateEvent; -import org.hibernate.engine.SessionImplementor; /** * An event handler for save() events diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateCopyEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateCopyEventListener.java index 970f537c7b..2556fffb84 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateCopyEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateCopyEventListener.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event.def; - import org.hibernate.engine.CascadingAction; public class DefaultSaveOrUpdateCopyEventListener extends DefaultMergeEventListener { diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java index fb42614ef1..38709dc98e 100755 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java @@ -23,12 +23,11 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.PersistentObjectException; import org.hibernate.TransientObjectException; import org.hibernate.classic.Lifecycle; @@ -39,13 +38,13 @@ import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.Status; -import org.hibernate.engine.jdbc.batch.internal.AbstractBatchImpl; import org.hibernate.event.EventSource; import org.hibernate.event.SaveOrUpdateEvent; import org.hibernate.event.SaveOrUpdateEventListener; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.proxy.HibernateProxy; +import org.jboss.logging.Logger; /** * Defines the default listener used by Hibernate for handling save-update @@ -56,8 +55,8 @@ */ public class DefaultSaveOrUpdateEventListener extends AbstractSaveEventListener implements SaveOrUpdateEventListener { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AbstractBatchImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultSaveOrUpdateEventListener.class.getName()); /** * Handle the given update event. @@ -329,9 +328,9 @@ protected void performUpdate( protected boolean invokeUpdateLifecycle(Object entity, EntityPersister persister, EventSource source) { if ( persister.implementsLifecycle( source.getEntityMode() ) ) { - LOG.debug("Calling onUpdate()"); + LOG.debugf("Calling onUpdate()"); if (((Lifecycle)entity).onUpdate(source)) { - LOG.debug("Update vetoed by onUpdate()"); + LOG.debugf("Update vetoed by onUpdate()"); return true; } } diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultUpdateEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultUpdateEventListener.java index 7b5dff85f5..476299a586 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DefaultUpdateEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DefaultUpdateEventListener.java @@ -23,12 +23,9 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.ObjectDeletedException; -import org.hibernate.EntityMode; import org.hibernate.engine.EntityEntry; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.Status; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/DirtyCollectionSearchVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/def/DirtyCollectionSearchVisitor.java index 90a3c7142a..b5f74b85b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/DirtyCollectionSearchVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/DirtyCollectionSearchVisitor.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event.def; - import org.hibernate.HibernateException; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/EventCache.java b/hibernate-core/src/main/java/org/hibernate/event/def/EventCache.java index 967bec59a3..857e139f7d 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/EventCache.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/EventCache.java @@ -24,14 +24,12 @@ * */ package org.hibernate.event.def; - +import java.util.Collection; +import java.util.Iterator; import java.util.Map; import java.util.Set; -import java.util.Iterator; -import java.util.Collection; - -import org.hibernate.util.IdentityMap; import org.hibernate.AssertionFailure; +import org.hibernate.util.IdentityMap; /** * EventCache is a Map implementation that can be used by an event diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/EvictVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/def/EvictVisitor.java index e48282ac6e..6fe2af2904 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/EvictVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/EvictVisitor.java @@ -23,15 +23,15 @@ * */ package org.hibernate.event.def; - import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.CollectionEntry; import org.hibernate.engine.CollectionKey; import org.hibernate.event.EventSource; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.CollectionType; +import org.jboss.logging.Logger; /** * Evict any collections referenced by the object from the session cache. @@ -42,8 +42,7 @@ */ public class EvictVisitor extends AbstractVisitor { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - EvictVisitor.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, EvictVisitor.class.getName()); EvictVisitor(EventSource session) { super(session); @@ -76,10 +75,10 @@ else if ( value instanceof PersistentCollection ) { private void evictCollection(PersistentCollection collection) { CollectionEntry ce = (CollectionEntry) getSession().getPersistenceContext().getCollectionEntries().remove(collection); - if (LOG.isDebugEnabled()) LOG.debug("Evicting collection: " - + MessageHelper.collectionInfoString(ce.getLoadedPersister(), - ce.getLoadedKey(), - getSession().getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Evicting collection: %s", + MessageHelper.collectionInfoString(ce.getLoadedPersister(), + ce.getLoadedKey(), + getSession().getFactory())); if ( ce.getLoadedPersister() != null && ce.getLoadedKey() != null ) { //TODO: is this 100% correct? getSession().getPersistenceContext().getCollectionsByKey().remove( diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/FlushVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/def/FlushVisitor.java index e25415f1f0..0e189b31ec 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/FlushVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/FlushVisitor.java @@ -23,7 +23,6 @@ * */ package org.hibernate.event.def; - import org.hibernate.HibernateException; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.Collections; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/OnLockVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/def/OnLockVisitor.java index 944d5dbd65..ecff853c8b 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/OnLockVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/OnLockVisitor.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/OnReplicateVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/def/OnReplicateVisitor.java index 4676c2f8f8..170ae7dc4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/OnReplicateVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/OnReplicateVisitor.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.collection.PersistentCollection; import org.hibernate.event.EventSource; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/OnUpdateVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/def/OnUpdateVisitor.java index 6719b34bec..3edba0ede9 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/OnUpdateVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/OnUpdateVisitor.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.collection.PersistentCollection; import org.hibernate.event.EventSource; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/ProxyVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/def/ProxyVisitor.java index ece9d5d9ee..cb81130c1a 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/ProxyVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/ProxyVisitor.java @@ -23,9 +23,7 @@ * */ package org.hibernate.event.def; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.collection.PersistentCollection; import org.hibernate.event.EventSource; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/ReattachVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/def/ReattachVisitor.java index 9d7aef1614..75765747c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/ReattachVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/ReattachVisitor.java @@ -22,16 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.event.def; - import java.io.Serializable; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.action.CollectionRemoveAction; import org.hibernate.event.EventSource; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.pretty.MessageHelper; import org.hibernate.type.CompositeType; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * Abstract superclass of visitors that reattach collections. @@ -40,8 +40,7 @@ */ public abstract class ReattachVisitor extends ProxyVisitor { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - ReattachVisitor.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, ReattachVisitor.class.getName()); private final Serializable ownerIdentifier; private final Object owner; diff --git a/hibernate-core/src/main/java/org/hibernate/event/def/WrapVisitor.java b/hibernate-core/src/main/java/org/hibernate/event/def/WrapVisitor.java index a9a431ffaa..bf82e1665a 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/def/WrapVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/def/WrapVisitor.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.event.def; - import org.hibernate.EntityMode; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.collection.PersistentCollection; import org.hibernate.engine.PersistenceContext; import org.hibernate.engine.SessionImplementor; @@ -35,6 +34,7 @@ import org.hibernate.type.CollectionType; import org.hibernate.type.CompositeType; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * Wrap collections in a Hibernate collection @@ -43,8 +43,7 @@ */ public class WrapVisitor extends ProxyVisitor { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - WrapVisitor.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, WrapVisitor.class.getName()); boolean substitute = false; diff --git a/hibernate-core/src/main/java/org/hibernate/exception/CacheSQLStateConverter.java b/hibernate-core/src/main/java/org/hibernate/exception/CacheSQLStateConverter.java index 7f98235a87..d0a824795a 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/CacheSQLStateConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/CacheSQLStateConverter.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.exception; - -import org.hibernate.JDBCException; - +package org.hibernate.exception; import java.sql.SQLException; import java.util.HashSet; import java.util.Set; +import org.hibernate.JDBCException; /** * A SQLExceptionConverter implementation specific to Caché SQL, diff --git a/hibernate-core/src/main/java/org/hibernate/exception/Configurable.java b/hibernate-core/src/main/java/org/hibernate/exception/Configurable.java index a1feae63ff..70306305a0 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/Configurable.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/Configurable.java @@ -23,10 +23,8 @@ * */ package org.hibernate.exception; - -import org.hibernate.HibernateException; - import java.util.Properties; +import org.hibernate.HibernateException; /** * The Configurable interface defines the contract for SQLExceptionConverter impls that diff --git a/hibernate-core/src/main/java/org/hibernate/exception/ConstraintViolationException.java b/hibernate-core/src/main/java/org/hibernate/exception/ConstraintViolationException.java index 50d36cf40a..1aaf78639f 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/ConstraintViolationException.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/ConstraintViolationException.java @@ -23,10 +23,8 @@ * */ package org.hibernate.exception; - -import org.hibernate.JDBCException; - import java.sql.SQLException; +import org.hibernate.JDBCException; /** * Implementation of JDBCException indicating that the requested DML operation diff --git a/hibernate-core/src/main/java/org/hibernate/exception/DataException.java b/hibernate-core/src/main/java/org/hibernate/exception/DataException.java index fd010c3676..ffda30c49f 100755 --- a/hibernate-core/src/main/java/org/hibernate/exception/DataException.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/DataException.java @@ -23,10 +23,8 @@ * */ package org.hibernate.exception; - -import org.hibernate.JDBCException; - import java.sql.SQLException; +import org.hibernate.JDBCException; /** * Implementation of JDBCException indicating that evaluation of the diff --git a/hibernate-core/src/main/java/org/hibernate/exception/GenericJDBCException.java b/hibernate-core/src/main/java/org/hibernate/exception/GenericJDBCException.java index 1f33f8cdb7..ca624c64b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/GenericJDBCException.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/GenericJDBCException.java @@ -23,10 +23,8 @@ * */ package org.hibernate.exception; - -import org.hibernate.JDBCException; - import java.sql.SQLException; +import org.hibernate.JDBCException; /** * Generic, non-specific JDBCException. diff --git a/hibernate-core/src/main/java/org/hibernate/exception/JDBCConnectionException.java b/hibernate-core/src/main/java/org/hibernate/exception/JDBCConnectionException.java index 3dfcc83f3f..929bf5169a 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/JDBCConnectionException.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/JDBCConnectionException.java @@ -23,10 +23,8 @@ * */ package org.hibernate.exception; - -import org.hibernate.JDBCException; - import java.sql.SQLException; +import org.hibernate.JDBCException; /** * Implementation of JDBCException indicating problems with communicating with the diff --git a/hibernate-core/src/main/java/org/hibernate/exception/JDBCExceptionHelper.java b/hibernate-core/src/main/java/org/hibernate/exception/JDBCExceptionHelper.java index 70c324415e..0e2312291a 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/JDBCExceptionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/JDBCExceptionHelper.java @@ -23,12 +23,10 @@ * */ package org.hibernate.exception; - +import java.sql.SQLException; import org.hibernate.JDBCException; import org.hibernate.util.JDBCExceptionReporter; -import java.sql.SQLException; - /** * Implementation of JDBCExceptionHelper. * diff --git a/hibernate-core/src/main/java/org/hibernate/exception/LockAcquisitionException.java b/hibernate-core/src/main/java/org/hibernate/exception/LockAcquisitionException.java index 9864b4a5ad..6fd8f8f433 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/LockAcquisitionException.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/LockAcquisitionException.java @@ -23,10 +23,8 @@ * */ package org.hibernate.exception; - -import org.hibernate.JDBCException; - import java.sql.SQLException; +import org.hibernate.JDBCException; /** * Implementation of JDBCException indicating a problem acquiring lock diff --git a/hibernate-core/src/main/java/org/hibernate/exception/SQLExceptionConverter.java b/hibernate-core/src/main/java/org/hibernate/exception/SQLExceptionConverter.java index 1a0e1df965..f03b95d38b 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/SQLExceptionConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/SQLExceptionConverter.java @@ -23,10 +23,8 @@ * */ package org.hibernate.exception; - -import org.hibernate.JDBCException; - import java.sql.SQLException; +import org.hibernate.JDBCException; /** * Defines a contract for implementations that know how to convert a SQLException diff --git a/hibernate-core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java b/hibernate-core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java index 33243ca2df..936ecdcd78 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java @@ -23,17 +23,17 @@ * */ package org.hibernate.exception; - import java.lang.reflect.Constructor; import java.sql.SQLException; import java.util.Properties; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.JDBCException; -import org.hibernate.Logger; import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * A factory for building SQLExceptionConverter instances. @@ -42,8 +42,8 @@ */ public class SQLExceptionConverterFactory { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SQLExceptionConverterFactory.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + SQLExceptionConverterFactory.class.getName()); private SQLExceptionConverterFactory() { // Private constructor - stops checkstyle from complaining. diff --git a/hibernate-core/src/main/java/org/hibernate/exception/SQLGrammarException.java b/hibernate-core/src/main/java/org/hibernate/exception/SQLGrammarException.java index a9dd23a0bc..bba9decbed 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/SQLGrammarException.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/SQLGrammarException.java @@ -23,10 +23,8 @@ * */ package org.hibernate.exception; - -import org.hibernate.JDBCException; - import java.sql.SQLException; +import org.hibernate.JDBCException; /** * Implementation of JDBCException indicating that the SQL sent to the database diff --git a/hibernate-core/src/main/java/org/hibernate/exception/SQLStateConverter.java b/hibernate-core/src/main/java/org/hibernate/exception/SQLStateConverter.java index 00f0e1696b..161cd6beee 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/SQLStateConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/SQLStateConverter.java @@ -23,14 +23,12 @@ * */ package org.hibernate.exception; - -import org.hibernate.JDBCException; -import org.hibernate.PessimisticLockException; -import org.hibernate.QueryTimeoutException; - import java.sql.SQLException; import java.util.HashSet; import java.util.Set; +import org.hibernate.JDBCException; +import org.hibernate.PessimisticLockException; +import org.hibernate.QueryTimeoutException; /** * A SQLExceptionConverter implementation which performs converion based on diff --git a/hibernate-core/src/main/java/org/hibernate/exception/TemplatedViolatedConstraintNameExtracter.java b/hibernate-core/src/main/java/org/hibernate/exception/TemplatedViolatedConstraintNameExtracter.java index a6d1433e08..31609eb162 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/TemplatedViolatedConstraintNameExtracter.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/TemplatedViolatedConstraintNameExtracter.java @@ -24,6 +24,7 @@ */ package org.hibernate.exception; + /** * Knows how to extract a violated constraint name from an error message based on the * fact that the constraint name is templated within the message. diff --git a/hibernate-core/src/main/java/org/hibernate/exception/ViolatedConstraintNameExtracter.java b/hibernate-core/src/main/java/org/hibernate/exception/ViolatedConstraintNameExtracter.java index 409fbd735e..6e733fcd71 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/ViolatedConstraintNameExtracter.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/ViolatedConstraintNameExtracter.java @@ -23,7 +23,6 @@ * */ package org.hibernate.exception; - import java.sql.SQLException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/CollectionProperties.java b/hibernate-core/src/main/java/org/hibernate/hql/CollectionProperties.java index 081b2b2152..5506e93078 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/CollectionProperties.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/CollectionProperties.java @@ -23,11 +23,9 @@ * */ package org.hibernate.hql; - -import org.hibernate.persister.collection.CollectionPropertyNames; - import java.util.HashMap; import java.util.Map; +import org.hibernate.persister.collection.CollectionPropertyNames; /** * Provides a map of collection function names to the corresponding property names. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/CollectionSubqueryFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/CollectionSubqueryFactory.java index 682a237145..b906e0116b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/CollectionSubqueryFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/CollectionSubqueryFactory.java @@ -23,15 +23,13 @@ * */ package org.hibernate.hql; - -import org.hibernate.engine.JoinSequence; -import org.hibernate.sql.JoinFragment; +import java.util.Map; import org.hibernate.MappingException; import org.hibernate.QueryException; +import org.hibernate.engine.JoinSequence; +import org.hibernate.sql.JoinFragment; import org.hibernate.util.StringHelper; -import java.util.Map; - /** * Provides the SQL for collection subqueries. *
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/FilterTranslator.java b/hibernate-core/src/main/java/org/hibernate/hql/FilterTranslator.java index d09dce245b..af6caca86a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/FilterTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/FilterTranslator.java @@ -23,12 +23,10 @@ * */ package org.hibernate.hql; - +import java.util.Map; import org.hibernate.MappingException; import org.hibernate.QueryException; -import java.util.Map; - /** * Specialized interface for filters. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/HolderInstantiator.java b/hibernate-core/src/main/java/org/hibernate/hql/HolderInstantiator.java index 8061db12ed..ce65e3997a 100755 --- a/hibernate-core/src/main/java/org/hibernate/hql/HolderInstantiator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/HolderInstantiator.java @@ -23,9 +23,7 @@ * */ package org.hibernate.hql; - import java.lang.reflect.Constructor; - import org.hibernate.transform.AliasToBeanConstructorResultTransformer; import org.hibernate.transform.ResultTransformer; import org.hibernate.transform.Transformers; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/NameGenerator.java b/hibernate-core/src/main/java/org/hibernate/hql/NameGenerator.java index 941be47956..c92e24c7e8 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/NameGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/NameGenerator.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql; - import org.hibernate.MappingException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ParameterTranslations.java b/hibernate-core/src/main/java/org/hibernate/hql/ParameterTranslations.java index 8ef581a897..43a5fc8a48 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ParameterTranslations.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ParameterTranslations.java @@ -23,9 +23,8 @@ * */ package org.hibernate.hql; - -import org.hibernate.type.Type; import java.util.Set; +import org.hibernate.type.Type; /** * Defines available information about the parameters encountered during diff --git a/hibernate-core/src/main/java/org/hibernate/hql/QueryExecutionRequestException.java b/hibernate-core/src/main/java/org/hibernate/hql/QueryExecutionRequestException.java index 5d7c8498a5..dc7503b544 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/QueryExecutionRequestException.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/QueryExecutionRequestException.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql; - +package org.hibernate.hql; import org.hibernate.QueryException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/QuerySplitter.java b/hibernate-core/src/main/java/org/hibernate/hql/QuerySplitter.java index a45bc097d2..0d5a6351f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/QuerySplitter.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/QuerySplitter.java @@ -23,15 +23,15 @@ * */ package org.hibernate.hql; - import java.util.ArrayList; import java.util.HashSet; import java.util.Set; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.classic.ParserHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Provides query splitting methods, which were originally in QueryTranslator. @@ -42,8 +42,7 @@ */ public final class QuerySplitter { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - QuerySplitter.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, QuerySplitter.class.getName()); private static final Set BEFORE_CLASS_TOKENS = new HashSet(); private static final Set NOT_AFTER_CLASS_TOKENS = new HashSet(); diff --git a/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslator.java b/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslator.java index b6c268f10b..b6dee910de 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslator.java @@ -23,7 +23,10 @@ * */ package org.hibernate.hql; - +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.QueryException; @@ -33,11 +36,6 @@ import org.hibernate.event.EventSource; import org.hibernate.type.Type; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Defines the contract of an HQL->SQL translator. * diff --git a/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslatorFactory.java index 10328651c7..febedd243b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslatorFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/QueryTranslatorFactory.java @@ -23,10 +23,8 @@ * */ package org.hibernate.hql; - -import org.hibernate.engine.SessionFactoryImplementor; - import java.util.Map; +import org.hibernate.engine.SessionFactoryImplementor; /** * Facade for generation of {@link QueryTranslator} and {@link FilterTranslator} instances. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java index ddf7a0382a..374a53b539 100755 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java @@ -23,13 +23,13 @@ * */ package org.hibernate.hql.ast; - import java.util.Map; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.FilterTranslator; import org.hibernate.hql.QueryTranslator; import org.hibernate.hql.QueryTranslatorFactory; +import org.jboss.logging.Logger; /** * Generates translators which uses the Antlr-based parser to perform @@ -39,8 +39,8 @@ */ public class ASTQueryTranslatorFactory implements QueryTranslatorFactory { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - ASTQueryTranslatorFactory.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + ASTQueryTranslatorFactory.class.getName()); public ASTQueryTranslatorFactory() { LOG.usingAstQueryTranslatorFactory(); diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/DetailedSemanticException.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/DetailedSemanticException.java index 7939883df6..9362fe0a1b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/DetailedSemanticException.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/DetailedSemanticException.java @@ -23,11 +23,9 @@ * */ package org.hibernate.hql.ast; - -import antlr.SemanticException; - import java.io.PrintStream; import java.io.PrintWriter; +import antlr.SemanticException; /** * Thrown when a call to the underlying Hibernate engine fails, indicating diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java index bcbf0d14a8..df13566959 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java @@ -23,12 +23,12 @@ * */ package org.hibernate.hql.ast; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.QueryException; +import org.jboss.logging.Logger; import antlr.RecognitionException; /** @@ -36,8 +36,7 @@ */ public class ErrorCounter implements ParseErrorHandler { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - ErrorCounter.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, ErrorCounter.class.getName()); private List errorList = new ArrayList(); private List warningList = new ArrayList(); @@ -59,7 +58,7 @@ public int getErrorCount() { } public void reportWarning(String message) { - LOG.debug(message); + LOG.debugf(message); warningList.add( message ); } @@ -78,6 +77,6 @@ public void throwQueryException() throws QueryException { if (recognitionExceptions.size() > 0) throw QuerySyntaxException.convert((RecognitionException)recognitionExceptions.get(0)); throw new QueryException(getErrorString()); } - LOG.debug("throwQueryException() : no errors"); + LOG.debugf("throwQueryException() : no errors"); } } diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorReporter.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorReporter.java index c0c2e79c51..31a898f380 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorReporter.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorReporter.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast; - import antlr.RecognitionException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlASTFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlASTFactory.java index 015d928ba7..59ba88fa73 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlASTFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlASTFactory.java @@ -23,9 +23,8 @@ * */ package org.hibernate.hql.ast; - -import antlr.ASTFactory; import org.hibernate.hql.ast.tree.Node; +import antlr.ASTFactory; /** * User: Joshua Davis
diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlLexer.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlLexer.java index 8a9dbceb40..d5d932a0b8 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlLexer.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlLexer.java @@ -23,13 +23,11 @@ * */ package org.hibernate.hql.ast; - import java.io.InputStream; import java.io.Reader; - -import antlr.Token; import org.hibernate.QueryException; import org.hibernate.hql.antlr.HqlBaseLexer; +import antlr.Token; /** * Custom lexer for the HQL grammar. Extends the base lexer generated by ANTLR diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlParser.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlParser.java index fdc85ae9d0..823ba0f33b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlParser.java @@ -23,17 +23,17 @@ * */ package org.hibernate.hql.ast; - import java.io.PrintStream; import java.io.PrintWriter; import java.io.StringReader; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.QueryException; import org.hibernate.hql.antlr.HqlBaseParser; import org.hibernate.hql.antlr.HqlTokenTypes; import org.hibernate.hql.ast.util.ASTPrinter; import org.hibernate.hql.ast.util.ASTUtil; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; import antlr.ASTPair; import antlr.MismatchedTokenException; import antlr.RecognitionException; @@ -50,8 +50,7 @@ */ public final class HqlParser extends HqlBaseParser { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - HqlBaseParser.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, HqlParser.class.getName()); private ParseErrorHandler parseErrorHandler; private ASTPrinter printer = getASTPrinter(); @@ -334,7 +333,7 @@ public void weakKeywords() throws TokenStreamException { // The next token ( LT(2) ) should be 'by'... otherwise, this is just an ident. if ( LA( 2 ) != LITERAL_by ) { LT( 1 ).setType( IDENT ); - LOG.debug("weakKeywords() : new LT(1) token - " + LT(1)); + LOG.debugf("weakKeywords() : new LT(1) token - %s", LT(1)); } break; default: @@ -343,7 +342,7 @@ public void weakKeywords() throws TokenStreamException { HqlToken hqlToken = (HqlToken)LT(1); if (hqlToken.isPossibleID()) { hqlToken.setType(IDENT); - LOG.debug("weakKeywords() : new LT(1) token - " + LT(1)); + LOG.debugf("weakKeywords() : new LT(1) token - %s", LT(1)); } } break; @@ -361,7 +360,7 @@ public void handleDotIdent() throws TokenStreamException { { // Set it! LT( 2 ).setType( IDENT ); - LOG.debug("handleDotIdent() : new LT(2) token - " + LT(1)); + LOG.debugf("handleDotIdent() : new LT(2) token - %s", LT(1)); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java index cfd215a3b9..1011111801 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast; - import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -36,7 +35,7 @@ import java.util.Map; import java.util.Set; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.QueryException; import org.hibernate.engine.JoinSequence; import org.hibernate.engine.ParameterBinder; @@ -98,6 +97,7 @@ import org.hibernate.usertype.UserVersionType; import org.hibernate.util.ArrayHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; import antlr.ASTFactory; import antlr.RecognitionException; import antlr.SemanticException; @@ -116,8 +116,7 @@ */ public class HqlSqlWalker extends HqlSqlBaseWalker implements ErrorReporter, ParameterBinder.NamedParameterSource { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - HqlSqlWalker.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, HqlSqlWalker.class.getName()); private final QueryTranslatorImpl queryTranslatorImpl; private final HqlParser hqlParser; @@ -249,7 +248,7 @@ protected void prepareFromClauseInputTree(AST fromClauseInput) { ASTUtil.createSibling( inputAstFactory, HqlTokenTypes.ALIAS, "this", fromElement ); fromClauseInput.addChild( fromElement ); // Show the modified AST. - LOG.debug("prepareFromClauseInputTree() : Filter - Added 'this' as a from element..."); + LOG.debugf("prepareFromClauseInputTree() : Filter - Added 'this' as a from element..."); queryTranslatorImpl.showHqlAst( hqlParser.getAST() ); // Create a parameter specification for the collection filter... @@ -346,7 +345,7 @@ protected AST createFromFilterElement(AST filterEntity, AST alias) throws Semant join.addCondition( fkTableAlias, keyColumnNames, " = ?" ); fromElement.setJoinSequence( join ); fromElement.setFilter( true ); - LOG.debug("createFromFilterElement() : processed filter FROM element."); + LOG.debugf("createFromFilterElement() : processed filter FROM element."); return fromElement; } @@ -398,16 +397,16 @@ protected void createFromJoinElement( } } - if (LOG.isDebugEnabled()) LOG.debug("createFromJoinElement() : " - + getASTPrinter().showAsString(fromElement, "-- join tree --")); + if (LOG.isDebugEnabled()) LOG.debugf("createFromJoinElement() : %s", + getASTPrinter().showAsString(fromElement, "-- join tree --")); } private void handleWithFragment(FromElement fromElement, AST hqlWithNode) throws SemanticException { try { withClause( hqlWithNode ); AST hqlSqlWithNode = returnAST; - if (LOG.isDebugEnabled()) LOG.debug("handleWithFragment() : " - + getASTPrinter().showAsString(hqlSqlWithNode, "-- with clause --")); + if (LOG.isDebugEnabled()) LOG.debugf("handleWithFragment() : %s", + getASTPrinter().showAsString(hqlSqlWithNode, "-- with clause --")); WithClauseVisitor visitor = new WithClauseVisitor( fromElement ); NodeTraverser traverser = new NodeTraverser( visitor ); traverser.traverseDepthFirst( hqlSqlWithNode ); @@ -558,8 +557,10 @@ protected AST lookupProperty(AST dot, boolean root, boolean inSelect) throws Sem switch ( rhs.getType() ) { case SqlTokenTypes.ELEMENTS: case SqlTokenTypes.INDICES: - if (LOG.isDebugEnabled()) LOG.debug("lookupProperty() " + dotNode.getPath() + " => " + rhs.getText() + "(" - + lhs.getPath() + ")"); + if (LOG.isDebugEnabled()) LOG.debugf("lookupProperty() %s => %s(%s)", + dotNode.getPath(), + rhs.getText(), + lhs.getPath()); CollectionFunction f = ( CollectionFunction ) rhs; // Re-arrange the tree so that the collection function is the root and the lhs is the path. f.setFirstChild( lhs ); @@ -621,7 +622,7 @@ private AST generateSyntheticDotNodeForNonQualifiedPropertyRef(AST property, Fro @Override protected void processQuery(AST select, AST query) throws SemanticException { - LOG.debug("processQuery() : " + query.toStringTree()); + LOG.debugf("processQuery() : %s", query.toStringTree()); try { QueryNode qn = ( QueryNode ) query; @@ -865,7 +866,7 @@ private void createSelectClauseFromFromClause(QueryNode qn) throws SemanticExcep select.setNextSibling( sibling ); selectClause = ( SelectClause ) select; selectClause.initializeDerivedSelectClause( currentFromClause ); - LOG.debug("Derived SELECT clause created."); + LOG.debugf("Derived SELECT clause created."); } @Override diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlToken.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlToken.java index bcf3afa2aa..d0675396f9 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlToken.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/HqlToken.java @@ -24,6 +24,7 @@ */ package org.hibernate.hql.ast; + /** * A custom token class for the HQL grammar. *

NOTE: This class must be public becuase it is instantiated by the ANTLR library. Ignore any suggestions diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidPathException.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidPathException.java index 8bf551cbd9..669a92a812 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidPathException.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidPathException.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast; - import antlr.SemanticException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidWithClauseException.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidWithClauseException.java index 422dd908fe..ba5f4a50d7 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidWithClauseException.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/InvalidWithClauseException.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast; +package org.hibernate.hql.ast; + /** * {@inheritDoc} diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/ParameterTranslationsImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/ParameterTranslationsImpl.java index 5cf28b384e..cd8a82bba8 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/ParameterTranslationsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/ParameterTranslationsImpl.java @@ -23,21 +23,19 @@ * */ package org.hibernate.hql.ast; - -import org.hibernate.hql.ParameterTranslations; -import org.hibernate.type.Type; -import org.hibernate.param.ParameterSpecification; -import org.hibernate.param.PositionalParameterSpecification; -import org.hibernate.param.NamedParameterSpecification; -import org.hibernate.util.ArrayHelper; - -import java.util.Map; -import java.util.Set; -import java.util.List; +import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import java.io.Serializable; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.hibernate.hql.ParameterTranslations; +import org.hibernate.param.NamedParameterSpecification; +import org.hibernate.param.ParameterSpecification; +import org.hibernate.param.PositionalParameterSpecification; +import org.hibernate.type.Type; +import org.hibernate.util.ArrayHelper; /** * Defines the information available for parameters encountered during diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/ParseErrorHandler.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/ParseErrorHandler.java index 190582ca99..9583aa37df 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/ParseErrorHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/ParseErrorHandler.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast; - import org.hibernate.QueryException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/QuerySyntaxException.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/QuerySyntaxException.java index b027fded38..7f01204d48 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/QuerySyntaxException.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/QuerySyntaxException.java @@ -23,9 +23,8 @@ * */ package org.hibernate.hql.ast; - -import antlr.RecognitionException; import org.hibernate.QueryException; +import antlr.RecognitionException; /** * Exception thrown when there is a syntax error in the HQL. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java index e0794acb65..615bf8fbc8 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast; - import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -31,7 +30,7 @@ import java.util.Map; import java.util.Set; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.ScrollableResults; @@ -63,6 +62,7 @@ import org.hibernate.util.IdentitySet; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; import antlr.ANTLRException; import antlr.RecognitionException; import antlr.TokenStreamException; @@ -75,8 +75,7 @@ */ public class QueryTranslatorImpl implements FilterTranslator { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - QueryTranslatorImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, QueryTranslatorImpl.class.getName()); private SessionFactoryImplementor factory; @@ -162,7 +161,7 @@ public void compile( private synchronized void doCompile(Map replacements, boolean shallow, String collectionRole) { // If the query is already compiled, skip the compilation. if ( compiled ) { - LOG.debug("compile() : The query is already compiled, skipping..."); + LOG.debugf("compile() : The query is already compiled, skipping..."); return; } @@ -230,8 +229,8 @@ private void generate(AST sqlAst) throws QueryException, RecognitionException { gen.statement( sqlAst ); sql = gen.getSQL(); if (LOG.isDebugEnabled()) { - LOG.debug("HQL: " + hql); - LOG.debug("SQL: " + sql); + LOG.debugf("HQL: %s", hql); + LOG.debugf("SQL: %s", sql); } gen.getParseErrorHandler().throwQueryException(); collectedParameterSpecifications = gen.getCollectedParameters(); @@ -247,7 +246,7 @@ private HqlSqlWalker analyze(HqlParser parser, String collectionRole) throws Que if (LOG.isDebugEnabled()) { ASTPrinter printer = new ASTPrinter( SqlTokenTypes.class ); - LOG.debug(printer.showAsString(w.getAST(), "--- SQL AST ---")); + LOG.debugf(printer.showAsString(w.getAST(), "--- SQL AST ---")); } w.getParseErrorHandler().throwQueryException(); @@ -260,7 +259,7 @@ private HqlParser parse(boolean filter) throws TokenStreamException, Recognition HqlParser parser = HqlParser.getInstance( hql ); parser.setFilter( filter ); - LOG.debug("parse() - HQL: " + hql); + LOG.debugf("parse() - HQL: %s", hql); parser.statement(); AST hqlAst = parser.getAST(); @@ -278,7 +277,7 @@ private HqlParser parse(boolean filter) throws TokenStreamException, Recognition void showHqlAst(AST hqlAst) { if (LOG.isDebugEnabled()) { ASTPrinter printer = new ASTPrinter( HqlTokenTypes.class ); - LOG.debug(printer.showAsString(hqlAst, "--- HQL AST ---")); + LOG.debugf(printer.showAsString(hqlAst, "--- HQL AST ---")); } } diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlASTFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlASTFactory.java index aa7392e831..0bdd7ab930 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlASTFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlASTFactory.java @@ -23,14 +23,13 @@ * */ package org.hibernate.hql.ast; - -import antlr.ASTFactory; -import antlr.Token; -import antlr.collections.AST; +import java.lang.reflect.Constructor; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.ast.tree.AggregateNode; +import org.hibernate.hql.ast.tree.BetweenOperatorNode; import org.hibernate.hql.ast.tree.BinaryArithmeticOperatorNode; import org.hibernate.hql.ast.tree.BinaryLogicOperatorNode; +import org.hibernate.hql.ast.tree.BooleanLiteralNode; import org.hibernate.hql.ast.tree.Case2Node; import org.hibernate.hql.ast.tree.CaseNode; import org.hibernate.hql.ast.tree.CollectionFunction; @@ -42,11 +41,18 @@ import org.hibernate.hql.ast.tree.FromElement; import org.hibernate.hql.ast.tree.IdentNode; import org.hibernate.hql.ast.tree.ImpliedFromElement; +import org.hibernate.hql.ast.tree.InLogicOperatorNode; import org.hibernate.hql.ast.tree.IndexNode; import org.hibernate.hql.ast.tree.InitializeableNode; import org.hibernate.hql.ast.tree.InsertStatement; import org.hibernate.hql.ast.tree.IntoClause; +import org.hibernate.hql.ast.tree.IsNotNullLogicOperatorNode; +import org.hibernate.hql.ast.tree.IsNullLogicOperatorNode; +import org.hibernate.hql.ast.tree.JavaConstantNode; import org.hibernate.hql.ast.tree.LiteralNode; +import org.hibernate.hql.ast.tree.MapEntryNode; +import org.hibernate.hql.ast.tree.MapKeyNode; +import org.hibernate.hql.ast.tree.MapValueNode; import org.hibernate.hql.ast.tree.MethodNode; import org.hibernate.hql.ast.tree.OrderByClause; import org.hibernate.hql.ast.tree.ParameterNode; @@ -54,23 +60,15 @@ import org.hibernate.hql.ast.tree.ResultVariableRefNode; import org.hibernate.hql.ast.tree.SelectClause; import org.hibernate.hql.ast.tree.SelectExpressionImpl; +import org.hibernate.hql.ast.tree.SessionFactoryAwareNode; import org.hibernate.hql.ast.tree.SqlFragment; import org.hibernate.hql.ast.tree.SqlNode; import org.hibernate.hql.ast.tree.UnaryArithmeticNode; -import org.hibernate.hql.ast.tree.UpdateStatement; -import org.hibernate.hql.ast.tree.BetweenOperatorNode; import org.hibernate.hql.ast.tree.UnaryLogicOperatorNode; -import org.hibernate.hql.ast.tree.InLogicOperatorNode; -import org.hibernate.hql.ast.tree.JavaConstantNode; -import org.hibernate.hql.ast.tree.SessionFactoryAwareNode; -import org.hibernate.hql.ast.tree.BooleanLiteralNode; -import org.hibernate.hql.ast.tree.IsNullLogicOperatorNode; -import org.hibernate.hql.ast.tree.IsNotNullLogicOperatorNode; -import org.hibernate.hql.ast.tree.MapKeyNode; -import org.hibernate.hql.ast.tree.MapValueNode; -import org.hibernate.hql.ast.tree.MapEntryNode; - -import java.lang.reflect.Constructor; +import org.hibernate.hql.ast.tree.UpdateStatement; +import antlr.ASTFactory; +import antlr.Token; +import antlr.collections.AST; /** * Custom AST factory the intermediate tree that causes ANTLR to create specialized diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java index 571ee0814a..8bc03ca054 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java @@ -23,12 +23,11 @@ * */ package org.hibernate.hql.ast; - import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.QueryException; import org.hibernate.dialect.function.SQLFunction; import org.hibernate.engine.SessionFactoryImplementor; @@ -43,6 +42,7 @@ import org.hibernate.param.ParameterSpecification; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; import antlr.RecognitionException; import antlr.collections.AST; @@ -55,8 +55,7 @@ */ public class SqlGenerator extends SqlGeneratorBase implements ErrorReporter { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SqlGenerator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SqlGenerator.class.getName()); public static boolean REGRESSION_STYLE_CROSS_JOINS = false; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/TypeDiscriminatorMetadata.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/TypeDiscriminatorMetadata.java index 8231d071f0..3226a181da 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/TypeDiscriminatorMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/TypeDiscriminatorMetadata.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast; - import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java index 6b8a4053c8..7aabb82b70 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast.exec; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLWarning; @@ -30,7 +29,7 @@ import java.util.Collections; import java.util.List; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.action.BulkOperationCleanupAction; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; @@ -45,6 +44,7 @@ import org.hibernate.sql.SelectFragment; import org.hibernate.util.JDBCExceptionReporter; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; import antlr.RecognitionException; import antlr.collections.AST; @@ -55,14 +55,14 @@ */ public abstract class AbstractStatementExecutor implements StatementExecutor { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AbstractStatementExecutor.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + AbstractStatementExecutor.class.getName()); private final HqlSqlWalker walker; private List idSelectParameterSpecifications = Collections.EMPTY_LIST; public AbstractStatementExecutor( HqlSqlWalker walker, - Logger log ) { + HibernateLogger log ) { this.walker = walker; } @@ -157,7 +157,7 @@ public void doWork(Connection connection) throws HibernateException { } } catch( Exception e ) { - LOG.debug("Unable to create temporary id table [" + e.getMessage() + "]"); + LOG.debugf("Unable to create temporary id table [%s]", e.getMessage()); } } }; @@ -186,8 +186,8 @@ public void prepare(SQLWarning warning) { @Override protected void logWarning(String description, String message) { - LOG.debug( description ); - LOG.debug( message ); + LOG.debugf(description); + LOG.debugf(message); } }; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java index 6e3cf3d523..5d3959f892 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/BasicExecutor.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.exec; - import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Iterator; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java index b68967f005..63499dd5fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java @@ -23,12 +23,11 @@ * */ package org.hibernate.hql.ast.exec; - import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Iterator; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionImplementor; import org.hibernate.hql.ast.HqlSqlWalker; @@ -38,6 +37,7 @@ import org.hibernate.persister.entity.Queryable; import org.hibernate.sql.Delete; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Implementation of MultiTableDeleteExecutor. @@ -46,8 +46,8 @@ */ public class MultiTableDeleteExecutor extends AbstractStatementExecutor { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - MultiTableDeleteExecutor.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + MultiTableDeleteExecutor.class.getName()); private final Queryable persister; private final String idInsertSelect; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java index 519fdd1365..488cc9f726 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java @@ -23,14 +23,13 @@ * */ package org.hibernate.hql.ast.exec; - import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionImplementor; import org.hibernate.hql.ast.HqlSqlWalker; @@ -41,6 +40,7 @@ import org.hibernate.persister.entity.Queryable; import org.hibernate.sql.Update; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Implementation of MultiTableUpdateExecutor. @@ -49,8 +49,8 @@ */ public class MultiTableUpdateExecutor extends AbstractStatementExecutor { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - MultiTableUpdateExecutor.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + MultiTableUpdateExecutor.class.getName()); private final Queryable persister; private final String idInsertSelect; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/StatementExecutor.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/StatementExecutor.java index f2f0cca657..326ff3c070 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/StatementExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/exec/StatementExecutor.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.exec; - import org.hibernate.HibernateException; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractMapComponentNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractMapComponentNode.java index 74e7098e27..4128488938 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractMapComponentNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractMapComponentNode.java @@ -20,18 +20,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast.tree; - import java.util.Map; - -import antlr.SemanticException; -import antlr.collections.AST; - import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.ast.util.ColumnHelper; +import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.CollectionType; import org.hibernate.type.Type; -import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.util.StringHelper; +import antlr.SemanticException; +import antlr.collections.AST; /** * TODO : javadoc diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractNullnessCheckNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractNullnessCheckNode.java index d36cec6098..2ef78edf7c 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractNullnessCheckNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractNullnessCheckNode.java @@ -23,14 +23,12 @@ * */ package org.hibernate.hql.ast.tree; - -import antlr.collections.AST; - -import org.hibernate.type.Type; +import org.hibernate.HibernateException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.antlr.HqlSqlTokenTypes; +import org.hibernate.type.Type; import org.hibernate.util.StringHelper; -import org.hibernate.HibernateException; +import antlr.collections.AST; /** * Base class for nodes dealing 'is null' and 'is not null' operators. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java index b887d143d7..c15506631d 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java @@ -23,8 +23,7 @@ * */ package org.hibernate.hql.ast.tree; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.ast.util.ASTUtil; import antlr.collections.AST; @@ -42,7 +41,7 @@ public abstract class AbstractRestrictableStatement extends AbstractStatement im protected abstract int getWhereClauseParentTokenType(); - protected abstract Logger getLog(); + protected abstract HibernateLogger getLog(); /** * @see org.hibernate.hql.ast.tree.RestrictableStatement#getFromClause diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractSelectExpression.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractSelectExpression.java index 53d6b91d3a..440e399a4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractSelectExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractSelectExpression.java @@ -23,9 +23,7 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.type.Type; - import antlr.SemanticException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractStatement.java index aa06241b46..fd66f31212 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractStatement.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import java.util.Iterator; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregateNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregateNode.java index 14023ed1aa..0fe2b51454 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregateNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregateNode.java @@ -22,12 +22,12 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast.tree; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.dialect.function.SQLFunction; import org.hibernate.dialect.function.StandardSQLFunction; import org.hibernate.hql.ast.util.ColumnHelper; import org.hibernate.type.Type; +import org.jboss.logging.Logger; import antlr.SemanticException; import antlr.collections.AST; @@ -38,8 +38,7 @@ */ public class AggregateNode extends AbstractSelectExpression implements SelectExpression, FunctionNode { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AggregateNode.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, AggregateNode.class.getName()); private SQLFunction sqlFunction; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregatedSelectExpression.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregatedSelectExpression.java index 8ce21f94ec..1556d938de 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregatedSelectExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregatedSelectExpression.java @@ -20,9 +20,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast.tree; - import java.util.List; - import org.hibernate.transform.ResultTransformer; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AssignmentSpecification.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AssignmentSpecification.java index ea744ce67e..9a152c9659 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AssignmentSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AssignmentSpecification.java @@ -23,13 +23,11 @@ * */ package org.hibernate.hql.ast.tree; - +import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import java.util.HashSet; -import java.util.Collections; - import org.hibernate.QueryException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.antlr.HqlSqlTokenTypes; @@ -38,7 +36,6 @@ import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.entity.Queryable; import org.hibernate.persister.entity.UnionSubclassEntityPersister; - import antlr.collections.AST; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BetweenOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BetweenOperatorNode.java index c3f405089e..3239a67e8c 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BetweenOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BetweenOperatorNode.java @@ -23,9 +23,8 @@ * */ package org.hibernate.hql.ast.tree; - -import org.hibernate.type.Type; import org.hibernate.Hibernate; +import org.hibernate.type.Type; import antlr.SemanticException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryArithmeticOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryArithmeticOperatorNode.java index b8b2a39ae0..c0cb42b548 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryArithmeticOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryArithmeticOperatorNode.java @@ -23,12 +23,10 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.Hibernate; -import org.hibernate.hql.ast.util.ColumnHelper; import org.hibernate.hql.antlr.HqlSqlTokenTypes; +import org.hibernate.hql.ast.util.ColumnHelper; import org.hibernate.type.Type; - import antlr.SemanticException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java index 5ff933630c..de8154410a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java @@ -22,16 +22,15 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast.tree; - +import org.hibernate.Hibernate; +import org.hibernate.HibernateException; +import org.hibernate.TypeMismatchException; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.hql.antlr.HqlSqlTokenTypes; +import org.hibernate.param.ParameterSpecification; import org.hibernate.type.OneToOneType; import org.hibernate.type.Type; -import org.hibernate.Hibernate; -import org.hibernate.TypeMismatchException; -import org.hibernate.HibernateException; -import org.hibernate.param.ParameterSpecification; import org.hibernate.util.StringHelper; -import org.hibernate.hql.antlr.HqlSqlTokenTypes; -import org.hibernate.engine.SessionFactoryImplementor; import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryOperatorNode.java index d5330c77af..662a379d3c 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BinaryOperatorNode.java @@ -24,6 +24,7 @@ */ package org.hibernate.hql.ast.tree; + /** * Contract for nodes representing binary operators. * diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BooleanLiteralNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BooleanLiteralNode.java index 46a80d607f..4f234f0cbc 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BooleanLiteralNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/BooleanLiteralNode.java @@ -22,13 +22,12 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; - -import org.hibernate.type.LiteralType; -import org.hibernate.type.Type; +package org.hibernate.hql.ast.tree; import org.hibernate.Hibernate; import org.hibernate.QueryException; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.type.LiteralType; +import org.hibernate.type.Type; /** * Represents a boolean literal within a query. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Case2Node.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Case2Node.java index 9b71bdc54c..619bc76699 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Case2Node.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Case2Node.java @@ -23,10 +23,8 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.hql.ast.util.ColumnHelper; import org.hibernate.type.Type; - import antlr.SemanticException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CaseNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CaseNode.java index 787f9889d5..74c3920c89 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CaseNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CaseNode.java @@ -23,10 +23,8 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.hql.ast.util.ColumnHelper; import org.hibernate.type.Type; - import antlr.SemanticException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CollectionFunction.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CollectionFunction.java index 08a88ffbef..f2e2298d77 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CollectionFunction.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CollectionFunction.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ComponentJoin.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ComponentJoin.java index ad4a056788..873542b30d 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ComponentJoin.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ComponentJoin.java @@ -22,15 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast.tree; - -import org.hibernate.type.ComponentType; -import org.hibernate.type.Type; +import org.hibernate.QueryException; +import org.hibernate.hql.NameGenerator; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.PropertyMapping; -import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.QueryException; +import org.hibernate.type.ComponentType; +import org.hibernate.type.Type; import org.hibernate.util.StringHelper; -import org.hibernate.hql.NameGenerator; /** * Models an explicit join terminating at a component value (e.g. ... from Person p join p.name as n ...) diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ConstructorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ConstructorNode.java index e1e5942a0b..6025509c2f 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ConstructorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ConstructorNode.java @@ -23,21 +23,18 @@ * */ package org.hibernate.hql.ast.tree; - import java.lang.reflect.Constructor; import java.util.Arrays; import java.util.List; - import org.hibernate.PropertyNotFoundException; import org.hibernate.QueryException; -import org.hibernate.transform.ResultTransformer; -import org.hibernate.transform.AliasToBeanConstructorResultTransformer; -import org.hibernate.transform.Transformers; import org.hibernate.hql.ast.DetailedSemanticException; +import org.hibernate.transform.AliasToBeanConstructorResultTransformer; +import org.hibernate.transform.ResultTransformer; +import org.hibernate.transform.Transformers; import org.hibernate.type.Type; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; - import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CountNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CountNode.java index c3461adfbd..ece1a2a3ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CountNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/CountNode.java @@ -23,10 +23,8 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.hql.ast.util.ColumnHelper; import org.hibernate.type.Type; - import antlr.SemanticException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java index f8daf5ba9f..c3cb3e4563 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java @@ -23,10 +23,10 @@ * */ package org.hibernate.hql.ast.tree; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.antlr.SqlTokenTypes; +import org.jboss.logging.Logger; /** * Defines a top-level AST node representing an HQL delete statement. @@ -35,8 +35,7 @@ */ public class DeleteStatement extends AbstractRestrictableStatement { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DeleteStatement.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, DeleteStatement.class.getName()); /** * @see org.hibernate.hql.ast.tree.Statement#getStatementType() @@ -58,7 +57,7 @@ protected int getWhereClauseParentTokenType() { } @Override - protected Logger getLog() { + protected HibernateLogger getLog() { return LOG; } } diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DisplayableNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DisplayableNode.java index c33dea8f2c..6a7558898d 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DisplayableNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DisplayableNode.java @@ -24,6 +24,7 @@ */ package org.hibernate.hql.ast.tree; + /** * Implementors will return additional display text, which will be used * by the ASTPrinter to display information (besides the node type and node diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java index 1d006d1188..e44ea24d73 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java @@ -23,8 +23,7 @@ * */ package org.hibernate.hql.ast.tree; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.QueryException; import org.hibernate.engine.JoinSequence; import org.hibernate.hql.CollectionProperties; @@ -38,6 +37,7 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; import antlr.SemanticException; import antlr.collections.AST; @@ -68,7 +68,7 @@ public QueryException buildIllegalCollectionDereferenceException(String property public static IllegalCollectionDereferenceExceptionBuilder ILLEGAL_COLL_DEREF_EXCP_BUILDER = DEF_ILLEGAL_COLL_DEREF_EXCP_BUILDER; /////////////////////////////////////////////////////////////////////////// - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, DotNode.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, DotNode.class.getName()); private static final int DEREF_UNKNOWN = 0; private static final int DEREF_ENTITY = 1; @@ -302,7 +302,7 @@ private void dereferenceCollection(CollectionType collectionType, boolean implic ); FromElement elem = factory.createCollection( queryableCollection, role, joinType, fetch, indexed ); - LOG.debug("dereferenceCollection() : Created new FROM element for " + propName + " : " + elem); + LOG.debugf("dereferenceCollection() : Created new FROM element for %s : %s", propName, elem); setImpliedJoin( elem ); setFromElement( elem ); // This 'dot' expression now refers to the resulting from element. @@ -383,10 +383,11 @@ private boolean isDotNode(AST n) { private void dereferenceEntityJoin(String classAlias, EntityType propertyType, boolean impliedJoin, AST parent) throws SemanticException { dereferenceType = DEREF_ENTITY; - if (LOG.isDebugEnabled()) LOG.debug("dereferenceEntityJoin() : generating join for " + propertyName + " in " - + getFromElement().getClassName() + " (" - + (classAlias == null ? "" : classAlias) + ") parent = " - + ASTUtil.getDebugString(parent)); + if (LOG.isDebugEnabled()) LOG.debugf("dereferenceEntityJoin() : generating join for %s in %s (%s) parent = %s", + propertyName, + getFromElement().getClassName(), + classAlias == null ? "" : classAlias, + ASTUtil.getDebugString(parent)); // Create a new FROM node for the referenced class. String associatedEntityName = propertyType.getAssociatedEntityName(); String tableAlias = getAliasGenerator().createName( associatedEntityName ); @@ -521,23 +522,17 @@ private boolean isReferenceToPrimaryKey(String propertyName, EntityType owningTy // only the identifier property field name can be a reference to the associated entity's PK... return propertyName.equals( persister.getIdentifierPropertyName() ) && owningType.isReferenceToPrimaryKey(); } - else { - // here, we have two possibilities: - // 1) the property-name matches the explicitly identifier property name - // 2) the property-name matches the implicit 'id' property name - if ( EntityPersister.ENTITY_ID.equals( propertyName ) ) { - // the referenced node text is the special 'id' - return owningType.isReferenceToPrimaryKey(); - } - else { - String keyPropertyName = getSessionFactoryHelper().getIdentifierOrUniqueKeyPropertyName( owningType ); - return keyPropertyName != null && keyPropertyName.equals( propertyName ) && owningType.isReferenceToPrimaryKey(); - } - } + // here, we have two possibilities: + // 1) the property-name matches the explicitly identifier property name + // 2) the property-name matches the implicit 'id' property name + // the referenced node text is the special 'id' + if (EntityPersister.ENTITY_ID.equals(propertyName)) return owningType.isReferenceToPrimaryKey(); + String keyPropertyName = getSessionFactoryHelper().getIdentifierOrUniqueKeyPropertyName(owningType); + return keyPropertyName != null && keyPropertyName.equals(propertyName) && owningType.isReferenceToPrimaryKey(); } private void checkForCorrelatedSubquery(String methodName) { - if (isCorrelatedSubselect()) LOG.debug(methodName + "() : correlated subquery"); + if (isCorrelatedSubselect()) LOG.debugf("%s() : correlated subquery", methodName); } private boolean isCorrelatedSubselect() { @@ -558,8 +553,9 @@ private void dereferenceComponent(AST parent) { private void dereferenceEntityIdentifier(String propertyName, DotNode dotParent) { // special shortcut for id properties, skip the join! // this must only occur at the _end_ of a path expression - LOG.debug("dereferenceShortcut() : property " + propertyName + " in " + getFromElement().getClassName() - + " does not require a join."); + LOG.debugf("dereferenceShortcut() : property %s in %s does not require a join.", + propertyName, + getFromElement().getClassName()); initText(); setPropertyNameAndPath( dotParent ); // Set the unresolved path in this node and the parent. @@ -579,8 +575,8 @@ private void setPropertyNameAndPath(AST parent) { propertyName = rhs.getText(); propertyPath = propertyPath + "." + propertyName; // Append the new property name onto the unresolved path. dotNode.propertyPath = propertyPath; - LOG.debug("Unresolved property path is now '" + dotNode.propertyPath + "'"); - } else LOG.debug("Terminal propertyPath = [" + propertyPath + "]"); + LOG.debugf("Unresolved property path is now '%s'", dotNode.propertyPath); + } else LOG.debugf("Terminal propertyPath = [%s]", propertyPath); } @Override @@ -590,7 +586,7 @@ public Type getDataType() { if (fromElement == null) return null; // If the lhs is a collection, use CollectionPropertyMapping Type propertyType = fromElement.getPropertyType( propertyName, propertyPath ); - LOG.debug("getDataType() : " + propertyPath + " -> " + propertyType); + LOG.debugf("getDataType() : %s -> %s", propertyPath, propertyType); super.setDataType( propertyType ); } return super.getDataType(); diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ExpectedTypeAwareNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ExpectedTypeAwareNode.java index 67248df653..f6d749a3bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ExpectedTypeAwareNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ExpectedTypeAwareNode.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; - +package org.hibernate.hql.ast.tree; import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java index eed3446942..098b955f41 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -31,10 +30,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.ast.util.ASTIterator; import org.hibernate.hql.ast.util.ASTUtil; +import org.jboss.logging.Logger; import antlr.SemanticException; import antlr.collections.AST; @@ -45,8 +45,7 @@ */ public class FromClause extends HqlSqlWalkerNode implements HqlSqlTokenTypes, DisplayableNode { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - FromClause.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, FromClause.class.getName()); public static final int ROOT_LEVEL = 1; private int level = ROOT_LEVEL; @@ -277,7 +276,7 @@ FromElement findJoinByPathLocal(String path) { } void addJoinByPathMap(String path, FromElement destination) { - LOG.debug("addJoinByPathMap() : " + path + " -> " + destination.getDisplayText()); + LOG.debugf("addJoinByPathMap() : %s -> %s", path, destination.getDisplayText()); fromElementsByPath.put( path, destination ); } @@ -347,7 +346,7 @@ public FromClause locateChildFromClauseWithJoinByPath(String path) { } public void promoteJoin(FromElement elem) { - LOG.debug("Promoting [" + elem + "] to [" + this + "]"); + LOG.debugf("Promoting [%s] to [%s]", elem, this); //TODO: implement functionality // this might be painful to do here, as the "join post processing" for // the subquery has already been performed (meaning that for @@ -363,7 +362,7 @@ public boolean isSubQuery() { } void addCollectionJoinFromElementByPath(String path, FromElement destination) { - LOG.debug("addCollectionJoinFromElementByPath() : " + path + " -> " + destination); + LOG.debugf("addCollectionJoinFromElementByPath() : %s -> %s", path, destination); collectionJoinFromElementsByPath.put( path, destination ); // Add the new node to the map so that we don't create it twice. } diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java index 19569187b8..fcbd87516c 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java @@ -23,11 +23,10 @@ * */ package org.hibernate.hql.ast.tree; - import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.QueryException; import org.hibernate.engine.JoinSequence; import org.hibernate.hql.CollectionProperties; @@ -45,6 +44,7 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Represents a single mapped class mentioned in an HQL FROM clause. Each @@ -60,8 +60,7 @@ */ public class FromElement extends HqlSqlWalkerNode implements DisplayableNode, ParameterContainer { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - FromElement.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, FromElement.class.getName()); private String className; private String classAlias; @@ -152,7 +151,7 @@ private void doInitialize(FromClause fromClause, String tableAlias, String class this.elementType = new FromElementType( this, persister, type ); // Register the FromElement with the FROM clause, now that we have the names and aliases. fromClause.registerFromElement( this ); - LOG.debug(fromClause + " : " + className + " (" + (classAlias == null ? "" : classAlias) + ") -> " + tableAlias); + LOG.debugf("%s : %s (%s) -> %s", fromClause, className, classAlias == null ? "" : classAlias, tableAlias); } public EntityPersister getEntityPersister() { diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java index 393f903693..3e4829a053 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java @@ -23,8 +23,7 @@ * */ package org.hibernate.hql.ast.tree; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.JoinSequence; import org.hibernate.hql.antlr.SqlTokenTypes; import org.hibernate.hql.ast.util.ASTUtil; @@ -42,6 +41,7 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; import antlr.ASTFactory; import antlr.SemanticException; import antlr.collections.AST; @@ -53,8 +53,7 @@ */ public class FromElementFactory implements SqlTokenTypes { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - FromElementFactory.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, FromElementFactory.class.getName()); private FromClause fromClause; private FromElement origin; @@ -125,7 +124,7 @@ private FromElement createFromElementInSubselect( String pathAlias, FromElement parentFromElement, String classAlias) throws SemanticException { - LOG.debug("createFromElementInSubselect() : path = " + path); + LOG.debugf("createFromElementInSubselect() : path = %s", path); // Create an DotNode AST for the path and resolve it. FromElement fromElement = evaluateFromElementPath( path, classAlias ); EntityPersister entityPersister = fromElement.getEntityPersister(); @@ -144,7 +143,7 @@ private FromElement createFromElementInSubselect( // If the from element isn't in the same clause, create a new from element. if ( fromElement.getFromClause() != fromClause ) { - LOG.debug("createFromElementInSubselect() : creating a new FROM element..."); + LOG.debugf("createFromElementInSubselect() : creating a new FROM element..."); fromElement = createFromElement( entityPersister ); initializeAndAddFromElement( fromElement, path, @@ -154,7 +153,7 @@ private FromElement createFromElementInSubselect( tableAlias ); } - LOG.debug("createFromElementInSubselect() : " + path + " -> " + fromElement); + LOG.debugf("createFromElementInSubselect() : %s -> %s", path, fromElement); return fromElement; } @@ -253,7 +252,7 @@ FromElement createEntityJoin( EntityPersister entityPersister = elem.getEntityPersister(); int numberOfTables = entityPersister.getQuerySpaces().length; if ( numberOfTables > 1 && implied && !elem.useFromFragment() ) { - LOG.debug("createEntityJoin() : Implied multi-table entity join"); + LOG.debugf("createEntityJoin() : Implied multi-table entity join"); elem.setUseFromFragment( true ); } @@ -372,14 +371,16 @@ private FromElement createEntityAssociation( String associatedEntityName = entityPersister.getEntityName(); // Get the class name of the associated entity. if ( queryableCollection.isOneToMany() ) { - LOG.debug("createEntityAssociation() : One to many - path = " + path + " role = " + role + " associatedEntityName = " - + associatedEntityName); + LOG.debugf("createEntityAssociation() : One to many - path = %s role = %s associatedEntityName = %s", + path, + role, + associatedEntityName); JoinSequence joinSequence = createJoinSequence( roleAlias, joinType ); elem = createJoin( associatedEntityName, roleAlias, joinSequence, ( EntityType ) queryableCollection.getElementType(), false ); } else { - LOG.debug("createManyToMany() : path = " + path + " role = " + role + " associatedEntityName = " + associatedEntityName); + LOG.debugf("createManyToMany() : path = %s role = %s associatedEntityName = %s", path, role, associatedEntityName); elem = createManyToMany( role, associatedEntityName, roleAlias, entityPersister, ( EntityType ) queryableCollection.getElementType(), joinType ); fromClause.getWalker().addQuerySpaces( queryableCollection.getCollectionSpaces() ); diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java index 17c2cca4c9..d8b2fe5377 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java @@ -23,10 +23,9 @@ * */ package org.hibernate.hql.ast.tree; - import java.util.List; import java.util.Map; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.engine.JoinSequence; @@ -45,6 +44,7 @@ import org.hibernate.type.EntityType; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; +import org.jboss.logging.Logger; /** * Delegate that handles the type and join sequence information for a FromElement. @@ -53,8 +53,7 @@ */ class FromElementType { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - FromElementType.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, FromElementType.class.getName()); private FromElement fromElement; private EntityType entityType; @@ -340,7 +339,7 @@ String[] toColumns(String tableAlias, String path, boolean inSelect, boolean for enabledFilters, propertyMapping.toColumns( tableAlias, path ) ); - LOG.debug("toColumns(" + tableAlias + "," + path + ") : subquery = " + subquery); + LOG.debugf("toColumns(%s,%s) : subquery = %s", tableAlias, path, subquery); return new String[]{"(" + subquery + ")"}; } if (forceAlias) { diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java index 738f1442f7..d5935a30b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java @@ -23,8 +23,8 @@ * */ package org.hibernate.hql.ast.tree; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; +import org.jboss.logging.Logger; import antlr.SemanticException; import antlr.collections.AST; @@ -36,8 +36,7 @@ public abstract class FromReferenceNode extends AbstractSelectExpression implements ResolvableNode, DisplayableNode, InitializeableNode, PathNode { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - FromReferenceNode.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, FromReferenceNode.class.getName()); private FromElement fromElement; private boolean resolved = false; @@ -70,7 +69,7 @@ public boolean isResolved() { public void setResolved() { this.resolved = true; - LOG.debug("Resolved : " + this.getPath() + " -> " + this.getText()); + LOG.debugf("Resolved : %s -> %s", this.getPath(), this.getText()); } public String getDisplayText() { diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FunctionNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FunctionNode.java index 931641b665..8821a7ee13 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FunctionNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FunctionNode.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast.tree; - import org.hibernate.dialect.function.SQLFunction; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/HqlSqlWalkerNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/HqlSqlWalkerNode.java index 02d809795f..1472fcc4f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/HqlSqlWalkerNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/HqlSqlWalkerNode.java @@ -23,11 +23,9 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.hql.ast.HqlSqlWalker; import org.hibernate.hql.ast.util.AliasGenerator; import org.hibernate.hql.ast.util.SessionFactoryHelper; - import antlr.ASTFactory; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IdentNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IdentNode.java index 3da42e6d99..ec5ee78beb 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IdentNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IdentNode.java @@ -23,9 +23,7 @@ * */ package org.hibernate.hql.ast.tree; - -import antlr.SemanticException; -import antlr.collections.AST; +import java.util.List; import org.hibernate.QueryException; import org.hibernate.dialect.function.SQLFunction; import org.hibernate.hql.antlr.SqlTokenTypes; @@ -36,8 +34,8 @@ import org.hibernate.type.CollectionType; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; - -import java.util.List; +import antlr.SemanticException; +import antlr.collections.AST; /** * Represents an identifier all by itself, which may be a function name, diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ImpliedFromElement.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ImpliedFromElement.java index 66a38de211..5b3255f166 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ImpliedFromElement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ImpliedFromElement.java @@ -24,6 +24,7 @@ */ package org.hibernate.hql.ast.tree; + /** * Represents a FROM element implied by a path expression or a collection reference. * diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InLogicOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InLogicOperatorNode.java index 5475d01413..9bf8b6b091 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InLogicOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InLogicOperatorNode.java @@ -23,18 +23,15 @@ * */ package org.hibernate.hql.ast.tree; - import java.util.ArrayList; import java.util.List; - -import antlr.SemanticException; -import antlr.collections.AST; - import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.antlr.HqlTokenTypes; import org.hibernate.param.ParameterSpecification; import org.hibernate.type.Type; +import antlr.SemanticException; +import antlr.collections.AST; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java index bdf31250ae..60b6e52691 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java @@ -23,12 +23,11 @@ * */ package org.hibernate.hql.ast.tree; - import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Iterator; import java.util.List; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.QueryException; import org.hibernate.engine.JoinSequence; import org.hibernate.engine.QueryParameters; @@ -39,6 +38,7 @@ import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.CollectionType; import org.hibernate.type.Type; +import org.jboss.logging.Logger; import antlr.RecognitionException; import antlr.SemanticException; import antlr.collections.AST; @@ -50,8 +50,7 @@ */ public class IndexNode extends FromReferenceNode { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - IndexNode.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, IndexNode.class.getName()); public void setScalarColumnText(int i) throws SemanticException { throw new UnsupportedOperationException( "An IndexNode cannot generate column text!" ); @@ -68,7 +67,7 @@ public void prepareForDot(String propertyName) throws SemanticException { FromReferenceNode collectionNode = ( FromReferenceNode ) getFirstChild(); String path = collectionNode.getPath() + "[]." + propertyName; - LOG.debug("Creating join for many-to-many elements for " + path); + LOG.debugf("Creating join for many-to-many elements for %s", path); FromElementFactory factory = new FromElementFactory( fromElement.getFromClause(), fromElement, path ); // This will add the new from element to the origin. FromElement elementJoin = factory.createElementJoin( queryableCollection ); @@ -109,8 +108,8 @@ public void resolve(boolean generateJoin, boolean implicitJoin, String classAlia if ( elem == null ) { FromElementFactory factory = new FromElementFactory( fromClause, fromElement, path ); elem = factory.createCollectionElementsJoin( queryableCollection, elementTable ); - LOG.debug("No FROM element found for the elements of collection join path " + path + ", created " + elem); - } else LOG.debug("FROM element found for collection join path " + path); + LOG.debugf("No FROM element found for the elements of collection join path %s, created %s", path, elem); + } else LOG.debugf("FROM element found for collection join path %s", path); // The 'from element' that represents the elements of the collection. setFromElement( fromElement ); diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InitializeableNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InitializeableNode.java index 9fa0fe6dea..c10604e5ba 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InitializeableNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InitializeableNode.java @@ -24,6 +24,7 @@ */ package org.hibernate.hql.ast.tree; + /** * An interface for initializeable AST nodes. */ diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InsertStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InsertStatement.java index b2c417afa6..7c89c581f4 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InsertStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/InsertStatement.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.QueryException; import org.hibernate.hql.antlr.HqlSqlTokenTypes; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java index 83b8a8781b..47b6cf8c0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IntoClause.java @@ -23,16 +23,13 @@ * */ package org.hibernate.hql.ast.tree; - +import java.sql.Types; import java.util.ArrayList; import java.util.List; -import java.sql.Types; - import org.hibernate.QueryException; import org.hibernate.persister.entity.Queryable; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; - import antlr.collections.AST; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNotNullLogicOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNotNullLogicOperatorNode.java index a217975c76..eaa1e021a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNotNullLogicOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNotNullLogicOperatorNode.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.hql.antlr.HqlSqlTokenTypes; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNullLogicOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNullLogicOperatorNode.java index 6e29b04018..fa85713754 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNullLogicOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IsNullLogicOperatorNode.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.hql.antlr.HqlSqlTokenTypes; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/JavaConstantNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/JavaConstantNode.java index 1de22ac63b..c53665dc81 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/JavaConstantNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/JavaConstantNode.java @@ -22,17 +22,15 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; - -import org.hibernate.type.Type; -import org.hibernate.type.TypeFactory; +package org.hibernate.hql.ast.tree; +import org.hibernate.QueryException; +import org.hibernate.dialect.Dialect; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.hql.QueryTranslator; import org.hibernate.type.LiteralType; +import org.hibernate.type.Type; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.dialect.Dialect; -import org.hibernate.QueryException; -import org.hibernate.hql.QueryTranslator; /** * A node representing a static Java constant. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/LiteralNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/LiteralNode.java index e300821b2f..373d027017 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/LiteralNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/LiteralNode.java @@ -23,12 +23,10 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.Hibernate; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.ast.util.ColumnHelper; import org.hibernate.type.Type; - import antlr.SemanticException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapEntryNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapEntryNode.java index bb41c8696c..e1485a03f4 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapEntryNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapEntryNode.java @@ -20,26 +20,23 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast.tree; - import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Iterator; - -import antlr.SemanticException; - import org.hibernate.HibernateException; -import org.hibernate.sql.SelectExpression; -import org.hibernate.sql.AliasGenerator; -import org.hibernate.sql.SelectFragment; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.NameGenerator; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.Queryable; +import org.hibernate.sql.AliasGenerator; +import org.hibernate.sql.SelectExpression; +import org.hibernate.sql.SelectFragment; import org.hibernate.transform.BasicTransformerAdapter; import org.hibernate.transform.ResultTransformer; -import org.hibernate.type.Type; import org.hibernate.type.EntityType; +import org.hibernate.type.Type; +import antlr.SemanticException; /** * TODO : javadoc diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapKeyNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapKeyNode.java index 5d318624cc..547540813b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapKeyNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapKeyNode.java @@ -20,9 +20,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast.tree; - -import org.hibernate.type.Type; import org.hibernate.persister.collection.QueryableCollection; +import org.hibernate.type.Type; /** * TODO : javadoc diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapValueNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapValueNode.java index 9897d674f6..280a1d7478 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapValueNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MapValueNode.java @@ -20,9 +20,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast.tree; - -import org.hibernate.type.Type; import org.hibernate.persister.collection.QueryableCollection; +import org.hibernate.type.Type; /** * TODO : javadoc diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java index 2c2ecd20c7..56990ff8d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java @@ -23,9 +23,8 @@ * */ package org.hibernate.hql.ast.tree; - import java.util.Arrays; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.dialect.function.SQLFunction; import org.hibernate.hql.CollectionProperties; import org.hibernate.hql.antlr.SqlTokenTypes; @@ -35,6 +34,7 @@ import org.hibernate.persister.collection.CollectionPropertyNames; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.Type; +import org.jboss.logging.Logger; import antlr.SemanticException; import antlr.collections.AST; @@ -45,8 +45,7 @@ */ public class MethodNode extends AbstractSelectExpression implements FunctionNode { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - MethodNode.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, MethodNode.class.getName()); private String methodName; private FromElement fromElement; @@ -143,7 +142,7 @@ private void collectionProperty(AST path, AST name) throws SemanticException { SqlNode expr = ( SqlNode ) path; Type type = expr.getDataType(); - LOG.debug("collectionProperty() : name=" + name + " type=" + type); + LOG.debugf("collectionProperty() : name=%s type=%s", name, type); resolveCollectionProperty( expr ); } @@ -205,7 +204,7 @@ private void handleElements(FromReferenceNode collectionNode, String propertyNam QueryableCollection queryableCollection = collectionFromElement.getQueryableCollection(); String path = collectionNode.getPath() + "[]." + propertyName; - LOG.debug("Creating elements for " + path); + LOG.debugf("Creating elements for %s", path); fromElement = collectionFromElement; if ( !collectionFromElement.isCollectionOfValuesOrComponents() ) { diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Node.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Node.java index fdb959836f..65c9956a18 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Node.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Node.java @@ -23,11 +23,10 @@ * */ package org.hibernate.hql.ast.tree; - -import antlr.collections.AST; -import antlr.Token; -import org.hibernate.util.StringHelper; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.util.StringHelper; +import antlr.Token; +import antlr.collections.AST; /** * Base node class for use by Hibernate within its AST trees. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OperatorNode.java index a7ddeea8fb..8cae87f43a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OperatorNode.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.type.Type; import antlr.SemanticException; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OrderByClause.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OrderByClause.java index 7519c98654..9265e0de5a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OrderByClause.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/OrderByClause.java @@ -23,10 +23,8 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.ast.util.ASTUtil; - import antlr.collections.AST; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterContainer.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterContainer.java index a5a935b302..77e4ae11b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterContainer.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.param.ParameterSpecification; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterNode.java index 4cadba0e5b..490158ab67 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ParameterNode.java @@ -23,10 +23,9 @@ * */ package org.hibernate.hql.ast.tree; - +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.param.ParameterSpecification; import org.hibernate.type.Type; -import org.hibernate.engine.SessionFactoryImplementor; /** * Implementation of ParameterNode. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/PathNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/PathNode.java index a5b74bba44..38400d3a6d 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/PathNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/PathNode.java @@ -24,6 +24,7 @@ */ package org.hibernate.hql.ast.tree; + /** * An AST node with a path property. This path property will be the fully qualified name. * diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java index 622c85324a..83b40f188c 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java @@ -23,13 +23,13 @@ * */ package org.hibernate.hql.ast.tree; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.antlr.SqlTokenTypes; import org.hibernate.hql.ast.util.ASTUtil; import org.hibernate.hql.ast.util.ColumnHelper; import org.hibernate.type.Type; +import org.jboss.logging.Logger; import antlr.SemanticException; import antlr.collections.AST; @@ -40,8 +40,7 @@ */ public class QueryNode extends AbstractRestrictableStatement implements SelectExpression { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - QueryNode.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, QueryNode.class.getName()); private OrderByClause orderByClause; private int scalarColumnIndex = -1; @@ -66,7 +65,7 @@ protected int getWhereClauseParentTokenType() { } @Override - protected Logger getLog() { + protected HibernateLogger getLog() { return LOG; } @@ -98,7 +97,7 @@ public final OrderByClause getOrderByClause() { // if there is no order by, make one if ( orderByClause == null ) { - LOG.debug("getOrderByClause() : Creating a new ORDER BY clause"); + LOG.debugf("getOrderByClause() : Creating a new ORDER BY clause"); orderByClause = ( OrderByClause ) ASTUtil.create( getWalker().getASTFactory(), SqlTokenTypes.ORDER, "ORDER" ); // Find the WHERE; if there is no WHERE, find the FROM... diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResolvableNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResolvableNode.java index 249a42ea4c..12d9d28b14 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResolvableNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResolvableNode.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/RestrictableStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/RestrictableStatement.java index 25010108e5..e7e0c8e876 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/RestrictableStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/RestrictableStatement.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import antlr.collections.AST; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResultVariableRefNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResultVariableRefNode.java index 154a644c98..45f08547b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResultVariableRefNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/ResultVariableRefNode.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.hql.ast.tree; - -import antlr.SemanticException; - import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.util.StringHelper; +import antlr.SemanticException; /** * Represents a reference to a result_variable as defined in the JPA 2 spec. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java index 3f2c09c6f4..9d710b4512 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectClause.java @@ -23,19 +23,15 @@ * */ package org.hibernate.hql.ast.tree; - import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; - +import org.hibernate.QueryException; import org.hibernate.hql.antlr.SqlTokenTypes; import org.hibernate.hql.ast.util.ASTAppender; import org.hibernate.hql.ast.util.ASTIterator; import org.hibernate.hql.ast.util.ASTPrinter; import org.hibernate.type.Type; -import org.hibernate.QueryException; - import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpression.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpression.java index 74c1979f9f..0bb0cbf1bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpression.java @@ -23,9 +23,7 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.type.Type; - import antlr.SemanticException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionImpl.java index dc93007171..612fbb792a 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionImpl.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionList.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionList.java index 7c2eb45fe8..d7079cabf7 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionList.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SelectExpressionList.java @@ -23,12 +23,9 @@ * */ package org.hibernate.hql.ast.tree; - import java.util.ArrayList; - import org.hibernate.hql.antlr.SqlTokenTypes; import org.hibernate.hql.ast.util.ASTPrinter; - import antlr.collections.AST; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SessionFactoryAwareNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SessionFactoryAwareNode.java index 5a1884563e..a7348a6b82 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SessionFactoryAwareNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SessionFactoryAwareNode.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.hql.ast.tree; - +package org.hibernate.hql.ast.tree; import org.hibernate.engine.SessionFactoryImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlFragment.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlFragment.java index 49b4fba7af..60474f68f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlFragment.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlFragment.java @@ -23,12 +23,10 @@ * */ package org.hibernate.hql.ast.tree; - -import java.util.List; import java.util.ArrayList; - -import org.hibernate.sql.JoinFragment; +import java.util.List; import org.hibernate.param.ParameterSpecification; +import org.hibernate.sql.JoinFragment; /** * Represents an SQL fragment in the AST. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlNode.java index 16d50710c1..a2a3a0a78c 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/SqlNode.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Statement.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Statement.java index 724a74cfe5..fa60622d71 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Statement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/Statement.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.tree; - import org.hibernate.hql.ast.HqlSqlWalker; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryArithmeticNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryArithmeticNode.java index c0dcc2a8a5..3458e11dd8 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryArithmeticNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryArithmeticNode.java @@ -25,10 +25,8 @@ //$Id: UnaryArithmeticNode.java 8407 2005-10-14 17:23:18Z steveebersole $ package org.hibernate.hql.ast.tree; - import org.hibernate.hql.ast.util.ColumnHelper; import org.hibernate.type.Type; - import antlr.SemanticException; public class UnaryArithmeticNode extends AbstractSelectExpression implements UnaryOperatorNode { diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryLogicOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryLogicOperatorNode.java index 9499ec6e92..2aea842231 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryLogicOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryLogicOperatorNode.java @@ -23,9 +23,8 @@ * */ package org.hibernate.hql.ast.tree; - -import org.hibernate.type.Type; import org.hibernate.Hibernate; +import org.hibernate.type.Type; /** * Represents a unary operator node. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryOperatorNode.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryOperatorNode.java index 8810aa3934..74f309b4f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryOperatorNode.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UnaryOperatorNode.java @@ -24,6 +24,7 @@ */ package org.hibernate.hql.ast.tree; + /** * Contract for nodes representing unary operators. * diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java index f2d7c5d4ae..870e9e072e 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java @@ -23,11 +23,11 @@ * */ package org.hibernate.hql.ast.tree; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.antlr.SqlTokenTypes; import org.hibernate.hql.ast.util.ASTUtil; +import org.jboss.logging.Logger; import antlr.collections.AST; /** @@ -37,8 +37,7 @@ */ public class UpdateStatement extends AbstractRestrictableStatement { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - UpdateStatement.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, UpdateStatement.class.getName()); /** * @see org.hibernate.hql.ast.tree.Statement#getStatementType() @@ -60,7 +59,7 @@ protected int getWhereClauseParentTokenType() { } @Override - protected Logger getLog() { + protected HibernateLogger getLog() { return LOG; } diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTAppender.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTAppender.java index 2c26ba0447..c4933480fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTAppender.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTAppender.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.util; - import antlr.ASTFactory; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTIterator.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTIterator.java index 4cf2b68e75..b42fb4f5b4 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTIterator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTIterator.java @@ -23,10 +23,8 @@ * */ package org.hibernate.hql.ast.util; - import java.util.Iterator; import java.util.LinkedList; - import antlr.collections.AST; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTParentsFirstIterator.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTParentsFirstIterator.java index 224586be46..5f70e033dd 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTParentsFirstIterator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTParentsFirstIterator.java @@ -23,10 +23,8 @@ * */ package org.hibernate.hql.ast.util; - import java.util.Iterator; import java.util.LinkedList; - import antlr.collections.AST; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTPrinter.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTPrinter.java index d11ae9d1e2..8c692f77f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTPrinter.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTPrinter.java @@ -23,16 +23,13 @@ * */ package org.hibernate.hql.ast.util; - import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Map; - import org.hibernate.hql.ast.tree.DisplayableNode; import org.hibernate.util.StringHelper; - import antlr.collections.AST; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTUtil.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTUtil.java index 8febf2b3dd..2b9c5ea384 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTUtil.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ASTUtil.java @@ -23,14 +23,12 @@ * */ package org.hibernate.hql.ast.util; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; import java.lang.reflect.Field; import java.lang.reflect.Modifier; - +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import antlr.ASTFactory; import antlr.collections.AST; import antlr.collections.impl.ASTArray; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/AliasGenerator.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/AliasGenerator.java index fa27c43bf4..79ebd13f43 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/AliasGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/AliasGenerator.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.util; - import org.hibernate.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ColumnHelper.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ColumnHelper.java index f59296154f..42ffe9c426 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ColumnHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/ColumnHelper.java @@ -23,11 +23,9 @@ * */ package org.hibernate.hql.ast.util; - import org.hibernate.hql.NameGenerator; import org.hibernate.hql.antlr.SqlTokenTypes; import org.hibernate.hql.ast.tree.HqlSqlWalkerNode; - import antlr.ASTFactory; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java index f6ecb72033..1e844b0cd4 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.ast.util; - import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -31,7 +30,7 @@ import java.util.ListIterator; import java.util.StringTokenizer; import org.hibernate.AssertionFailure; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.dialect.Dialect; import org.hibernate.engine.JoinSequence; import org.hibernate.engine.LoadQueryInfluencers; @@ -49,6 +48,7 @@ import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Performs the post-processing of the join information gathered during semantic analysis. @@ -59,8 +59,7 @@ */ public class JoinProcessor implements SqlTokenTypes { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - JoinProcessor.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, JoinProcessor.class.getName()); private final HqlSqlWalker walker; private final SyntheticAndFactory syntheticAndFactory; @@ -170,7 +169,7 @@ private void addJoinNodes(QueryNode query, JoinSequence join, FromElement fromEl // If there is a FROM fragment and the FROM element is an explicit, then add the from part. if ( fromElement.useFromFragment() /*&& StringHelper.isNotEmpty( frag )*/ ) { String fromFragment = processFromFragment( frag, join ).trim(); - LOG.debug("Using FROM fragment [" + fromFragment + "]"); + LOG.debugf("Using FROM fragment [%s]", fromFragment); processDynamicFilterParameters( fromFragment, fromElement, diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java index dce48f51f1..b57954431b 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java @@ -23,12 +23,11 @@ * */ package org.hibernate.hql.ast.util; - import java.math.BigDecimal; import java.math.BigInteger; import java.text.DecimalFormat; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.dialect.Dialect; @@ -45,6 +44,7 @@ import org.hibernate.type.LiteralType; import org.hibernate.type.Type; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; import antlr.SemanticException; import antlr.collections.AST; @@ -72,8 +72,7 @@ public class LiteralProcessor implements HqlSqlTokenTypes { */ public static int DECIMAL_LITERAL_FORMAT = EXACT; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - LiteralProcessor.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, LiteralProcessor.class.getName()); private HqlSqlWalker walker; @@ -132,7 +131,7 @@ public void lookupConstant(DotNode node) throws SemanticException { } private void setSQLValue(DotNode node, String text, String value) { - LOG.debug("setSQLValue() " + text + " -> " + value); + LOG.debugf("setSQLValue() %s -> %s", text, value); node.setFirstChild( null ); // Chop off the rest of the tree. node.setType( SqlTokenTypes.SQL_TOKEN ); node.setText(value); @@ -140,7 +139,7 @@ private void setSQLValue(DotNode node, String text, String value) { } private void setConstantValue(DotNode node, String text, Object value) { - LOG.debug("setConstantValue() " + text + " -> " + value + " " + value.getClass().getName()); + LOG.debugf("setConstantValue() %s -> %s %s", text, value, value.getClass().getName()); node.setFirstChild( null ); // Chop off the rest of the tree. if ( value instanceof String ) { node.setType( SqlTokenTypes.QUOTED_STRING ); @@ -208,7 +207,7 @@ public void processBoolean(AST constant) { private void processLiteral(AST constant) { String replacement = ( String ) walker.getTokenReplacements().get( constant.getText() ); if ( replacement != null ) { - LOG.debug("processConstant() : Replacing '" + constant.getText() + "' with '" + replacement + "'"); + LOG.debugf("processConstant() : Replacing '%s' with '%s'", constant.getText(), replacement); constant.setText( replacement ); } } diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/NodeTraverser.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/NodeTraverser.java index b37a7667b3..217bbda144 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/NodeTraverser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/NodeTraverser.java @@ -23,9 +23,8 @@ * */ package org.hibernate.hql.ast.util; - -import antlr.collections.AST; import java.util.Stack; +import antlr.collections.AST; /** * A visitor for traversing an AST tree. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java index fb4045f3bc..2930ef1443 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java @@ -23,10 +23,10 @@ * */ package org.hibernate.hql.ast.util; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; import antlr.ASTFactory; import antlr.collections.AST; @@ -37,8 +37,7 @@ */ public final class PathHelper { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - PathHelper.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, PathHelper.class.getName()); private PathHelper() { } @@ -63,7 +62,7 @@ public static AST parsePath(String path, ASTFactory factory) { lhs = ASTUtil.createBinarySubtree( factory, HqlSqlTokenTypes.DOT, ".", lhs, child ); } } - if (LOG.isDebugEnabled()) LOG.debug("parsePath() : " + path + " -> " + ASTUtil.getDebugString(lhs)); + if (LOG.isDebugEnabled()) LOG.debugf("parsePath() : %s -> %s", path, ASTUtil.getDebugString(lhs)); return lhs; } diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SessionFactoryHelper.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SessionFactoryHelper.java index f31c5abe8e..8cd8755c93 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SessionFactoryHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SessionFactoryHelper.java @@ -23,10 +23,8 @@ * */ package org.hibernate.hql.ast.util; - import java.util.HashMap; import java.util.Map; - import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.dialect.function.SQLFunction; @@ -46,7 +44,6 @@ import org.hibernate.type.CollectionType; import org.hibernate.type.EntityType; import org.hibernate.type.Type; - import antlr.SemanticException; import antlr.collections.AST; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java index 0ede92ce5f..da751d3db8 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java @@ -23,9 +23,8 @@ * */ package org.hibernate.hql.ast.util; - import java.util.Map; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.hql.antlr.HqlSqlTokenTypes; import org.hibernate.hql.ast.HqlSqlWalker; import org.hibernate.hql.ast.tree.FromElement; @@ -38,6 +37,7 @@ import org.hibernate.sql.JoinFragment; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; import antlr.collections.AST; /** @@ -47,8 +47,7 @@ */ public class SyntheticAndFactory implements HqlSqlTokenTypes { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SyntheticAndFactory.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SyntheticAndFactory.class.getName()); private HqlSqlWalker hqlSqlWalker; private AST thetaJoins; @@ -87,7 +86,7 @@ public void addWhereFragment( whereFragment = whereFragment.substring( 4 ); } - LOG.debug("Using unprocessed WHERE-fragment [" + whereFragment + "]"); + LOG.debugf("Using unprocessed WHERE-fragment [%s]", whereFragment); SqlFragment fragment = ( SqlFragment ) create( SQL_TOKEN, whereFragment ); fragment.setJoinFragment( joinFragment ); @@ -118,7 +117,7 @@ public void addWhereFragment( hqlSqlWalker ); - LOG.debug("Using processed WHERE-fragment [" + fragment.getText() + "]"); + LOG.debugf("Using processed WHERE-fragment [%s]", fragment.getText()); // Filter conditions need to be inserted before the HQL where condition and the // theta join node. This is because org.hibernate.loader.Loader binds the filter parameters first, diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/ClassicQueryTranslatorFactory.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/ClassicQueryTranslatorFactory.java index ea1807e617..2d459a867a 100755 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/ClassicQueryTranslatorFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/ClassicQueryTranslatorFactory.java @@ -23,14 +23,12 @@ * */ package org.hibernate.hql.classic; - +import java.util.Map; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.hql.FilterTranslator; import org.hibernate.hql.QueryTranslator; import org.hibernate.hql.QueryTranslatorFactory; -import java.util.Map; - /** * Generates translators which uses the older hand-written parser to perform * the translation. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/ClauseParser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/ClauseParser.java index 0fc2d2b9e9..5876e633cf 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/ClauseParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/ClauseParser.java @@ -23,12 +23,10 @@ * */ package org.hibernate.hql.classic; - -import org.hibernate.QueryException; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.hibernate.QueryException; /** * Parses the Hibernate query into its constituent clauses. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/FromParser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/FromParser.java index 6016317abb..20690e7fde 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/FromParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/FromParser.java @@ -23,15 +23,13 @@ * */ package org.hibernate.hql.classic; - +import java.util.HashMap; +import java.util.Map; import org.hibernate.QueryException; import org.hibernate.hql.QueryTranslator; import org.hibernate.persister.entity.Queryable; import org.hibernate.sql.JoinFragment; -import java.util.HashMap; -import java.util.Map; - /** * Parses the from clause of a hibernate query, looking for tables and * aliases for the SQL query. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/FromPathExpressionParser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/FromPathExpressionParser.java index 0b7938e667..10039c5a6f 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/FromPathExpressionParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/FromPathExpressionParser.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.classic; - import org.hibernate.QueryException; import org.hibernate.persister.collection.CollectionPropertyNames; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/GroupByParser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/GroupByParser.java index 6c8d783e72..21d49aa221 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/GroupByParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/GroupByParser.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.classic; - import org.hibernate.QueryException; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/HavingParser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/HavingParser.java index a232a1d430..1719943f89 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/HavingParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/HavingParser.java @@ -24,6 +24,7 @@ */ package org.hibernate.hql.classic; + /** * Parses the having clause of a hibernate query and translates it to an * SQL having clause. diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/OrderByParser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/OrderByParser.java index 40981f2163..0fa19b3fb7 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/OrderByParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/OrderByParser.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.classic; - import org.hibernate.QueryException; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/Parser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/Parser.java index f909373f45..e096366a29 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/Parser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/Parser.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.classic; - import org.hibernate.QueryException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/ParserHelper.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/ParserHelper.java index 4117e0000d..ac461a329c 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/ParserHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/ParserHelper.java @@ -23,12 +23,10 @@ * */ package org.hibernate.hql.classic; - +import java.util.StringTokenizer; import org.hibernate.QueryException; import org.hibernate.util.StringHelper; -import java.util.StringTokenizer; - public final class ParserHelper { public static final String HQL_VARIABLE_PREFIX = ":"; diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/PathExpressionParser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/PathExpressionParser.java index fc1621e667..a487efb0f1 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/PathExpressionParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/PathExpressionParser.java @@ -23,10 +23,8 @@ * */ package org.hibernate.hql.classic; - import java.util.LinkedList; import java.util.Map; - import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.engine.JoinSequence; @@ -41,7 +39,6 @@ import org.hibernate.type.CollectionType; import org.hibernate.type.EntityType; import org.hibernate.type.Type; -import org.hibernate.type.TypeFactory; /** * Parses an expression of the form foo.bar.baz and builds up an expression diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/PreprocessingParser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/PreprocessingParser.java index 2d7da27153..a9b4946f66 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/PreprocessingParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/PreprocessingParser.java @@ -23,14 +23,12 @@ * */ package org.hibernate.hql.classic; - -import org.hibernate.QueryException; -import org.hibernate.hql.CollectionProperties; -import org.hibernate.util.StringHelper; - import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.hibernate.QueryException; +import org.hibernate.hql.CollectionProperties; +import org.hibernate.util.StringHelper; /** * diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java index 976e2984c9..f6812e9f93 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.classic; - import java.io.Serializable; import java.lang.reflect.Constructor; import java.sql.PreparedStatement; @@ -39,9 +38,9 @@ import java.util.Map; import java.util.Set; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.Logger; import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.ScrollableResults; @@ -71,6 +70,7 @@ import org.hibernate.util.ArrayHelper; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * An instance of QueryTranslator translates a Hibernate @@ -78,8 +78,7 @@ */ public class QueryTranslatorImpl extends BasicLoader implements FilterTranslator { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - QueryTranslatorImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, QueryTranslatorImpl.class.getName()); private static final String[] NO_RETURN_ALIASES = new String[] {}; @@ -304,8 +303,8 @@ public String[][] getColumnNames() { private static void logQuery(String hql, String sql) { if (LOG.isDebugEnabled()) { - LOG.debug("HQL: " + hql); - LOG.debug("SQL: " + sql); + LOG.debugf("HQL: %s", hql); + LOG.debugf("SQL: %s", sql); } } @@ -329,12 +328,8 @@ public String getAliasName(String alias) { String unalias(String path) { String alias = StringHelper.root( path ); String name = getAliasName( alias ); - if ( name != null ) { - return name + path.substring( alias.length() ); - } - else { - return path; - } + if (name != null) return name + path.substring(alias.length()); + return path; } void addEntityToFetch(String name, String oneToOneOwnerName, AssociationType ownerAssociationType) { diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectParser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectParser.java index 84f6b678c8..5e87db08a9 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectParser.java @@ -23,7 +23,10 @@ * */ package org.hibernate.hql.classic; - +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; import org.hibernate.Hibernate; import org.hibernate.QueryException; import org.hibernate.dialect.function.SQLFunction; @@ -31,11 +34,6 @@ import org.hibernate.type.Type; import org.hibernate.util.ReflectHelper; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - /** * Parsers the select clause of a Hibernate query. * diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectPathExpressionParser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectPathExpressionParser.java index ef2928b357..f180c63004 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectPathExpressionParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/SelectPathExpressionParser.java @@ -23,7 +23,6 @@ * */ package org.hibernate.hql.classic; - import org.hibernate.QueryException; public class SelectPathExpressionParser extends PathExpressionParser { diff --git a/hibernate-core/src/main/java/org/hibernate/hql/classic/WhereParser.java b/hibernate-core/src/main/java/org/hibernate/hql/classic/WhereParser.java index 2b2c6c7a23..bbeb0b6b97 100644 --- a/hibernate-core/src/main/java/org/hibernate/hql/classic/WhereParser.java +++ b/hibernate-core/src/main/java/org/hibernate/hql/classic/WhereParser.java @@ -23,14 +23,12 @@ * */ package org.hibernate.hql.classic; - import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.Map; import java.util.Set; import java.util.StringTokenizer; - import org.hibernate.MappingException; import org.hibernate.QueryException; import org.hibernate.engine.JoinSequence; @@ -41,7 +39,6 @@ import org.hibernate.type.EntityType; import org.hibernate.type.LiteralType; import org.hibernate.type.Type; -import org.hibernate.type.TypeFactory; import org.hibernate.util.ReflectHelper; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java index 91ece2e705..743492a598 100755 --- a/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/AbstractPostInsertGenerator.java @@ -23,9 +23,7 @@ * */ package org.hibernate.id; - import java.io.Serializable; - import org.hibernate.engine.SessionImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java index 41b4b52b33..7847b52d14 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/AbstractUUIDGenerator.java @@ -23,7 +23,6 @@ * */ package org.hibernate.id; - import java.net.InetAddress; import org.hibernate.util.BytesHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/id/Assigned.java b/hibernate-core/src/main/java/org/hibernate/id/Assigned.java index db8d483439..a3f41cb1a1 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/Assigned.java +++ b/hibernate-core/src/main/java/org/hibernate/id/Assigned.java @@ -23,10 +23,8 @@ * */ package org.hibernate.id; - import java.io.Serializable; import java.util.Properties; - import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; diff --git a/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java index a39cde5879..26753b8386 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/CompositeNestedGeneratedValueGenerator.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; - import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/id/Configurable.java b/hibernate-core/src/main/java/org/hibernate/id/Configurable.java index ee3c20821e..257c062a4a 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/Configurable.java +++ b/hibernate-core/src/main/java/org/hibernate/id/Configurable.java @@ -23,9 +23,7 @@ * */ package org.hibernate.id; - import java.util.Properties; - import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/id/ForeignGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/ForeignGenerator.java index 7bd67bc5e8..b69e147c74 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/ForeignGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/ForeignGenerator.java @@ -23,10 +23,8 @@ * */ package org.hibernate.id; - import java.io.Serializable; import java.util.Properties; - import org.hibernate.MappingException; import org.hibernate.Session; import org.hibernate.TransientObjectException; diff --git a/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java index d00b133e2b..61f3620674 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java @@ -22,14 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.SessionImplementor; +import org.jboss.logging.Logger; /** * Generates string values using the SQL Server NEWID() function. @@ -38,8 +38,7 @@ */ public class GUIDGenerator implements IdentifierGenerator { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - GUIDGenerator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, GUIDGenerator.class.getName()); private static boolean warned = false; public GUIDGenerator() { diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerationException.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerationException.java index e0cc647438..0ee7737c2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerationException.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerationException.java @@ -23,7 +23,6 @@ * */ package org.hibernate.id; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java index 60b2a70426..188920f0b2 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java @@ -23,12 +23,10 @@ * */ package org.hibernate.id; - +import java.io.Serializable; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; -import java.io.Serializable; - /** * The general contract between a class that generates unique * identifiers and the Session. It is not intended that diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorAggregator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorAggregator.java index c4eba75830..a7ac0da791 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorAggregator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorAggregator.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.util.Map; /** diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java index c0dd9c4621..3e7dc6baa7 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java @@ -23,7 +23,6 @@ * */ package org.hibernate.id; - import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; @@ -31,9 +30,10 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.type.CustomType; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * Factory and helper methods for {@link IdentifierGenerator} framework. @@ -43,8 +43,8 @@ */ public final class IdentifierGeneratorHelper { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - IdentifierGeneratorHelper.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + IdentifierGeneratorHelper.class.getName()); /** * Marker object returned from {@link IdentifierGenerator#generate} to indicate that we should short-circuit any @@ -85,7 +85,7 @@ public static Serializable getGeneratedIdentity(ResultSet rs, Type type) throws throw new HibernateException( "The database returned no natively generated identity value" ); } final Serializable id = IdentifierGeneratorHelper.get( rs, type ); - LOG.debug("Natively generated identity: " + id); + LOG.debugf("Natively generated identity: %s", id); return id; } diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java index 65aa1e4b5f..e3c7f6ded9 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java @@ -23,21 +23,19 @@ * */ package org.hibernate.id; - import java.io.Serializable; +import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.PreparedStatement; - -import org.hibernate.engine.SessionImplementor; -import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; -import org.hibernate.id.insert.IdentifierGeneratingInsert; -import org.hibernate.id.insert.AbstractSelectingDelegate; -import org.hibernate.id.insert.AbstractReturningDelegate; -import org.hibernate.id.insert.InsertSelectIdentityInsert; -import org.hibernate.dialect.Dialect; -import org.hibernate.HibernateException; import org.hibernate.AssertionFailure; +import org.hibernate.HibernateException; +import org.hibernate.dialect.Dialect; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.id.insert.AbstractReturningDelegate; +import org.hibernate.id.insert.AbstractSelectingDelegate; +import org.hibernate.id.insert.IdentifierGeneratingInsert; +import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; +import org.hibernate.id.insert.InsertSelectIdentityInsert; /** * A generator for use with ANSI-SQL IDENTITY columns used as the primary key. diff --git a/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java index f3dbb9e650..bc8c8e32b4 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java @@ -22,14 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Properties; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.cfg.ObjectNameNormalizer; import org.hibernate.dialect.Dialect; @@ -37,6 +36,7 @@ import org.hibernate.mapping.Table; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * increment
@@ -53,8 +53,7 @@ */ public class IncrementGenerator implements IdentifierGenerator, Configurable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - IncrementGenerator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, IncrementGenerator.class.getName()); private Class returnClass; private String sql; @@ -119,7 +118,7 @@ public void configure(Type type, Properties params, Dialect dialect) throws Mapp private void initializePreviousValueHolder(SessionImplementor session) { previousValueHolder = IdentifierGeneratorHelper.getIntegralDataTypeHolder( returnClass ); - LOG.debug("Fetching initial value: " + sql); + LOG.debugf("Fetching initial value: %s", sql); try { PreparedStatement st = session.getJDBCContext().getConnectionManager().prepareSelectStatement( sql ); try { @@ -128,7 +127,7 @@ private void initializePreviousValueHolder(SessionImplementor session) { if (rs.next()) previousValueHolder.initialize(rs, 0L).increment(); else previousValueHolder.initialize(1L); sql = null; - LOG.debug("First free id: " + previousValueHolder.makeValue()); + LOG.debugf("First free id: %s", previousValueHolder.makeValue()); } finally { rs.close(); diff --git a/hibernate-core/src/main/java/org/hibernate/id/IntegralDataTypeHolder.java b/hibernate-core/src/main/java/org/hibernate/id/IntegralDataTypeHolder.java index c1a547371b..ee1726a6de 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/IntegralDataTypeHolder.java +++ b/hibernate-core/src/main/java/org/hibernate/id/IntegralDataTypeHolder.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/hibernate-core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java index b2858ebc6f..0a6cef96a7 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.io.Serializable; import java.sql.Connection; import java.sql.PreparedStatement; @@ -31,8 +30,8 @@ import java.sql.Types; import java.util.Properties; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.MappingException; import org.hibernate.cfg.ObjectNameNormalizer; import org.hibernate.dialect.Dialect; @@ -44,6 +43,7 @@ import org.hibernate.jdbc.util.FormatStyle; import org.hibernate.mapping.Table; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * @@ -80,8 +80,8 @@ public class MultipleHiLoPerTableGenerator extends TransactionHelper implements PersistentIdentifierGenerator, Configurable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - MultipleHiLoPerTableGenerator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + MultipleHiLoPerTableGenerator.class.getName()); public static final String ID_TABLE = "table"; public static final String PK_COLUMN_NAME = "primary_key_column"; diff --git a/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java index 6a33796fba..9ccfbf0e36 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/PersistentIdentifierGenerator.java @@ -23,7 +23,6 @@ * */ package org.hibernate.id; - import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.jdbc.util.SQLStatementLogger; diff --git a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java index 5f17982462..57b9812a2d 100755 --- a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentifierGenerator.java @@ -23,7 +23,6 @@ * */ package org.hibernate.id; - import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; diff --git a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java index 3bec1448b5..85d6149a7a 100755 --- a/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java +++ b/hibernate-core/src/main/java/org/hibernate/id/PostInsertIdentityPersister.java @@ -23,7 +23,6 @@ * */ package org.hibernate.id; - import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-core/src/main/java/org/hibernate/id/ResultSetIdentifierConsumer.java b/hibernate-core/src/main/java/org/hibernate/id/ResultSetIdentifierConsumer.java index aad5cc3294..fc8bd1a95a 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/ResultSetIdentifierConsumer.java +++ b/hibernate-core/src/main/java/org/hibernate/id/ResultSetIdentifierConsumer.java @@ -22,9 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - -import java.sql.ResultSet; import java.io.Serializable; +import java.sql.ResultSet; /** * An optional contract for {@link org.hibernate.type.Type} or diff --git a/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java index 6600f9d4da..6328a3ac16 100755 --- a/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/SelectGenerator.java @@ -23,21 +23,19 @@ * */ package org.hibernate.id; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Properties; - -import org.hibernate.MappingException; import org.hibernate.HibernateException; -import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; -import org.hibernate.id.insert.IdentifierGeneratingInsert; -import org.hibernate.id.insert.AbstractSelectingDelegate; +import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.ValueInclusion; +import org.hibernate.id.insert.AbstractSelectingDelegate; +import org.hibernate.id.insert.IdentifierGeneratingInsert; +import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/id/SequenceGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SequenceGenerator.java index a2630f7422..bed697e900 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/SequenceGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/SequenceGenerator.java @@ -22,14 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Properties; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.cfg.ObjectNameNormalizer; import org.hibernate.dialect.Dialect; @@ -37,6 +36,7 @@ import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.mapping.Table; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * sequence
@@ -52,8 +52,7 @@ */ public class SequenceGenerator implements PersistentIdentifierGenerator, Configurable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SequenceGenerator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SequenceGenerator.class.getName()); /** * The sequence parameter @@ -113,7 +112,7 @@ protected IntegralDataTypeHolder generateHolder(SessionImplementor session) { rs.next(); IntegralDataTypeHolder result = buildHolder(); result.initialize( rs, 1 ); - LOG.debug("Sequence identifier generated: " + result); + LOG.debugf("Sequence identifier generated: %s", result); return result; } finally { diff --git a/hibernate-core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java index 1160cc639c..d4464f4536 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/SequenceHiLoGenerator.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.io.Serializable; import java.util.Properties; - import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java index ab0c1911d3..6ce6fb578f 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java @@ -22,14 +22,13 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id; - +package org.hibernate.id; import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Properties; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; @@ -38,6 +37,7 @@ import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate; import org.hibernate.sql.Insert; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * A generator which combines sequence generation with immediate retrieval @@ -55,8 +55,8 @@ public class SequenceIdentityGenerator extends SequenceGenerator implements PostInsertIdentifierGenerator { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SequenceIdentityGenerator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + SequenceIdentityGenerator.class.getName()); @Override public Serializable generate(SessionImplementor s, Object obj) { diff --git a/hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java index 86e71e6977..501a6a305b 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java @@ -23,7 +23,6 @@ * */ package org.hibernate.id; - import java.io.Serializable; import java.sql.Connection; import java.sql.PreparedStatement; @@ -32,8 +31,8 @@ import java.sql.Types; import java.util.Properties; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.cfg.ObjectNameNormalizer; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; @@ -42,6 +41,7 @@ import org.hibernate.jdbc.util.FormatStyle; import org.hibernate.mapping.Table; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * An IdentifierGenerator that uses a database @@ -83,8 +83,7 @@ public class TableGenerator extends TransactionHelper /** Default table name */ public static final String DEFAULT_TABLE_NAME = "hibernate_unique_key"; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - TableGenerator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, TableGenerator.class.getName()); private Type identifierType; private String tableName; diff --git a/hibernate-core/src/main/java/org/hibernate/id/TableHiLoGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/TableHiLoGenerator.java index c6909a2be8..5a239ec035 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/TableHiLoGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/TableHiLoGenerator.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.io.Serializable; import java.util.Properties; - import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; import org.hibernate.id.enhanced.AccessCallback; diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerationStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerationStrategy.java index 5f2e84383e..a3eff407d4 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerationStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerationStrategy.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.io.Serializable; import java.util.UUID; - import org.hibernate.engine.SessionImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java index 7cdc2f9208..3058cd8d45 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java @@ -22,12 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.io.Serializable; import java.util.Properties; import java.util.UUID; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; @@ -35,6 +34,7 @@ import org.hibernate.type.Type; import org.hibernate.type.descriptor.java.UUIDTypeDescriptor; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; /** * An {@link IdentifierGenerator} which generates {@link UUID} values using a pluggable @@ -57,8 +57,7 @@ public class UUIDGenerator implements IdentifierGenerator, Configurable { public static final String UUID_GEN_STRATEGY = "uuid_gen_strategy"; public static final String UUID_GEN_STRATEGY_CLASS = "uuid_gen_strategy_class"; - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - UUIDGenerator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, UUIDGenerator.class.getName()); private UUIDGenerationStrategy strategy; private UUIDTypeDescriptor.ValueTransformer valueTransformer; diff --git a/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java index 98c434931a..289de57b2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java @@ -22,14 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; - import java.io.Serializable; import java.util.Properties; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * uuid
@@ -45,8 +45,7 @@ */ public class UUIDHexGenerator extends AbstractUUIDGenerator implements Configurable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - UUIDHexGenerator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, UUIDHexGenerator.class.getName()); private static boolean warned = false; diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/AccessCallback.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/AccessCallback.java index dcb510ee73..639300a939 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/AccessCallback.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/AccessCallback.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id.enhanced; - +package org.hibernate.id.enhanced; import org.hibernate.id.IntegralDataTypeHolder; /** diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java index 1ce605da88..608a2408d0 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/DatabaseStructure.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id.enhanced; - -import org.hibernate.engine.SessionImplementor; +package org.hibernate.id.enhanced; import org.hibernate.dialect.Dialect; +import org.hibernate.engine.SessionImplementor; /** * Encapsulates definition of the underlying data structure backing a diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/Optimizer.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/Optimizer.java index 0e66dcf550..f9b3559b0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/Optimizer.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/Optimizer.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id.enhanced; - +package org.hibernate.id.enhanced; import java.io.Serializable; - import org.hibernate.id.IntegralDataTypeHolder; /** diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java index 6d5bf34214..f3ccbf967f 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.id.enhanced; - +package org.hibernate.id.enhanced; import java.io.Serializable; import java.lang.reflect.Constructor; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.id.IntegralDataTypeHolder; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; /** * Factory for {@link Optimizer} instances. @@ -37,8 +37,7 @@ */ public class OptimizerFactory { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - OptimizerFactory.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, OptimizerFactory.class.getName()); public static final String NONE = "none"; public static final String HILO = "hilo"; diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java index 22d8c915ad..e8d342702e 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java @@ -22,17 +22,17 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id.enhanced; - +package org.hibernate.id.enhanced; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; import org.hibernate.id.IdentifierGeneratorHelper; import org.hibernate.id.IntegralDataTypeHolder; +import org.jboss.logging.Logger; /** * Describes a sequence. @@ -41,8 +41,7 @@ */ public class SequenceStructure implements DatabaseStructure { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SequenceStructure.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SequenceStructure.class.getName()); private final String sequenceName; private final int initialValue; @@ -108,7 +107,7 @@ public IntegralDataTypeHolder getNextValue() { rs.next(); IntegralDataTypeHolder value = IdentifierGeneratorHelper.getIntegralDataTypeHolder( numberType ); value.initialize( rs, 1 ); - LOG.debug("Sequence value obtained: " + value.makeValue()); + LOG.debugf("Sequence value obtained: %s", value.makeValue()); return value; } finally { diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java index b2dce69a42..43ec69c926 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id.enhanced; - import java.io.Serializable; import java.util.Properties; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.cfg.Environment; import org.hibernate.cfg.ObjectNameNormalizer; @@ -37,6 +36,7 @@ import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.mapping.Table; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * Generates identifier values based on an sequence-style database structure. @@ -95,8 +95,8 @@ */ public class SequenceStyleGenerator implements PersistentIdentifierGenerator, Configurable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SequenceStyleGenerator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + SequenceStyleGenerator.class.getName()); // general purpose parameters ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ public static final String SEQUENCE_PARAM = "sequence_name"; diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java index 29a8a4ad77..bba67f4420 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id.enhanced; - import java.io.Serializable; import java.sql.Connection; import java.sql.PreparedStatement; @@ -33,9 +32,9 @@ import java.util.Map; import java.util.Properties; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.Logger; import org.hibernate.MappingException; import org.hibernate.cfg.Environment; import org.hibernate.cfg.ObjectNameNormalizer; @@ -51,6 +50,7 @@ import org.hibernate.mapping.Table; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * An enhanced version of table-based id generation. @@ -127,8 +127,7 @@ */ public class TableGenerator extends TransactionHelper implements PersistentIdentifierGenerator, Configurable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - TableGenerator.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, TableGenerator.class.getName()); public static final String CONFIG_PREFER_SEGMENT_PER_ENTITY = "prefer_entity_table_as_segment_value"; diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java index e150439e81..e498948900 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id.enhanced; - +package org.hibernate.id.enhanced; import java.io.Serializable; import java.sql.Connection; import java.sql.PreparedStatement; @@ -31,8 +30,8 @@ import java.sql.SQLException; import java.sql.Types; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.dialect.Dialect; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.TransactionHelper; @@ -41,6 +40,7 @@ import org.hibernate.id.IntegralDataTypeHolder; import org.hibernate.jdbc.util.FormatStyle; import org.hibernate.jdbc.util.SQLStatementLogger; +import org.jboss.logging.Logger; /** * Describes a table used to mimic sequence behavior @@ -49,8 +49,7 @@ */ public class TableStructure extends TransactionHelper implements DatabaseStructure { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - TableStructure.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, TableStructure.class.getName()); private static final SQLStatementLogger SQL_STATEMENT_LOGGER = new SQLStatementLogger(false, false); private final String tableName; diff --git a/hibernate-core/src/main/java/org/hibernate/id/factory/DefaultIdentifierGeneratorFactory.java b/hibernate-core/src/main/java/org/hibernate/id/factory/DefaultIdentifierGeneratorFactory.java index 38de5704c4..e01f3dd57a 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/factory/DefaultIdentifierGeneratorFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/id/factory/DefaultIdentifierGeneratorFactory.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id.factory; - import java.io.Serializable; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.id.Assigned; @@ -47,6 +46,7 @@ import org.hibernate.id.enhanced.TableGenerator; import org.hibernate.type.Type; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; /** * Basic templated support for {@link IdentifierGeneratorFactory} implementations. @@ -55,8 +55,8 @@ */ public class DefaultIdentifierGeneratorFactory implements IdentifierGeneratorFactory, Serializable { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - DefaultIdentifierGeneratorFactory.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + DefaultIdentifierGeneratorFactory.class.getName()); private transient Dialect dialect; private ConcurrentHashMap generatorStrategyToClassNameMap = new ConcurrentHashMap(); @@ -86,7 +86,7 @@ public DefaultIdentifierGeneratorFactory() { * {@inheritDoc} */ public void setDialect(Dialect dialect) { - LOG.debug("Setting dialect [" + dialect + "]"); + LOG.debugf("Setting dialect [%s]", dialect); this.dialect = dialect; } @@ -94,7 +94,7 @@ public void register(String strategy, Class generatorClass) { Object old = generatorStrategyToClassNameMap.put( strategy, generatorClass ); String msg = "Registering IdentifierGenerator strategy [" + strategy + "] -> [" + generatorClass + "]"; if (old != null) msg += ", overriding [" + old + "]"; - LOG.debug(msg); + LOG.debugf(msg); } /** diff --git a/hibernate-core/src/main/java/org/hibernate/id/factory/IdentifierGeneratorFactory.java b/hibernate-core/src/main/java/org/hibernate/id/factory/IdentifierGeneratorFactory.java index ffd31c1ba9..d41fdfea73 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/factory/IdentifierGeneratorFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/id/factory/IdentifierGeneratorFactory.java @@ -23,13 +23,10 @@ * */ package org.hibernate.id.factory; - import java.util.Properties; -import java.io.Serializable; - +import org.hibernate.dialect.Dialect; import org.hibernate.id.IdentifierGenerator; import org.hibernate.type.Type; -import org.hibernate.dialect.Dialect; /** * Contract for a factory of {@link IdentifierGenerator} instances. diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java index 7ca386c4d5..d6c3c38321 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractReturningDelegate.java @@ -22,15 +22,13 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id.insert; - -import org.hibernate.id.PostInsertIdentityPersister; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.pretty.MessageHelper; - +package org.hibernate.id.insert; import java.io.Serializable; import java.sql.PreparedStatement; import java.sql.SQLException; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.id.PostInsertIdentityPersister; +import org.hibernate.pretty.MessageHelper; /** * Abstract InsertGeneratedIdentifierDelegate implementation where the diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java index 9b93eab5d7..6b90425711 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/AbstractSelectingDelegate.java @@ -22,16 +22,14 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id.insert; - -import org.hibernate.pretty.MessageHelper; +package org.hibernate.id.insert; +import java.io.Serializable; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import org.hibernate.engine.SessionImplementor; import org.hibernate.id.PostInsertIdentityPersister; - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.ResultSet; -import java.io.Serializable; +import org.hibernate.pretty.MessageHelper; /** * Abstract InsertGeneratedIdentifierDelegate implementation where the diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/Binder.java b/hibernate-core/src/main/java/org/hibernate/id/insert/Binder.java index f1bc046a47..1c00bcd5fd 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/insert/Binder.java +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/Binder.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id.insert; - +package org.hibernate.id.insert; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/IdentifierGeneratingInsert.java b/hibernate-core/src/main/java/org/hibernate/id/insert/IdentifierGeneratingInsert.java index fa347462f9..b4cfa0ea6e 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/insert/IdentifierGeneratingInsert.java +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/IdentifierGeneratingInsert.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id.insert; - -import org.hibernate.sql.Insert; +package org.hibernate.id.insert; import org.hibernate.dialect.Dialect; +import org.hibernate.sql.Insert; /** * Nothing more than a distinguishing subclass of Insert used to indicate diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java index d3bf424369..d575bb3514 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertGeneratedIdentifierDelegate.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id.insert; - -import org.hibernate.engine.SessionImplementor; - +package org.hibernate.id.insert; import java.io.Serializable; +import org.hibernate.engine.SessionImplementor; /** * Responsible for handling delegation relating to variants in how diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertSelectIdentityInsert.java b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertSelectIdentityInsert.java index 962418647b..085b4eb9cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/insert/InsertSelectIdentityInsert.java +++ b/hibernate-core/src/main/java/org/hibernate/id/insert/InsertSelectIdentityInsert.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.id.insert; - +package org.hibernate.id.insert; import org.hibernate.dialect.Dialect; /** diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/CustomVersionOneStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/CustomVersionOneStrategy.java index 56405c51a4..93f209231a 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/uuid/CustomVersionOneStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/id/uuid/CustomVersionOneStrategy.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id.uuid; - import java.util.UUID; - import org.hibernate.engine.SessionImplementor; import org.hibernate.id.UUIDGenerationStrategy; import org.hibernate.util.BytesHelper; 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 21dcbe0aec..77aa9700bd 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 @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id.uuid; - import java.net.InetAddress; import java.net.UnknownHostException; - import org.hibernate.util.BytesHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/id/uuid/StandardRandomStrategy.java b/hibernate-core/src/main/java/org/hibernate/id/uuid/StandardRandomStrategy.java index abe6a0e684..55d5cebdc6 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/uuid/StandardRandomStrategy.java +++ b/hibernate-core/src/main/java/org/hibernate/id/uuid/StandardRandomStrategy.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id.uuid; - import java.util.UUID; - import org.hibernate.engine.SessionImplementor; import org.hibernate.id.UUIDGenerationStrategy; diff --git a/hibernate-core/src/main/java/org/hibernate/impl/AbstractQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/AbstractQueryImpl.java index c46d208e9e..cac26b4569 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/AbstractQueryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/AbstractQueryImpl.java @@ -23,7 +23,6 @@ * */ package org.hibernate.impl; - import java.io.Serializable; import java.math.BigDecimal; import java.math.BigInteger; @@ -39,17 +38,16 @@ import java.util.Locale; import java.util.Map; import java.util.Set; - import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.Hibernate; import org.hibernate.HibernateException; +import org.hibernate.LockOptions; import org.hibernate.MappingException; import org.hibernate.NonUniqueResultException; import org.hibernate.PropertyNotFoundException; import org.hibernate.Query; import org.hibernate.QueryException; -import org.hibernate.LockOptions; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.RowSelection; import org.hibernate.engine.SessionImplementor; @@ -61,7 +59,6 @@ import org.hibernate.transform.ResultTransformer; import org.hibernate.type.SerializableType; import org.hibernate.type.Type; -import org.hibernate.type.TypeFactory; import org.hibernate.util.ArrayHelper; import org.hibernate.util.MarkerObject; import org.hibernate.util.ReflectHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java b/hibernate-core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java index 9a6cb40346..d6f077fe0a 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java @@ -23,7 +23,6 @@ * */ package org.hibernate.impl; - import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Blob; @@ -37,7 +36,7 @@ import java.util.TimeZone; import org.hibernate.Hibernate; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.ScrollableResults; import org.hibernate.engine.QueryParameters; @@ -45,6 +44,7 @@ import org.hibernate.hql.HolderInstantiator; import org.hibernate.loader.Loader; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * Implementation of the ScrollableResults interface @@ -53,8 +53,8 @@ */ public abstract class AbstractScrollableResults implements ScrollableResults { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - AbstractScrollableResults.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + AbstractScrollableResults.class.getName()); private final ResultSet resultSet; private final PreparedStatement ps; diff --git a/hibernate-core/src/main/java/org/hibernate/impl/AbstractSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/AbstractSessionImpl.java index ea7e1cbdbe..c9afdb7f17 100755 --- a/hibernate-core/src/main/java/org/hibernate/impl/AbstractSessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/AbstractSessionImpl.java @@ -23,23 +23,21 @@ * */ package org.hibernate.impl; - +import java.util.List; +import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.Query; import org.hibernate.SQLQuery; -import org.hibernate.HibernateException; import org.hibernate.ScrollableResults; import org.hibernate.SessionException; -import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; import org.hibernate.engine.NamedQueryDefinition; import org.hibernate.engine.NamedSQLQueryDefinition; -import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.query.HQLQueryPlan; import org.hibernate.engine.query.NativeSQLQueryPlan; - -import java.util.List; +import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; /** * Functionality common to stateless and stateful sessions diff --git a/hibernate-core/src/main/java/org/hibernate/impl/CollectionFilterImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/CollectionFilterImpl.java index 305f94446a..70479167c1 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/CollectionFilterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/CollectionFilterImpl.java @@ -23,11 +23,9 @@ * */ package org.hibernate.impl; - import java.util.Iterator; import java.util.List; import java.util.Map; - import org.hibernate.HibernateException; import org.hibernate.ScrollableResults; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/impl/CriteriaImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/CriteriaImpl.java index a484ca043a..fd536b82d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/CriteriaImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/CriteriaImpl.java @@ -23,14 +23,12 @@ * */ package org.hibernate.impl; - import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; - import org.hibernate.CacheMode; import org.hibernate.Criteria; import org.hibernate.FetchMode; diff --git a/hibernate-core/src/main/java/org/hibernate/impl/FetchingScrollableResultsImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/FetchingScrollableResultsImpl.java index b2b188ef9b..7fbfd1703a 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/FetchingScrollableResultsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/FetchingScrollableResultsImpl.java @@ -23,19 +23,16 @@ * */ package org.hibernate.impl; - +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import org.hibernate.HibernateException; import org.hibernate.MappingException; -import org.hibernate.exception.JDBCExceptionHelper; -import org.hibernate.hql.HolderInstantiator; -import org.hibernate.type.Type; -import org.hibernate.loader.Loader; -import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.QueryParameters; - -import java.sql.ResultSet; -import java.sql.PreparedStatement; -import java.sql.SQLException; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.hql.HolderInstantiator; +import org.hibernate.loader.Loader; +import org.hibernate.type.Type; /** * Implementation of ScrollableResults which can handle collection fetches. diff --git a/hibernate-core/src/main/java/org/hibernate/impl/FilterImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/FilterImpl.java index 36adb11955..9f04513fdf 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/FilterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/FilterImpl.java @@ -23,14 +23,12 @@ * */ package org.hibernate.impl; - import java.io.Serializable; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.Map; - import org.hibernate.Filter; import org.hibernate.HibernateException; import org.hibernate.engine.FilterDefinition; diff --git a/hibernate-core/src/main/java/org/hibernate/impl/IteratorImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/IteratorImpl.java index 8e704d6cff..fcce6fb492 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/IteratorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/IteratorImpl.java @@ -23,19 +23,19 @@ * */ package org.hibernate.impl; - import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.NoSuchElementException; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.JDBCException; -import org.hibernate.Logger; import org.hibernate.engine.HibernateIterator; import org.hibernate.event.EventSource; import org.hibernate.hql.HolderInstantiator; import org.hibernate.type.EntityType; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * An implementation of java.util.Iterator that is @@ -44,8 +44,7 @@ */ public final class IteratorImpl implements HibernateIterator { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - IteratorImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, IteratorImpl.class.getName()); private ResultSet rs; private final EventSource session; @@ -84,14 +83,14 @@ public IteratorImpl( public void close() throws JDBCException { if (ps!=null) { try { - LOG.debug("Closing iterator"); + LOG.debugf("Closing iterator"); ps.close(); ps = null; rs = null; hasNext = false; } catch (SQLException e) { - LOG.info(LOG.unableToCloseIterator(), e); + LOG.unableToCloseIterator(e); throw session.getFactory().getSQLExceptionHelper().convert( e, "Unable to close iterator" @@ -103,19 +102,19 @@ public void close() throws JDBCException { } catch( Throwable ignore ) { // ignore this error for now - LOG.debug("Exception trying to cleanup load context : " + ignore.getMessage()); + LOG.debugf("Exception trying to cleanup load context : %s", ignore.getMessage()); } } } } private void postNext() throws SQLException { - LOG.debug("Attempting to retrieve next results"); + LOG.debugf("Attempting to retrieve next results"); this.hasNext = rs.next(); if (!hasNext) { - LOG.debug("Exhausted results"); + LOG.debugf("Exhausted results"); close(); - } else LOG.debug("Retrieved next results"); + } else LOG.debugf("Retrieved next results"); } public boolean hasNext() { @@ -129,7 +128,7 @@ public Object next() throws HibernateException { try { boolean isHolder = holderInstantiator.isRequired(); - LOG.debug("Assembling results"); + LOG.debugf("Assembling results"); if ( single && !isHolder ) { currentResult = types[0].nullSafeGet( rs, names[0], session, null ); } @@ -148,7 +147,7 @@ public Object next() throws HibernateException { } postNext(); - LOG.debug("Returning current results"); + LOG.debugf("Returning current results"); return currentResult; } catch (SQLException sqle) { diff --git a/hibernate-core/src/main/java/org/hibernate/impl/NonFlushedChangesImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/NonFlushedChangesImpl.java index c56a60cb65..de7d3c7035 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/NonFlushedChangesImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/NonFlushedChangesImpl.java @@ -22,13 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.impl; - -/** - * An implementation of NonFlushedChanges. - * - * @author Gail Badner - */ - import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -37,16 +30,16 @@ import java.util.Map; import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.ActionQueue; import org.hibernate.engine.NonFlushedChanges; import org.hibernate.engine.StatefulPersistenceContext; import org.hibernate.event.EventSource; +import org.jboss.logging.Logger; public final class NonFlushedChangesImpl implements NonFlushedChanges { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - NonFlushedChangesImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, NonFlushedChangesImpl.class.getName()); private static class SessionNonFlushedChanges implements Serializable { private transient EntityMode entityMode; diff --git a/hibernate-core/src/main/java/org/hibernate/impl/QueryImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/QueryImpl.java index 8e1f32ad80..fd21bd1dbb 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/QueryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/QueryImpl.java @@ -23,18 +23,16 @@ * */ package org.hibernate.impl; - import java.util.Iterator; import java.util.List; import java.util.Map; - import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.LockMode; +import org.hibernate.LockOptions; import org.hibernate.Query; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; -import org.hibernate.LockOptions; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.query.ParameterMetadata; diff --git a/hibernate-core/src/main/java/org/hibernate/impl/SQLQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/SQLQueryImpl.java index 2e02951e1d..2e21c29bb8 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/SQLQueryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/SQLQueryImpl.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.impl; - +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -30,28 +30,26 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.io.Serializable; - import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.LockMode; +import org.hibernate.LockOptions; +import org.hibernate.MappingException; import org.hibernate.Query; import org.hibernate.QueryException; import org.hibernate.SQLQuery; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; -import org.hibernate.MappingException; -import org.hibernate.LockOptions; -import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; -import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.engine.NamedSQLQueryDefinition; import org.hibernate.engine.QueryParameters; +import org.hibernate.engine.ResultSetMappingDefinition; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.query.ParameterMetadata; import org.hibernate.engine.query.sql.NativeSQLQueryJoinReturn; -import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn; -import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn; import org.hibernate.engine.query.sql.NativeSQLQueryReturn; +import org.hibernate.engine.query.sql.NativeSQLQueryRootReturn; +import org.hibernate.engine.query.sql.NativeSQLQueryScalarReturn; +import org.hibernate.engine.query.sql.NativeSQLQuerySpecification; import org.hibernate.type.Type; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/impl/ScrollableResultsImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/ScrollableResultsImpl.java index 886f4d93c5..30ed0c4ef7 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/ScrollableResultsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/ScrollableResultsImpl.java @@ -23,21 +23,18 @@ * */ package org.hibernate.impl; - +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.ScrollableResults; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionImplementor; -import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.hql.HolderInstantiator; import org.hibernate.loader.Loader; import org.hibernate.type.Type; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - /** * Implementation of the ScrollableResults interface * @author Gavin King diff --git a/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java index e210767615..74c2e6e444 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.impl; - import java.io.IOException; import java.io.InvalidObjectException; import java.io.ObjectInputStream; @@ -49,8 +48,8 @@ import org.hibernate.EntityMode; import org.hibernate.EntityNameResolver; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.Interceptor; -import org.hibernate.Logger; import org.hibernate.MappingException; import org.hibernate.ObjectNotFoundException; import org.hibernate.QueryException; @@ -123,6 +122,7 @@ import org.hibernate.util.CollectionHelper; import org.hibernate.util.EmptyIterator; import org.hibernate.util.ReflectHelper; +import org.jboss.logging.Logger; /** @@ -150,8 +150,7 @@ */ public final class SessionFactoryImpl implements SessionFactory, SessionFactoryImplementor { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SessionFactoryImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SessionFactoryImpl.class.getName()); private static final IdentifierGenerator UUID_GENERATOR = UUIDGenerator.buildSessionFactoryUniqueIdentifierGenerator(); private final String name; @@ -203,7 +202,7 @@ public SessionFactoryImpl( this.statistics = new ConcurrentStatisticsImpl( this ); getStatistics().setStatisticsEnabled( settings.isStatisticsEnabled() ); - LOG.debug("Statistics initialized [enabled=" + settings.isStatisticsEnabled() + "]}"); + LOG.debugf("Statistics initialized [enabled=%s]", settings.isStatisticsEnabled()); this.properties = new Properties(); this.properties.putAll( cfg.getProperties() ); @@ -225,8 +224,8 @@ public void sessionFactoryClosed(SessionFactory factory) { this.filters = new HashMap(); this.filters.putAll( cfg.getFilterDefinitions() ); - LOG.debug("Session factory constructed with filter configurations : " + filters); - LOG.debug("Instantiating session factory with properties: " + properties); + LOG.debugf("Session factory constructed with filter configurations : %s", filters); + LOG.debugf("Instantiating session factory with properties: %s", properties); // Caches settings.getRegionFactory().start( settings, properties ); @@ -360,7 +359,7 @@ public void sessionFactoryClosed(SessionFactory factory) { } SessionFactoryObjectFactory.addInstance(uuid, name, this, properties); - LOG.debug("Instantiated session factory"); + LOG.debugf("Instantiated session factory"); if ( settings.isAutoCreateSchema() ) { new SchemaExport( getJdbcServices(), cfg ).create( false, true ); @@ -376,7 +375,7 @@ public void sessionFactoryClosed(SessionFactory factory) { } if ( settings.getTransactionManagerLookup()!=null ) { - LOG.debug("Obtaining JTA TransactionManager"); + LOG.debugf("Obtaining JTA TransactionManager"); transactionManager = settings.getTransactionManagerLookup().getTransactionManager(properties); } else { @@ -528,7 +527,7 @@ private Map checkNamedQueries() throws HibernateException { Map errors = new HashMap(); // Check named HQL queries - LOG.debug("Checking " + namedQueries.size() + " named HQL queries"); + LOG.debugf("Checking %s named HQL queries", namedQueries.size()); Iterator itr = namedQueries.entrySet().iterator(); while ( itr.hasNext() ) { final Map.Entry entry = ( Map.Entry ) itr.next(); @@ -536,7 +535,7 @@ private Map checkNamedQueries() throws HibernateException { final NamedQueryDefinition qd = ( NamedQueryDefinition ) entry.getValue(); // this will throw an error if there's something wrong. try { - LOG.debug("Checking named query: " + queryName); + LOG.debugf("Checking named query: %s", queryName); //TODO: BUG! this currently fails for named queries for non-POJO entities queryPlanCache.getHQLQueryPlan( qd.getQueryString(), false, CollectionHelper.EMPTY_MAP ); } @@ -548,7 +547,7 @@ private Map checkNamedQueries() throws HibernateException { } } - LOG.debug("Checking " + namedSqlQueries.size() + " named SQL queries"); + LOG.debugf("Checking %s named SQL queries", namedSqlQueries.size()); itr = namedSqlQueries.entrySet().iterator(); while ( itr.hasNext() ) { final Map.Entry entry = ( Map.Entry ) itr.next(); @@ -556,7 +555,7 @@ private Map checkNamedQueries() throws HibernateException { final NamedSQLQueryDefinition qd = ( NamedSQLQueryDefinition ) entry.getValue(); // this will throw an error if there's something wrong. try { - LOG.debug("Checking named SQL query: " + queryName); + LOG.debugf("Checking named SQL query: %s", queryName); // TODO : would be really nice to cache the spec on the query-def so as to not have to re-calc the hash; // currently not doable though because of the resultset-ref stuff... NativeSQLQuerySpecification spec; @@ -737,7 +736,7 @@ public Set getCollectionRolesByEntityParticipant(String entityName) { // from javax.naming.Referenceable public Reference getReference() throws NamingException { - LOG.debug("Returning a Reference to the SessionFactory"); + LOG.debugf("Returning a Reference to the SessionFactory"); return new Reference( SessionFactoryImpl.class.getName(), new StringRefAddr("uuid", uuid), @@ -755,8 +754,8 @@ private Object readResolve() throws ObjectStreamException { // (alternatively we could do an actual JNDI lookup here....) result = SessionFactoryObjectFactory.getNamedInstance(name); if (result == null) throw new InvalidObjectException("Could not find a SessionFactory named: " + name); - LOG.debug("Resolved SessionFactory by name"); - } else LOG.debug("Resolved SessionFactory by UID"); + LOG.debugf("Resolved SessionFactory by name"); + } else LOG.debugf("Resolved SessionFactory by UID"); return result; } @@ -782,11 +781,11 @@ public String getIdentifierPropertyName(String className) throws MappingExceptio private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { LOG.trace("Deserializing"); in.defaultReadObject(); - LOG.debug("Deserialized: " + uuid); + LOG.debugf("Deserialized: %s", uuid); } private void writeObject(ObjectOutputStream out) throws IOException { - LOG.debug("Serializing: " + uuid); + LOG.debugf("Serializing: %s", uuid); out.defaultWriteObject(); LOG.trace("Serialized"); } @@ -981,8 +980,8 @@ public void evictEntity(Class entityClass, Serializable identifier) { public void evictEntity(String entityName, Serializable identifier) { EntityPersister p = getEntityPersister( entityName ); if ( p.hasCache() ) { - if (LOG.isDebugEnabled()) LOG.debug("Evicting second-level cache: " - + MessageHelper.infoString(p, identifier, SessionFactoryImpl.this)); + if (LOG.isDebugEnabled()) LOG.debugf("Evicting second-level cache: %s", + MessageHelper.infoString(p, identifier, SessionFactoryImpl.this)); p.getCacheAccessStrategy().evict( buildCacheKey( identifier, p ) ); } } @@ -1004,7 +1003,7 @@ public void evictEntityRegion(Class entityClass) { public void evictEntityRegion(String entityName) { EntityPersister p = getEntityPersister( entityName ); if ( p.hasCache() ) { - LOG.debug("Evicting second-level cache: " + p.getEntityName()); + LOG.debugf("Evicting second-level cache: %s", p.getEntityName()); p.getCacheAccessStrategy().evictAll(); } } @@ -1025,10 +1024,8 @@ public boolean containsCollection(String role, Serializable ownerIdentifier) { public void evictCollection(String role, Serializable ownerIdentifier) { CollectionPersister p = getCollectionPersister( role ); if ( p.hasCache() ) { - if (LOG.isDebugEnabled()) LOG.debug("Evicting second-level cache: " - + MessageHelper.collectionInfoString(p, - ownerIdentifier, - SessionFactoryImpl.this)); + if (LOG.isDebugEnabled()) LOG.debugf("Evicting second-level cache: %s", + MessageHelper.collectionInfoString(p, ownerIdentifier, SessionFactoryImpl.this)); CacheKey cacheKey = buildCacheKey( ownerIdentifier, p ); p.getCacheAccessStrategy().evict( cacheKey ); } @@ -1047,7 +1044,7 @@ private CacheKey buildCacheKey(Serializable ownerIdentifier, CollectionPersister public void evictCollectionRegion(String role) { CollectionPersister p = getCollectionPersister( role ); if ( p.hasCache() ) { - LOG.debug("Evicting second-level cache: " + p.getRole()); + LOG.debugf("Evicting second-level cache: %s", p.getRole()); p.getCacheAccessStrategy().evictAll(); } } diff --git a/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java b/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java index 88f3bb55aa..e54c4b0034 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.impl; - import java.util.Hashtable; import java.util.Iterator; import java.util.Properties; @@ -38,9 +37,10 @@ import javax.naming.event.NamingExceptionEvent; import javax.naming.event.NamingListener; import javax.naming.spi.ObjectFactory; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.SessionFactory; import org.hibernate.internal.util.jndi.JndiHelper; +import org.jboss.logging.Logger; /** * Resolves {@link SessionFactory} instances during JNDI look-ups as well as during deserialization @@ -50,12 +50,12 @@ public class SessionFactoryObjectFactory implements ObjectFactory { @SuppressWarnings({ "UnusedDeclaration" }) private static final SessionFactoryObjectFactory INSTANCE; //to stop the class from being unloaded - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SessionFactoryObjectFactory.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + SessionFactoryObjectFactory.class.getName()); static { INSTANCE = new SessionFactoryObjectFactory(); - LOG.debug("Initializing class SessionFactoryObjectFactory"); + LOG.debugf("Initializing class SessionFactoryObjectFactory"); } private static final ConcurrentHashMap INSTANCES = new ConcurrentHashMap(); @@ -63,7 +63,7 @@ public class SessionFactoryObjectFactory implements ObjectFactory { private static final NamingListener LISTENER = new NamespaceChangeListener() { public void objectAdded(NamingEvent evt) { - LOG.debug("A factory was successfully bound to name: " + evt.getNewBinding().getName()); + LOG.debugf("A factory was successfully bound to name: %s", evt.getNewBinding().getName()); } public void objectRemoved(NamingEvent evt) { String name = evt.getOldBinding().getName(); @@ -86,13 +86,13 @@ public void namingExceptionThrown(NamingExceptionEvent evt) { }; public Object getObjectInstance(Object reference, Name name, Context ctx, Hashtable env) throws Exception { - LOG.debug("JNDI lookup: " + name); + LOG.debugf("JNDI lookup: %s", name); String uid = (String) ( (Reference) reference ).get(0).getContent(); return getInstance(uid); } public static void addInstance(String uid, String name, SessionFactory instance, Properties properties) { - LOG.debug("Registered: " + uid + " (" + (name == null ? "" : name) + ")"); + LOG.debugf("Registered: %s (%s)", uid, name == null ? "" : name); INSTANCES.put(uid, instance); if (name!=null) NAMED_INSTANCES.put(name, instance); @@ -111,7 +111,7 @@ public static void addInstance(String uid, String name, SessionFactory instance, LOG.invalidJndiName(name, ine); } catch (NamingException ne) { - LOG.warn(LOG.unableToBindFactoryToJndi(), ne); + LOG.unableToBindFactoryToJndi(ne); } catch(ClassCastException cce) { LOG.initialContextDidNotImplementEventContext(); @@ -134,7 +134,7 @@ public static void removeInstance(String uid, String name, Properties properties LOG.invalidJndiName(name, ine); } catch (NamingException ne) { - LOG.warn(LOG.unableToUnbindFactoryFromJndi(), ne); + LOG.unableToUnbindFactoryFromJndi(ne); } NAMED_INSTANCES.remove(name); @@ -146,21 +146,21 @@ public static void removeInstance(String uid, String name, Properties properties } public static Object getNamedInstance(String name) { - LOG.debug("Lookup: name=" + name); + LOG.debugf("Lookup: name=%s", name); Object result = NAMED_INSTANCES.get(name); if (result==null) { - LOG.debug("Not found: " + name); - LOG.debug(NAMED_INSTANCES.toString()); + LOG.debugf("Not found: %s", name); + LOG.debugf(NAMED_INSTANCES.toString()); } return result; } public static Object getInstance(String uid) { - LOG.debug("Lookup: uid=" + uid); + LOG.debugf("Lookup: uid=%s", uid); Object result = INSTANCES.get(uid); if (result==null) { - LOG.debug("Not found: " + uid); - LOG.debug(INSTANCES.toString()); + LOG.debugf("Not found: %s", uid); + LOG.debugf(INSTANCES.toString()); } return result; } diff --git a/hibernate-core/src/main/java/org/hibernate/impl/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/SessionImpl.java index 0e820cc0ac..dd2d541e00 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/SessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/SessionImpl.java @@ -23,7 +23,6 @@ * */ package org.hibernate.impl; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -52,11 +51,11 @@ import org.hibernate.Filter; import org.hibernate.FlushMode; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.Interceptor; import org.hibernate.LobHelper; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.Logger; import org.hibernate.MappingException; import org.hibernate.ObjectDeletedException; import org.hibernate.Query; @@ -138,6 +137,7 @@ import org.hibernate.util.ArrayHelper; import org.hibernate.util.CollectionHelper; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** @@ -155,8 +155,7 @@ public final class SessionImpl extends AbstractSessionImpl // a seperate classs responsible for generating/dispatching events just duplicates most of the Session methods... // passing around seperate reto interceptor, factory, actionQueue, and persistentContext is not manageable... - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SessionImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SessionImpl.class.getName()); private transient EntityMode entityMode = EntityMode.POJO; private transient boolean autoClear; //for EJB3 @@ -209,7 +208,7 @@ private SessionImpl(SessionImpl parent, EntityMode entityMode) { if (factory.getStatistics().isStatisticsEnabled()) factory.getStatisticsImplementor().openSession(); - LOG.debug("Opened session [" + entityMode + "]"); + LOG.debugf("Opened session [%s]", entityMode); } /** @@ -253,7 +252,7 @@ private SessionImpl(SessionImpl parent, EntityMode entityMode) { if (factory.getStatistics().isStatisticsEnabled()) factory.getStatisticsImplementor().openSession(); - LOG.debug("Opened session at timestamp: " + timestamp); + LOG.debugf("Opened session at timestamp: %s", timestamp); } public Session getSession(EntityMode entityMode) { @@ -530,20 +529,20 @@ public boolean isTransactionInProgress() { public Connection disconnect() throws HibernateException { errorIfClosed(); - LOG.debug("Disconnecting session"); + LOG.debugf("Disconnecting session"); return jdbcContext.getConnectionManager().manualDisconnect(); } public void reconnect() throws HibernateException { errorIfClosed(); - LOG.debug("Reconnecting session"); + LOG.debugf("Reconnecting session"); checkTransactionSynchStatus(); jdbcContext.getConnectionManager().manualReconnect(); } public void reconnect(Connection conn) throws HibernateException { errorIfClosed(); - LOG.debug("Reconnecting session"); + LOG.debugf("Reconnecting session"); checkTransactionSynchStatus(); jdbcContext.getConnectionManager().manualReconnect( conn ); } @@ -1001,7 +1000,7 @@ public Object get(String entityName, Serializable id) throws HibernateException public Object immediateLoad(String entityName, Serializable id) throws HibernateException { if (LOG.isDebugEnabled()) { EntityPersister persister = getFactory().getEntityPersister(entityName); - LOG.debug("Initializing proxy: " + MessageHelper.infoString(persister, id, getFactory())); + LOG.debugf("Initializing proxy: %s", MessageHelper.infoString(persister, id, getFactory())); } LoadEvent event = new LoadEvent(id, entityName, true, this); @@ -1172,9 +1171,9 @@ protected boolean autoFlushIfRequired(Set querySpaces) throws HibernateException public boolean isDirty() throws HibernateException { errorIfClosed(); checkTransactionSynchStatus(); - LOG.debug("Checking session dirtiness"); + LOG.debugf("Checking session dirtiness"); if ( actionQueue.areInsertionsOrDeletionsQueued() ) { - LOG.debug("Session dirty (scheduled updates and insertions)"); + LOG.debugf("Session dirty (scheduled updates and insertions)"); return true; } DirtyCheckEvent event = new DirtyCheckEvent(this); @@ -1199,10 +1198,8 @@ public void flush() throws HibernateException { public void forceFlush(EntityEntry entityEntry) throws HibernateException { errorIfClosed(); - if (LOG.isDebugEnabled()) LOG.debug("Flushing to force deletion of re-saved object: " - + MessageHelper.infoString(entityEntry.getPersister(), - entityEntry.getId(), - getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Flushing to force deletion of re-saved object: %s", + MessageHelper.infoString(entityEntry.getPersister(), entityEntry.getId(), getFactory())); if ( persistenceContext.getCascadeLevel() > 0 ) { throw new ObjectDeletedException( diff --git a/hibernate-core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java index 88689a18b4..3dbc1a9d8a 100755 --- a/hibernate-core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java @@ -20,7 +20,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.impl; - import java.io.Serializable; import java.sql.Connection; import java.util.Collections; @@ -35,9 +34,9 @@ import org.hibernate.EntityMode; import org.hibernate.FlushMode; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.Interceptor; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.MappingException; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; @@ -70,6 +69,7 @@ import org.hibernate.proxy.HibernateProxy; import org.hibernate.type.Type; import org.hibernate.util.CollectionHelper; +import org.jboss.logging.Logger; /** * @author Gavin King @@ -77,8 +77,7 @@ public class StatelessSessionImpl extends AbstractSessionImpl implements JDBCContext.Context, StatelessSession { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - StatelessSessionImpl.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, StatelessSessionImpl.class.getName()); private JDBCContextImpl jdbcContext; private PersistenceContext temporaryPersistenceContext = new StatefulPersistenceContext( this ); diff --git a/hibernate-core/src/main/java/org/hibernate/impl/TypeLocatorImpl.java b/hibernate-core/src/main/java/org/hibernate/impl/TypeLocatorImpl.java index b88858f221..27de6d4a32 100644 --- a/hibernate-core/src/main/java/org/hibernate/impl/TypeLocatorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/impl/TypeLocatorImpl.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.impl; - import java.io.Serializable; import java.util.Properties; - import org.hibernate.TypeHelper; import org.hibernate.type.BasicType; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/intercept/AbstractFieldInterceptor.java b/hibernate-core/src/main/java/org/hibernate/intercept/AbstractFieldInterceptor.java index ba068e3de1..d44286aa19 100644 --- a/hibernate-core/src/main/java/org/hibernate/intercept/AbstractFieldInterceptor.java +++ b/hibernate-core/src/main/java/org/hibernate/intercept/AbstractFieldInterceptor.java @@ -23,12 +23,10 @@ * */ package org.hibernate.intercept; - -import org.hibernate.engine.SessionImplementor; -import org.hibernate.LazyInitializationException; - -import java.util.Set; import java.io.Serializable; +import java.util.Set; +import org.hibernate.LazyInitializationException; +import org.hibernate.engine.SessionImplementor; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java b/hibernate-core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java index 06146cc256..020bf1b289 100644 --- a/hibernate-core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java @@ -23,13 +23,11 @@ * */ package org.hibernate.intercept; - +import java.util.Set; import org.hibernate.engine.SessionImplementor; import org.hibernate.intercept.cglib.CGLIBHelper; import org.hibernate.intercept.javassist.JavassistHelper; -import java.util.Set; - /** * Helper class for dealing with enhanced entity classes. * diff --git a/hibernate-core/src/main/java/org/hibernate/intercept/FieldInterceptor.java b/hibernate-core/src/main/java/org/hibernate/intercept/FieldInterceptor.java index f9f21b64ef..4913d37ba2 100755 --- a/hibernate-core/src/main/java/org/hibernate/intercept/FieldInterceptor.java +++ b/hibernate-core/src/main/java/org/hibernate/intercept/FieldInterceptor.java @@ -23,7 +23,6 @@ * */ package org.hibernate.intercept; - import org.hibernate.engine.SessionImplementor; /** diff --git a/hibernate-core/src/main/java/org/hibernate/intercept/LazyPropertyInitializer.java b/hibernate-core/src/main/java/org/hibernate/intercept/LazyPropertyInitializer.java index 9bd505faba..9a0d8c53ac 100755 --- a/hibernate-core/src/main/java/org/hibernate/intercept/LazyPropertyInitializer.java +++ b/hibernate-core/src/main/java/org/hibernate/intercept/LazyPropertyInitializer.java @@ -23,9 +23,7 @@ * */ package org.hibernate.intercept; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java b/hibernate-core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java index ed19153d98..4c44b11a2e 100644 --- a/hibernate-core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java @@ -23,12 +23,10 @@ * */ package org.hibernate.intercept.cglib; - -import org.hibernate.intercept.FieldInterceptor; -import org.hibernate.engine.SessionImplementor; -import net.sf.cglib.transform.impl.InterceptFieldEnabled; - import java.util.Set; +import net.sf.cglib.transform.impl.InterceptFieldEnabled; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.intercept.FieldInterceptor; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java b/hibernate-core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java index 83290a14ee..d640f24fcd 100644 --- a/hibernate-core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java @@ -23,14 +23,11 @@ * */ package org.hibernate.intercept.cglib; - import java.io.Serializable; import java.util.Set; - import net.sf.cglib.transform.impl.InterceptFieldCallback; - -import org.hibernate.intercept.AbstractFieldInterceptor; import org.hibernate.engine.SessionImplementor; +import org.hibernate.intercept.AbstractFieldInterceptor; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; diff --git a/hibernate-core/src/main/java/org/hibernate/intercept/javassist/FieldInterceptorImpl.java b/hibernate-core/src/main/java/org/hibernate/intercept/javassist/FieldInterceptorImpl.java index f048de93a3..ba775ef4bf 100644 --- a/hibernate-core/src/main/java/org/hibernate/intercept/javassist/FieldInterceptorImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/intercept/javassist/FieldInterceptorImpl.java @@ -23,13 +23,11 @@ * */ package org.hibernate.intercept.javassist; - import java.io.Serializable; import java.util.Set; - import org.hibernate.bytecode.javassist.FieldHandler; -import org.hibernate.intercept.AbstractFieldInterceptor; import org.hibernate.engine.SessionImplementor; +import org.hibernate.intercept.AbstractFieldInterceptor; import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.LazyInitializer; diff --git a/hibernate-core/src/main/java/org/hibernate/intercept/javassist/JavassistHelper.java b/hibernate-core/src/main/java/org/hibernate/intercept/javassist/JavassistHelper.java index b4696372e3..205dba1660 100644 --- a/hibernate-core/src/main/java/org/hibernate/intercept/javassist/JavassistHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/intercept/javassist/JavassistHelper.java @@ -23,12 +23,10 @@ * */ package org.hibernate.intercept.javassist; - -import org.hibernate.intercept.FieldInterceptor; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.bytecode.javassist.FieldHandled; - import java.util.Set; +import org.hibernate.bytecode.javassist.FieldHandled; +import org.hibernate.engine.SessionImplementor; +import org.hibernate.intercept.FieldInterceptor; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java index 036066f2b3..4687e8c511 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanInfoHelper.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.internal.util.beans; - import java.beans.BeanInfo; import java.beans.IntrospectionException; import java.beans.Introspector; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java index 249bb66cb1..d51f81b271 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/beans/BeanIntrospectionException.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.internal.util.beans; - +import java.beans.BeanInfo; import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationException.java b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationException.java index 599bba0499..d58cdc8245 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationException.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationException.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.internal.util.config; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java index 48b0ac3088..b92eab80a2 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java @@ -23,13 +23,11 @@ * */ package org.hibernate.internal.util.config; - import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; -import java.util.Iterator; - import org.hibernate.util.ArrayHelper; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeInfo.java b/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeInfo.java index 543913df56..0bb4fb88e1 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeInfo.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeInfo.java @@ -23,6 +23,7 @@ */ package org.hibernate.internal.util.jdbc; + /** * Models type info extracted from {@link java.sql.DatabaseMetaData#getTypeInfo()} * diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeInfoExtracter.java b/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeInfoExtracter.java index f983562baa..1bed66e6f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeInfoExtracter.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeInfoExtracter.java @@ -22,13 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.internal.util.jdbc; - import java.sql.DatabaseMetaData; import java.sql.ResultSet; import java.sql.SQLException; import java.util.LinkedHashSet; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.util.ArrayHelper; +import org.jboss.logging.Logger; /** * Helper to extract type innformation from {@link DatabaseMetaData JDBC metadata} @@ -37,8 +37,7 @@ */ public class TypeInfoExtracter { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - TypeInfoExtracter.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, TypeInfoExtracter.class.getName()); private TypeInfoExtracter() { } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeNullability.java b/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeNullability.java index 2dad8be345..8192408de3 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeNullability.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeNullability.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.internal.util.jdbc; - import java.sql.DatabaseMetaData; /** diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeSearchability.java b/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeSearchability.java index 555524f62f..9ec80104b1 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeSearchability.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/jdbc/TypeSearchability.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.internal.util.jdbc; - import java.sql.DatabaseMetaData; /** diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiException.java b/hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiException.java index 330cae66ca..4453477425 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiException.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiException.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.internal.util.jndi; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiHelper.java index 6199c7f59c..c1cfda898d 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiHelper.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.internal.util.jndi; - import java.util.Hashtable; import java.util.Map; import java.util.Properties; @@ -32,13 +31,13 @@ import javax.naming.Name; import javax.naming.NameNotFoundException; import javax.naming.NamingException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.cfg.Environment; +import org.jboss.logging.Logger; public final class JndiHelper { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - JndiHelper.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, JndiHelper.class.getName()); private JndiHelper() { } @@ -156,7 +155,7 @@ public static void bind(String jndiName, Object value, Context context) { throw new JndiException( "Error performing intermediate bind [" + n + "]", e ); } } - LOG.debug("Bound name: " + jndiName); + LOG.debugf("Bound name: %s", jndiName); } private static Name tokenizeName(String jndiName, Context context) { @@ -220,7 +219,7 @@ public static void bind(Context ctx, String name, Object val) throws NamingExcep catch (NameNotFoundException nfe) {} if (subctx!=null) { - LOG.debug("Found subcontext: " + ctxName); + LOG.debugf("Found subcontext: %s", ctxName); ctx = subctx; } else { @@ -232,7 +231,7 @@ public static void bind(Context ctx, String name, Object val) throws NamingExcep LOG.trace("Binding : " + n); ctx.rebind(n, val); } - LOG.debug("Bound name: " + name); + LOG.debugf("Bound name: %s", name); } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/jta/JtaStatusHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/jta/JtaStatusHelper.java index d9c2c05e45..edd1d6b0aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/util/jta/JtaStatusHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/util/jta/JtaStatusHelper.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.internal.util.jta; - import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; - import org.hibernate.TransactionException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/BatchFailedException.java b/hibernate-core/src/main/java/org/hibernate/jdbc/BatchFailedException.java index 26c77efb0f..51b0223c42 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/BatchFailedException.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/BatchFailedException.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.jdbc; - +package org.hibernate.jdbc; import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/BatchedTooManyRowsAffectedException.java b/hibernate-core/src/main/java/org/hibernate/jdbc/BatchedTooManyRowsAffectedException.java index 9bca06926e..fe22913792 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/BatchedTooManyRowsAffectedException.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/BatchedTooManyRowsAffectedException.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.jdbc; +package org.hibernate.jdbc; + /** * Much like {@link TooManyRowsAffectedException}, indicates that more diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/BorrowedConnectionProxy.java b/hibernate-core/src/main/java/org/hibernate/jdbc/BorrowedConnectionProxy.java index 3b3ff05b5d..8db7fb0eeb 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/BorrowedConnectionProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/BorrowedConnectionProxy.java @@ -23,15 +23,13 @@ * */ package org.hibernate.jdbc; - -import org.hibernate.HibernateException; -import org.hibernate.engine.jdbc.internal.LogicalConnectionImpl; - import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import java.lang.reflect.InvocationTargetException; import java.sql.Connection; +import org.hibernate.HibernateException; +import org.hibernate.engine.jdbc.internal.LogicalConnectionImpl; /** * A proxy for borrowed connections which funnels all requests back diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/ConnectionWrapper.java b/hibernate-core/src/main/java/org/hibernate/jdbc/ConnectionWrapper.java index 1515245d79..35cf37f043 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/ConnectionWrapper.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/ConnectionWrapper.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.jdbc; - +package org.hibernate.jdbc; import java.sql.Connection; /** diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java index 021e3a6fcb..f3ff016268 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectation.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.jdbc; - -import org.hibernate.HibernateException; - -import java.sql.SQLException; +package org.hibernate.jdbc; import java.sql.PreparedStatement; +import java.sql.SQLException; +import org.hibernate.HibernateException; /** * Defines an expected DML operation outcome. diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java index fc3b6a3979..a3c4780883 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java @@ -22,18 +22,18 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.jdbc; - +package org.hibernate.jdbc; import java.sql.CallableStatement; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Types; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.StaleStateException; import org.hibernate.engine.ExecuteUpdateResultCheckStyle; import org.hibernate.exception.GenericJDBCException; import org.hibernate.util.JDBCExceptionReporter; +import org.jboss.logging.Logger; /** * Holds various often used {@link Expectation} definitions. @@ -42,8 +42,7 @@ */ public class Expectations { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - Expectations.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Expectations.class.getName()); public static final int USUAL_EXPECTED_COUNT = 1; public static final int USUAL_PARAM_POSITION = 1; @@ -72,7 +71,7 @@ public final void verifyOutcome(int rowCount, PreparedStatement statement, int b } private void checkBatched(int rowCount, int batchPosition) { - if (rowCount == -2) LOG.debug("Success of batch update unknown: " + batchPosition); + if (rowCount == -2) LOG.debugf("Success of batch update unknown: %s", batchPosition); else if (rowCount == -3) throw new BatchFailedException("Batch update failed: " + batchPosition); else { if (expectedRowCount > rowCount) throw new StaleStateException( diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/TooManyRowsAffectedException.java b/hibernate-core/src/main/java/org/hibernate/jdbc/TooManyRowsAffectedException.java index 5e8f09638f..a7e513ccdc 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/TooManyRowsAffectedException.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/TooManyRowsAffectedException.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.jdbc; - +package org.hibernate.jdbc; import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java b/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java index c8716ffe1a..1a3512c436 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/Work.java @@ -23,10 +23,8 @@ * */ package org.hibernate.jdbc; - import java.sql.Connection; import java.sql.SQLException; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/util/BasicFormatterImpl.java b/hibernate-core/src/main/java/org/hibernate/jdbc/util/BasicFormatterImpl.java index 68f6a8d89f..36a601cd49 100755 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/util/BasicFormatterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/util/BasicFormatterImpl.java @@ -23,12 +23,10 @@ * */ package org.hibernate.jdbc.util; - import java.util.HashSet; import java.util.LinkedList; import java.util.Set; import java.util.StringTokenizer; - import org.hibernate.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/util/DDLFormatterImpl.java b/hibernate-core/src/main/java/org/hibernate/jdbc/util/DDLFormatterImpl.java index e3a06dbaf3..340c6e5011 100755 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/util/DDLFormatterImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/util/DDLFormatterImpl.java @@ -23,7 +23,6 @@ * */ package org.hibernate.jdbc.util; - import java.util.StringTokenizer; /** diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/util/FormatStyle.java b/hibernate-core/src/main/java/org/hibernate/jdbc/util/FormatStyle.java index 00da9d4e50..e6b9979572 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/util/FormatStyle.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/util/FormatStyle.java @@ -24,6 +24,7 @@ */ package org.hibernate.jdbc.util; + /** * Represents the the understood types or styles of formatting. * diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/util/Formatter.java b/hibernate-core/src/main/java/org/hibernate/jdbc/util/Formatter.java index 2e43de74c7..bab741c431 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/util/Formatter.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/util/Formatter.java @@ -24,6 +24,7 @@ */ package org.hibernate.jdbc.util; + /** * Formatter contract * diff --git a/hibernate-core/src/main/java/org/hibernate/jdbc/util/SQLStatementLogger.java b/hibernate-core/src/main/java/org/hibernate/jdbc/util/SQLStatementLogger.java index 7641755bac..6b249e3418 100644 --- a/hibernate-core/src/main/java/org/hibernate/jdbc/util/SQLStatementLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/jdbc/util/SQLStatementLogger.java @@ -23,8 +23,8 @@ * */ package org.hibernate.jdbc.util; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; +import org.jboss.logging.Logger; /** * Centralize logging handling for SQL statements. @@ -36,8 +36,7 @@ public class SQLStatementLogger { // private static final Logger log = LoggerFactory.getLogger( SQLStatementLogger.class ); // this is the legacy logging 'category'... - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SQLStatementLogger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SQLStatementLogger.class.getName()); private boolean logToStdout; private boolean formatSql; @@ -108,7 +107,7 @@ public void logStatement(String statement, FormatStyle style) { if (LOG.isDebugEnabled() || logToStdout) { style = determineActualStyle( style ); statement = style.getFormatter().format( statement ); - LOG.debug(statement); + LOG.debugf(statement); if (logToStdout) System.out.println("Hibernate: " + statement); } } diff --git a/hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java b/hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java index a476b4f59f..0eccd13a33 100644 --- a/hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java +++ b/hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java @@ -1,17 +1,17 @@ //$Id: HibernateService.java 6100 2005-03-17 10:48:03Z turin42 $ package org.hibernate.jmx; - import java.util.Map; import java.util.Properties; import javax.naming.InitialContext; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; import org.hibernate.cfg.internal.ServicesRegistryBootstrap; import org.hibernate.internal.util.jndi.JndiHelper; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.hibernate.util.ExternalSessionFactoryConfig; +import org.jboss.logging.Logger; /** @@ -25,8 +25,7 @@ */ public class HibernateService extends ExternalSessionFactoryConfig implements HibernateServiceMBean { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - HibernateService.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, HibernateService.class.getName()); private String boundName; private Properties properties = new Properties(); @@ -51,7 +50,7 @@ public void stop() { //context.unbind(boundName); } catch (Exception e) { - LOG.warn(LOG.unableToStopHibernateService(), e); + LOG.unableToStopHibernateService(e); } } diff --git a/hibernate-core/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java b/hibernate-core/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java index d161c7f0cf..85c489c8aa 100644 --- a/hibernate-core/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java +++ b/hibernate-core/src/main/java/org/hibernate/jmx/HibernateServiceMBean.java @@ -1,6 +1,5 @@ //$Id: HibernateServiceMBean.java 10860 2006-11-22 00:02:55Z steve.ebersole@jboss.com $ package org.hibernate.jmx; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/jmx/SessionFactoryStub.java b/hibernate-core/src/main/java/org/hibernate/jmx/SessionFactoryStub.java index 87a00754e4..1c80031c4d 100644 --- a/hibernate-core/src/main/java/org/hibernate/jmx/SessionFactoryStub.java +++ b/hibernate-core/src/main/java/org/hibernate/jmx/SessionFactoryStub.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.jmx; - import java.io.InvalidObjectException; import java.io.ObjectStreamException; import java.io.Serializable; @@ -35,8 +34,8 @@ import org.hibernate.AssertionFailure; import org.hibernate.Cache; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.Interceptor; -import org.hibernate.Logger; import org.hibernate.SessionFactory; import org.hibernate.StatelessSession; import org.hibernate.TypeHelper; @@ -47,6 +46,7 @@ import org.hibernate.metadata.ClassMetadata; import org.hibernate.metadata.CollectionMetadata; import org.hibernate.stat.Statistics; +import org.jboss.logging.Logger; /** * A flyweight for SessionFactory. If the MBean itself does not @@ -58,8 +58,7 @@ public class SessionFactoryStub implements SessionFactory { private static final IdentifierGenerator UUID_GENERATOR = UUIDGenerator.buildSessionFactoryUniqueIdentifierGenerator(); - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SessionFactoryStub.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SessionFactoryStub.class.getName()); private transient SessionFactory impl; private transient HibernateService service; @@ -113,8 +112,8 @@ private Object readResolve() throws ObjectStreamException { // (alternatively we could do an actual JNDI lookup here....) result = SessionFactoryObjectFactory.getNamedInstance(name); if (result == null) throw new InvalidObjectException("Could not find a stub SessionFactory named: " + name); - LOG.debug("Resolved stub SessionFactory by name"); - } else LOG.debug("Resolved stub SessionFactory by uid"); + LOG.debugf("Resolved stub SessionFactory by name"); + } else LOG.debugf("Resolved stub SessionFactory by uid"); return result; } diff --git a/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsService.java b/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsService.java index 24c12ce902..0c5b0f58b3 100644 --- a/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsService.java +++ b/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsService.java @@ -1,11 +1,10 @@ //$Id: StatisticsService.java 8262 2005-09-30 07:48:53Z oneovthafew $ package org.hibernate.jmx; - import javax.naming.InitialContext; import javax.naming.NameNotFoundException; import javax.naming.NamingException; import javax.naming.Reference; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.SessionFactory; import org.hibernate.impl.SessionFactoryObjectFactory; import org.hibernate.stat.CollectionStatistics; @@ -14,6 +13,7 @@ import org.hibernate.stat.SecondLevelCacheStatistics; import org.hibernate.stat.Statistics; import org.hibernate.stat.StatisticsImpl; +import org.jboss.logging.Logger; /** * JMX service for Hibernate statistics
@@ -49,8 +49,7 @@ */ public class StatisticsService implements StatisticsServiceMBean { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - StatisticsService.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, StatisticsService.class.getName()); //TODO: We probably should have a StatisticsNotPublishedException, to make it clean SessionFactory sf; diff --git a/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java b/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java index 140e77aaab..ab5ca9afc9 100644 --- a/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java +++ b/hibernate-core/src/main/java/org/hibernate/jmx/StatisticsServiceMBean.java @@ -1,6 +1,5 @@ //$Id: StatisticsServiceMBean.java 4332 2004-08-15 12:55:28Z oneovthafew $ package org.hibernate.jmx; - import org.hibernate.stat.Statistics; /** diff --git a/hibernate-core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java index 432fd0e3bc..cc58b59de0 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/AbstractEntityJoinWalker.java @@ -23,19 +23,17 @@ * */ package org.hibernate.loader; - import java.util.ArrayList; -import java.util.List; import java.util.Iterator; - +import java.util.List; import org.hibernate.FetchMode; -import org.hibernate.MappingException; import org.hibernate.LockOptions; +import org.hibernate.MappingException; import org.hibernate.engine.CascadeStyle; -import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.LoadQueryInfluencers; -import org.hibernate.engine.profile.FetchProfile; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.profile.Fetch; +import org.hibernate.engine.profile.FetchProfile; import org.hibernate.persister.entity.Loadable; import org.hibernate.persister.entity.OuterJoinLoadable; import org.hibernate.sql.JoinFragment; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/BasicLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/BasicLoader.java index f35550b31a..33cca81160 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/BasicLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/BasicLoader.java @@ -23,13 +23,11 @@ * */ package org.hibernate.loader; - -import java.util.List; import java.util.ArrayList; - +import java.util.List; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.persister.entity.Loadable; import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.persister.entity.Loadable; import org.hibernate.type.BagType; /** diff --git a/hibernate-core/src/main/java/org/hibernate/loader/CollectionAliases.java b/hibernate-core/src/main/java/org/hibernate/loader/CollectionAliases.java index b9ad15d0bb..e34a9fe58e 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/CollectionAliases.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/CollectionAliases.java @@ -24,6 +24,7 @@ */ package org.hibernate.loader; + /** * Type definition of CollectionAliases. * diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ColumnEntityAliases.java b/hibernate-core/src/main/java/org/hibernate/loader/ColumnEntityAliases.java index 9c2bccaf36..957bd3d5d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ColumnEntityAliases.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ColumnEntityAliases.java @@ -22,10 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.loader; - import java.util.Map; - -import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.persister.entity.Loadable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/loader/DefaultEntityAliases.java b/hibernate-core/src/main/java/org/hibernate/loader/DefaultEntityAliases.java index eeefe64b66..f49e48e8e3 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/DefaultEntityAliases.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/DefaultEntityAliases.java @@ -23,9 +23,7 @@ * */ package org.hibernate.loader; - import java.util.Map; - import org.hibernate.persister.entity.Loadable; import org.hibernate.util.CollectionHelper; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/EntityAliases.java b/hibernate-core/src/main/java/org/hibernate/loader/EntityAliases.java index dfc5cf2a06..b6f093fe94 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/EntityAliases.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/EntityAliases.java @@ -23,7 +23,6 @@ * */ package org.hibernate.loader; - import org.hibernate.persister.entity.Loadable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/loader/GeneratedCollectionAliases.java b/hibernate-core/src/main/java/org/hibernate/loader/GeneratedCollectionAliases.java index b894769325..e724f6c8b0 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/GeneratedCollectionAliases.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/GeneratedCollectionAliases.java @@ -23,9 +23,7 @@ * */ package org.hibernate.loader; - import java.util.Map; - import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.util.CollectionHelper; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java index 1201eba9e5..dae1783fe8 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/JoinWalker.java @@ -22,23 +22,21 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.loader; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; - import org.hibernate.FetchMode; import org.hibernate.LockMode; -import org.hibernate.MappingException; import org.hibernate.LockOptions; +import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.CascadeStyle; import org.hibernate.engine.JoinHelper; -import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.LoadQueryInfluencers; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/Loader.java b/hibernate-core/src/main/java/org/hibernate/loader/Loader.java index 5874187bfe..9b6b1065b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/Loader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/Loader.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.loader; - import java.io.Serializable; import java.sql.CallableStatement; import java.sql.PreparedStatement; @@ -38,9 +37,9 @@ import java.util.Set; import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; import org.hibernate.LockOptions; -import org.hibernate.Logger; import org.hibernate.QueryException; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; @@ -81,6 +80,7 @@ import org.hibernate.type.Type; import org.hibernate.type.VersionType; import org.hibernate.util.StringHelper; +import org.jboss.logging.Logger; /** * Abstract superclass of object loading (and querying) strategies. This class implements @@ -98,7 +98,7 @@ */ public abstract class Loader { - protected static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Loader.class.getPackage().getName()); + protected static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, Loader.class.getName()); private final SessionFactoryImplementor factory; private ColumnNameCache columnNameCache; @@ -860,7 +860,7 @@ private List doQuery( int count; for ( count = 0; count < maxRows && rs.next(); count++ ) { - LOG.debug("Result set row: " + count); + LOG.debugf("Result set row: %s", count); Object result = getRowFromResultSet( rs, @@ -1180,8 +1180,8 @@ private void readCollectionElement( if ( collectionRowKey != null ) { // we found a collection element in the result set - if (LOG.isDebugEnabled()) LOG.debug("Found row of collection: " - + MessageHelper.collectionInfoString(persister, collectionRowKey, getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Found row of collection: %s", + MessageHelper.collectionInfoString(persister, collectionRowKey, getFactory())); Object owner = optionalOwner; if ( owner == null ) { @@ -1209,8 +1209,8 @@ else if ( optionalKey != null ) { // ensure that a collection is created with the owner's identifier, // since what we have is an empty collection - if (LOG.isDebugEnabled()) LOG.debug("Result set contains (possibly empty) collection: " - + MessageHelper.collectionInfoString(persister, optionalKey, getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Result set contains (possibly empty) collection: %s", + MessageHelper.collectionInfoString(persister, optionalKey, getFactory())); persistenceContext.getLoadContexts() .getCollectionLoadContext( rs ) @@ -1242,10 +1242,10 @@ private void handleEmptyCollections( for ( int i = 0; i < keys.length; i++ ) { //handle empty collections - if (LOG.isDebugEnabled()) LOG.debug("Result set contains (possibly empty) collection: " - + MessageHelper.collectionInfoString(collectionPersisters[j], - keys[i], - getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Result set contains (possibly empty) collection: %s", + MessageHelper.collectionInfoString(collectionPersisters[j], + keys[i], + getFactory())); session.getPersistenceContext() .getLoadContexts() @@ -1359,7 +1359,7 @@ private Object[] getRow( final int cols = persisters.length; final EntityAliases[] descriptors = getEntityAliases(); - if (LOG.isDebugEnabled()) LOG.debug("Result row: " + StringHelper.toString(keys)); + if (LOG.isDebugEnabled()) LOG.debugf("Result row: %s", StringHelper.toString(keys)); final Object[] rowResults = new Object[cols]; @@ -1765,9 +1765,8 @@ protected final PreparedStatement prepareQueryStatement( LockOptions lockOptions = queryParameters.getLockOptions(); if ( lockOptions != null ) { if ( lockOptions.getTimeOut() != LockOptions.WAIT_FOREVER ) { - if (!dialect.supportsLockTimeouts()) LOG.debug("Lock timeout [" - + lockOptions.getTimeOut() - + "] requested but dialect reported to not support lock timeouts"); + if (!dialect.supportsLockTimeouts()) LOG.debugf("Lock timeout [%s] requested but dialect reported to not support lock timeouts", + lockOptions.getTimeOut()); else if (dialect.isLockTimeoutParameterized()) st.setInt(col++, lockOptions.getTimeOut()); } } @@ -1933,7 +1932,7 @@ protected int bindNamedParameters( TypedValue typedval = ( TypedValue ) e.getValue(); int[] locs = getNamedParameterLocs( name ); for ( int i = 0; i < locs.length; i++ ) { - LOG.debug("bindNamedParameters() " + typedval.getValue() + " -> " + name + " [" + (locs[i] + startIndex) + "]"); + LOG.debugf("bindNamedParameters() %s -> %s [%s]", typedval.getValue(), name, locs[i] + startIndex); typedval.getType().nullSafeSet( statement, typedval.getValue(), locs[i] + startIndex, session ); } result += locs.length; @@ -1992,13 +1991,13 @@ private synchronized ResultSet wrapResultSetIfEnabled(final ResultSet rs, final // potential deadlock issues due to nature of code. if ( session.getFactory().getSettings().isWrapResultSetsEnabled() ) { try { - LOG.debug("Wrapping result set [" + rs + "]"); + LOG.debugf("Wrapping result set [%s]", rs); return session.getFactory() .getSettings() .getJdbcSupport().wrap( rs, retreiveColumnNameToIndexCache( rs ) ); } catch(SQLException e) { - LOG.info(LOG.unableToWrapResultSet(), e); + LOG.unableToWrapResultSet(e); return rs; } } @@ -2031,8 +2030,8 @@ protected final List loadEntity( final EntityPersister persister, LockOptions lockOptions) throws HibernateException { - if (LOG.isDebugEnabled()) LOG.debug("Loading entity: " - + MessageHelper.infoString(persister, id, identifierType, getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Loading entity: %s", + MessageHelper.infoString(persister, id, identifierType, getFactory())); List result; try { @@ -2055,7 +2054,7 @@ protected final List loadEntity( ); } - LOG.debug("Done entity load"); + LOG.debugf("Done entity load"); return result; @@ -2073,7 +2072,7 @@ protected final List loadEntity( final Type indexType, final EntityPersister persister) throws HibernateException { - LOG.debug("Loading collection element by index"); + LOG.debugf("Loading collection element by index"); List result; try { @@ -2094,7 +2093,7 @@ protected final List loadEntity( ); } - LOG.debug("Done entity load"); + LOG.debugf("Done entity load"); return result; @@ -2115,7 +2114,7 @@ public final List loadEntityBatch( final EntityPersister persister, LockOptions lockOptions) throws HibernateException { - if (LOG.isDebugEnabled()) LOG.debug("Batch loading entity: " + MessageHelper.infoString(persister, ids, getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Batch loading entity: %s", MessageHelper.infoString(persister, ids, getFactory())); Type[] types = new Type[ids.length]; Arrays.fill( types, idType ); @@ -2139,7 +2138,7 @@ public final List loadEntityBatch( ); } - LOG.debug("Done entity batch load"); + LOG.debugf("Done entity batch load"); return result; @@ -2153,8 +2152,8 @@ public final void loadCollection( final Serializable id, final Type type) throws HibernateException { - if (LOG.isDebugEnabled()) LOG.debug("Loading collection: " - + MessageHelper.collectionInfoString(getCollectionPersisters()[0], id, getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Loading collection: %s", + MessageHelper.collectionInfoString(getCollectionPersisters()[0], id, getFactory())); Serializable[] ids = new Serializable[]{id}; try { @@ -2173,7 +2172,7 @@ public final void loadCollection( ); } - LOG.debug("Done loading collection"); + LOG.debugf("Done loading collection"); } @@ -2185,8 +2184,8 @@ public final void loadCollectionBatch( final Serializable[] ids, final Type type) throws HibernateException { - if (LOG.isDebugEnabled()) LOG.debug("Batch loading collection: " - + MessageHelper.collectionInfoString(getCollectionPersisters()[0], ids, getFactory())); + if (LOG.isDebugEnabled()) LOG.debugf("Batch loading collection: %s", + MessageHelper.collectionInfoString(getCollectionPersisters()[0], ids, getFactory())); Type[] idTypes = new Type[ids.length]; Arrays.fill( idTypes, type ); @@ -2206,7 +2205,7 @@ public final void loadCollectionBatch( ); } - LOG.debug("Done batch load"); + LOG.debugf("Done batch load"); } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java b/hibernate-core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java index 8b3e6b5faf..fcb3dca6a9 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/MultipleBagFetchException.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.loader; - import java.util.List; - import org.hibernate.HibernateException; /** diff --git a/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java index e4ccfdf537..19ec5f07df 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinLoader.java @@ -23,14 +23,11 @@ * */ package org.hibernate.loader; - -import java.util.Map; - -import org.hibernate.LockOptions; import org.hibernate.LockMode; +import org.hibernate.LockOptions; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.LoadQueryInfluencers; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.Loadable; import org.hibernate.type.EntityType; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinableAssociation.java b/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinableAssociation.java index 2392577e09..384b37eb44 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinableAssociation.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/OuterJoinableAssociation.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.loader; - import java.util.List; import java.util.Map; - import org.hibernate.MappingException; import org.hibernate.engine.JoinHelper; import org.hibernate.engine.SessionFactoryImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/PropertyPath.java b/hibernate-core/src/main/java/org/hibernate/loader/PropertyPath.java index 0b0dfedad8..16868c136b 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/PropertyPath.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/PropertyPath.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.loader; - import org.hibernate.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionJoinWalker.java index c3a4d9246b..84daf4fa74 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionJoinWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionJoinWalker.java @@ -23,17 +23,15 @@ * */ package org.hibernate.loader.collection; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; - import org.hibernate.FetchMode; import org.hibernate.LockMode; import org.hibernate.MappingException; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.engine.CascadeStyle; +import org.hibernate.engine.LoadQueryInfluencers; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.loader.BasicLoader; import org.hibernate.loader.OuterJoinableAssociation; import org.hibernate.loader.PropertyPath; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java index f04dfe442e..b094d11f92 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java @@ -23,13 +23,13 @@ * */ package org.hibernate.loader.collection; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.loader.JoinWalker; import org.hibernate.persister.collection.QueryableCollection; +import org.jboss.logging.Logger; /** * Loads a collection of values or a many-to-many association. @@ -42,8 +42,7 @@ */ public class BasicCollectionLoader extends CollectionLoader { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - BasicCollectionLoader.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, BasicCollectionLoader.class.getName()); public BasicCollectionLoader( QueryableCollection collectionPersister, @@ -79,6 +78,6 @@ protected BasicCollectionLoader( postInstantiate(); - LOG.debug("Static select for collection " + collectionPersister.getRole() + ": " + getSQLString()); + LOG.debugf("Static select for collection %s: %s", collectionPersister.getRole(), getSQLString()); } } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/BatchingCollectionInitializer.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/BatchingCollectionInitializer.java index 737c017c49..80b6be1052 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/BatchingCollectionInitializer.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/BatchingCollectionInitializer.java @@ -23,14 +23,12 @@ * */ package org.hibernate.loader.collection; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.MappingException; +import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.loader.Loader; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.collection.QueryableCollection; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionInitializer.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionInitializer.java index 0c0e4d519b..07115765ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionInitializer.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionInitializer.java @@ -23,9 +23,7 @@ * */ package org.hibernate.loader.collection; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionJoinWalker.java index 283838de0f..60a6430607 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionJoinWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionJoinWalker.java @@ -23,9 +23,8 @@ * */ package org.hibernate.loader.collection; - -import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.LoadQueryInfluencers; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.loader.JoinWalker; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionLoader.java index 0d5d6da2e0..89477f1426 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/CollectionLoader.java @@ -23,13 +23,11 @@ * */ package org.hibernate.loader.collection; - import java.io.Serializable; - import org.hibernate.HibernateException; +import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.loader.OuterJoinLoader; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyJoinWalker.java index d9df8467e8..46443ddcfe 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyJoinWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyJoinWalker.java @@ -23,22 +23,19 @@ * */ package org.hibernate.loader.collection; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import org.hibernate.LockMode; import org.hibernate.MappingException; -import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.LoadQueryInfluencers; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.loader.BasicLoader; import org.hibernate.loader.OuterJoinableAssociation; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.OuterJoinLoadable; import org.hibernate.sql.JoinFragment; import org.hibernate.sql.Select; -import org.hibernate.util.CollectionHelper; import org.hibernate.util.StringHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java index 7849a657d7..087acb9975 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java @@ -23,13 +23,13 @@ * */ package org.hibernate.loader.collection; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.loader.JoinWalker; import org.hibernate.persister.collection.QueryableCollection; +import org.jboss.logging.Logger; /** * Loads one-to-many associations
@@ -42,8 +42,7 @@ */ public class OneToManyLoader extends CollectionLoader { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - OneToManyLoader.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, OneToManyLoader.class.getName()); public OneToManyLoader( QueryableCollection oneToManyPersister, @@ -78,6 +77,6 @@ public OneToManyLoader( initFromWalker( walker ); postInstantiate(); - LOG.debug("Static select for one-to-many " + oneToManyPersister.getRole() + ": " + getSQLString()); + LOG.debugf("Static select for one-to-many %s: %s", oneToManyPersister.getRole(), getSQLString()); } } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/SubselectCollectionLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/SubselectCollectionLoader.java index b942ee896d..e45e4a2943 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/SubselectCollectionLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/SubselectCollectionLoader.java @@ -23,19 +23,17 @@ * */ package org.hibernate.loader.collection; - import java.io.Serializable; import java.util.Collection; import java.util.Iterator; import java.util.Map; - import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.engine.EntityKey; +import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/collection/SubselectOneToManyLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/collection/SubselectOneToManyLoader.java index 50b6d5c573..42cf4109a3 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/collection/SubselectOneToManyLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/collection/SubselectOneToManyLoader.java @@ -23,19 +23,17 @@ * */ package org.hibernate.loader.collection; - import java.io.Serializable; import java.util.Collection; import java.util.Iterator; import java.util.Map; - import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.engine.EntityKey; +import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java index 181433be4b..e1f89b9b27 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaJoinWalker.java @@ -23,19 +23,17 @@ * */ package org.hibernate.loader.criteria; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; - import org.hibernate.Criteria; import org.hibernate.FetchMode; -import org.hibernate.MappingException; import org.hibernate.LockOptions; +import org.hibernate.MappingException; import org.hibernate.engine.CascadeStyle; -import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.LoadQueryInfluencers; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.impl.CriteriaImpl; import org.hibernate.loader.AbstractEntityJoinWalker; import org.hibernate.loader.PropertyPath; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java index f34222372d..b0937b0f3c 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaLoader.java @@ -23,29 +23,27 @@ * */ package org.hibernate.loader.criteria; - import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; - import org.hibernate.HibernateException; import org.hibernate.LockMode; +import org.hibernate.LockOptions; import org.hibernate.QueryException; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; -import org.hibernate.LockOptions; import org.hibernate.dialect.Dialect; +import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.impl.CriteriaImpl; import org.hibernate.loader.OuterJoinLoader; -import org.hibernate.persister.entity.OuterJoinLoadable; import org.hibernate.persister.entity.Lockable; +import org.hibernate.persister.entity.OuterJoinLoadable; import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java index f235f75784..9ae7bceac1 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/criteria/CriteriaQueryTranslator.java @@ -23,40 +23,36 @@ * */ package org.hibernate.loader.criteria; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; import java.util.StringTokenizer; -import java.util.LinkedHashMap; - import org.hibernate.Criteria; import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.LockMode; +import org.hibernate.LockOptions; import org.hibernate.MappingException; import org.hibernate.QueryException; -import org.hibernate.LockOptions; -import org.hibernate.criterion.EnhancedProjection; -import org.hibernate.hql.ast.util.SessionFactoryHelper; import org.hibernate.criterion.CriteriaQuery; import org.hibernate.criterion.Criterion; +import org.hibernate.criterion.EnhancedProjection; import org.hibernate.criterion.Projection; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.RowSelection; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.TypedValue; +import org.hibernate.hql.ast.util.SessionFactoryHelper; import org.hibernate.impl.CriteriaImpl; import org.hibernate.persister.entity.Loadable; import org.hibernate.persister.entity.PropertyMapping; import org.hibernate.persister.entity.Queryable; -import org.hibernate.transform.CacheableResultTransformer; -import org.hibernate.transform.TupleSubsetResultTransformer; import org.hibernate.type.AssociationType; import org.hibernate.type.StringRepresentableType; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java index 9237c69510..274c2e95eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionFetchReturn.java @@ -22,11 +22,10 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.loader.custom; - +package org.hibernate.loader.custom; +import org.hibernate.LockMode; import org.hibernate.loader.CollectionAliases; import org.hibernate.loader.EntityAliases; -import org.hibernate.LockMode; /** * Spefically a fetch return that refers to a collection association. diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionReturn.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionReturn.java index 05b4394cb9..ce7b61da38 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/CollectionReturn.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.loader.custom; - +package org.hibernate.loader.custom; import org.hibernate.LockMode; import org.hibernate.loader.CollectionAliases; import org.hibernate.loader.EntityAliases; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java index 694397f722..e6134f6cc4 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/ColumnCollectionAliases.java @@ -23,9 +23,7 @@ * */ package org.hibernate.loader.custom; - import java.util.Map; - import org.hibernate.loader.CollectionAliases; import org.hibernate.persister.collection.SQLLoadableCollection; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java index 7064025fea..762a1a1219 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomLoader.java @@ -23,22 +23,20 @@ * */ package org.hibernate.loader.custom; - import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.HashSet; - import org.hibernate.HibernateException; import org.hibernate.LockMode; +import org.hibernate.LockOptions; import org.hibernate.QueryException; import org.hibernate.ScrollableResults; -import org.hibernate.LockOptions; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; @@ -51,9 +49,9 @@ import org.hibernate.persister.entity.Loadable; import org.hibernate.persister.entity.Queryable; import org.hibernate.transform.ResultTransformer; -import org.hibernate.type.Type; -import org.hibernate.type.EntityType; import org.hibernate.type.CollectionType; +import org.hibernate.type.EntityType; +import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomQuery.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomQuery.java index 57fa9bed69..be3fe4eab7 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/CustomQuery.java @@ -23,10 +23,9 @@ * */ package org.hibernate.loader.custom; - +import java.util.List; import java.util.Map; import java.util.Set; -import java.util.List; /** * Extension point allowing any SQL query with named and positional parameters diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/EntityFetchReturn.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/EntityFetchReturn.java index 2bdc5da88e..da9ba0686e 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/EntityFetchReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/EntityFetchReturn.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.loader.custom; - -import org.hibernate.loader.EntityAliases; +package org.hibernate.loader.custom; import org.hibernate.LockMode; +import org.hibernate.loader.EntityAliases; /** * Spefically a fetch return that refers to an entity association. diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/FetchReturn.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/FetchReturn.java index f7cd5e2eb6..e27af6f75a 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/FetchReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/FetchReturn.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.loader.custom; - +package org.hibernate.loader.custom; import org.hibernate.LockMode; /** diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/NonScalarReturn.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/NonScalarReturn.java index b4bb044699..ecb288d29b 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/NonScalarReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/NonScalarReturn.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.loader.custom; - -import org.hibernate.LockMode; +package org.hibernate.loader.custom; import org.hibernate.HibernateException; +import org.hibernate.LockMode; /** * Represents some non-scalar (entity/collection) return within the query result. diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/Return.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/Return.java index 4510a9b816..72b7463ede 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/Return.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/Return.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.loader.custom; +package org.hibernate.loader.custom; + /** * Represents a return in a custom query. diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/RootReturn.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/RootReturn.java index 6ff76f5b88..4c94207583 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/RootReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/RootReturn.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.loader.custom; - +package org.hibernate.loader.custom; import org.hibernate.LockMode; import org.hibernate.loader.EntityAliases; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/ScalarReturn.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/ScalarReturn.java index bd8a9e35a5..4e55a83725 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/ScalarReturn.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/ScalarReturn.java @@ -22,8 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.loader.custom; - +package org.hibernate.loader.custom; import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java index eebc6cbc2e..1b1549aca7 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java @@ -23,7 +23,6 @@ * */ package org.hibernate.loader.custom.sql; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -32,12 +31,13 @@ import java.util.Map; import java.util.Set; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.query.sql.NativeSQLQueryReturn; import org.hibernate.loader.custom.CustomQuery; import org.hibernate.persister.collection.SQLLoadableCollection; import org.hibernate.persister.entity.SQLLoadable; +import org.jboss.logging.Logger; /** * Implements Hibernate's built-in support for native SQL queries. @@ -50,8 +50,7 @@ */ public class SQLCustomQuery implements CustomQuery { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SQLCustomQuery.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, SQLCustomQuery.class.getName()); private final String sql; private final Set querySpaces = new HashSet(); diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java index 8511bf60c6..f4425e262d 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryParser.java @@ -23,18 +23,16 @@ * */ package org.hibernate.loader.custom.sql; - +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.hibernate.QueryException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.query.ParameterParser; import org.hibernate.persister.collection.SQLLoadableCollection; import org.hibernate.persister.entity.SQLLoadable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * @author Gavin King * @author Max Andersen diff --git a/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java b/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java index 6485b5206a..3c936eab79 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java @@ -22,15 +22,14 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.loader.custom.sql; - +package org.hibernate.loader.custom.sql; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import org.hibernate.HibernateException; -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.query.sql.NativeSQLQueryCollectionReturn; @@ -59,6 +58,7 @@ import org.hibernate.persister.entity.SQLLoadable; import org.hibernate.type.EntityType; import org.hibernate.type.Type; +import org.jboss.logging.Logger; /** * Responsible for processing the series of {@link org.hibernate.engine.query.sql.NativeSQLQueryReturn returns} @@ -72,8 +72,8 @@ */ public class SQLQueryReturnProcessor { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - SQLQueryReturnProcessor.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + SQLQueryReturnProcessor.class.getName()); private NativeSQLQueryReturn[] queryReturns; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java index 20294cb84c..1343b5b5e9 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/AbstractEntityLoader.java @@ -23,7 +23,6 @@ * */ package org.hibernate.loader.entity; - import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/BatchingEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/BatchingEntityLoader.java index e38d01394c..71ec3a085d 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/entity/BatchingEntityLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/BatchingEntityLoader.java @@ -23,18 +23,15 @@ * */ package org.hibernate.loader.entity; - import java.io.Serializable; import java.util.Iterator; import java.util.List; - -import org.hibernate.HibernateException; import org.hibernate.LockMode; -import org.hibernate.MappingException; import org.hibernate.LockOptions; +import org.hibernate.MappingException; +import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.loader.Loader; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.persister.entity.OuterJoinLoadable; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityJoinWalker.java index 607cd01834..c82a8739f7 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityJoinWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityJoinWalker.java @@ -23,15 +23,13 @@ * */ package org.hibernate.loader.entity; - import org.hibernate.FetchMode; -import org.hibernate.LockMode; -import org.hibernate.MappingException; import org.hibernate.LockOptions; +import org.hibernate.MappingException; import org.hibernate.engine.CascadeStyle; import org.hibernate.engine.CascadingAction; -import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.LoadQueryInfluencers; +import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.loader.AbstractEntityJoinWalker; import org.hibernate.persister.entity.OuterJoinLoadable; import org.hibernate.type.AssociationType; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityLoader.java index 7fe5a778ec..9c7427f145 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/CascadeEntityLoader.java @@ -23,7 +23,6 @@ * */ package org.hibernate.loader.entity; - import org.hibernate.MappingException; import org.hibernate.engine.CascadingAction; import org.hibernate.engine.LoadQueryInfluencers; @@ -53,7 +52,7 @@ public CascadeEntityLoader( postInstantiate(); - LOG.debug("Static select for action " + action + " on entity " + entityName + ": " + getSQLString()); + LOG.debugf("Static select for action %s on entity %s: %s", action, entityName, getSQLString()); } } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java index 513ab1f1b9..305118385d 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java @@ -23,13 +23,12 @@ * */ package org.hibernate.loader.entity; - import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; import org.hibernate.HibernateException; +import org.hibernate.HibernateLogger; import org.hibernate.LockMode; -import org.hibernate.Logger; import org.hibernate.MappingException; import org.hibernate.engine.LoadQueryInfluencers; import org.hibernate.engine.SessionFactoryImplementor; @@ -41,6 +40,7 @@ import org.hibernate.transform.ResultTransformer; import org.hibernate.type.Type; import org.hibernate.util.ArrayHelper; +import org.jboss.logging.Logger; /** * @@ -49,8 +49,8 @@ */ public class CollectionElementLoader extends OuterJoinLoader { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, - CollectionElementLoader.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, + CollectionElementLoader.class.getName()); private final OuterJoinLoadable persister; private final Type keyType; @@ -83,7 +83,7 @@ public CollectionElementLoader( postInstantiate(); - LOG.debug("Static select for entity " + entityName + ": " + getSQLString()); + LOG.debugf("Static select for entity %s: %s", entityName, getSQLString()); } diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityJoinWalker.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityJoinWalker.java index 86d859412c..b61cf46b4f 100755 --- a/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityJoinWalker.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityJoinWalker.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.loader.entity; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; - import org.hibernate.FetchMode; import org.hibernate.LockMode; import org.hibernate.LockOptions; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityLoader.java index 41cc752b36..e2296ddd07 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/EntityLoader.java @@ -23,7 +23,6 @@ * */ package org.hibernate.loader.entity; - import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.MappingException; @@ -120,7 +119,7 @@ public EntityLoader( batchLoader = batchSize > 1; - LOG.debug("Static select for entity " + entityName + " [" + lockMode + "]: " + getSQLString()); + LOG.debugf("Static select for entity %s [%s]: %s", entityName, lockMode, getSQLString()); } public EntityLoader( @@ -147,9 +146,11 @@ public EntityLoader( batchLoader = batchSize > 1; - LOG.debug("Static select for entity " + entityName + " [" + lockOptions.getLockMode() + ":" + lockOptions.getTimeOut() - + "]: " + getSQLString()); - + LOG.debugf("Static select for entity %s [%s:%s]: %s", + entityName, + lockOptions.getLockMode(), + lockOptions.getTimeOut(), + getSQLString()); } public Object loadByUniqueKey(SessionImplementor session,Object key) { diff --git a/hibernate-core/src/main/java/org/hibernate/loader/entity/UniqueEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/entity/UniqueEntityLoader.java index 78bdaf6c35..2933b6a7f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/entity/UniqueEntityLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/entity/UniqueEntityLoader.java @@ -23,9 +23,7 @@ * */ package org.hibernate.loader.entity; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.LockOptions; import org.hibernate.engine.SessionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java index b6e6c49a68..1ab65957cf 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/hql/QueryLoader.java @@ -23,7 +23,6 @@ * */ package org.hibernate.loader.hql; - import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -32,32 +31,30 @@ import java.util.Iterator; import java.util.List; import java.util.Map; - import org.hibernate.HibernateException; import org.hibernate.LockMode; +import org.hibernate.LockOptions; import org.hibernate.QueryException; import org.hibernate.ScrollableResults; -import org.hibernate.LockOptions; import org.hibernate.dialect.Dialect; import org.hibernate.engine.QueryParameters; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.engine.SessionImplementor; import org.hibernate.event.EventSource; -import org.hibernate.exception.JDBCExceptionHelper; import org.hibernate.hql.HolderInstantiator; import org.hibernate.hql.ast.QueryTranslatorImpl; -import org.hibernate.hql.ast.tree.FromElement; -import org.hibernate.hql.ast.tree.SelectClause; -import org.hibernate.hql.ast.tree.QueryNode; import org.hibernate.hql.ast.tree.AggregatedSelectExpression; +import org.hibernate.hql.ast.tree.FromElement; +import org.hibernate.hql.ast.tree.QueryNode; +import org.hibernate.hql.ast.tree.SelectClause; import org.hibernate.impl.IteratorImpl; import org.hibernate.loader.BasicLoader; import org.hibernate.param.ParameterSpecification; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.collection.QueryableCollection; import org.hibernate.persister.entity.Loadable; -import org.hibernate.persister.entity.Queryable; import org.hibernate.persister.entity.Lockable; +import org.hibernate.persister.entity.Queryable; import org.hibernate.transform.ResultTransformer; import org.hibernate.type.EntityType; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java b/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java index c3d9c73c8b..ba5d4cc43a 100644 --- a/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java +++ b/hibernate-core/src/main/java/org/hibernate/lob/ReaderInputStream.java @@ -23,7 +23,6 @@ * */ package org.hibernate.lob; - import java.io.IOException; import java.io.Reader; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/AbstractAuxiliaryDatabaseObject.java b/hibernate-core/src/main/java/org/hibernate/mapping/AbstractAuxiliaryDatabaseObject.java index fc936be5e4..61c79daaa8 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/AbstractAuxiliaryDatabaseObject.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/AbstractAuxiliaryDatabaseObject.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.HashSet; - import org.hibernate.dialect.Dialect; /** diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Any.java b/hibernate-core/src/main/java/org/hibernate/mapping/Any.java index 8b0c8ea106..8ced46de3b 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Any.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Any.java @@ -22,13 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.Map; - import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; import org.hibernate.type.MetaType; -import org.hibernate.type.AnyType; import org.hibernate.type.Type; /** 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 0cfc419119..3e39d2c497 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Array.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Array.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; import org.hibernate.type.CollectionType; import org.hibernate.type.PrimitiveType; -import org.hibernate.type.TypeFactory; import org.hibernate.util.ReflectHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/AuxiliaryDatabaseObject.java b/hibernate-core/src/main/java/org/hibernate/mapping/AuxiliaryDatabaseObject.java index 2f91afcf17..2bf0d94cde 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/AuxiliaryDatabaseObject.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/AuxiliaryDatabaseObject.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; - import org.hibernate.dialect.Dialect; /** diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java b/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java index 46936ea317..c3d8cedd2e 100755 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Backref.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.property.BackrefPropertyAccessor; import org.hibernate.property.PropertyAccessor; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Bag.java b/hibernate-core/src/main/java/org/hibernate/mapping/Bag.java index 51558e00dd..326cc22f6e 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Bag.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Bag.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.cfg.Mappings; import org.hibernate.type.CollectionType; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java index a72db0f032..a010734909 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java @@ -22,21 +22,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Properties; - import org.hibernate.FetchMode; import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; -import org.hibernate.engine.Mapping; import org.hibernate.engine.ExecuteUpdateResultCheckStyle; +import org.hibernate.engine.Mapping; import org.hibernate.type.CollectionType; import org.hibernate.type.Type; -import org.hibernate.type.TypeFactory; import org.hibernate.util.ArrayHelper; import org.hibernate.util.EmptyIterator; import org.hibernate.util.ReflectHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java index 66763af013..f3cc35ad1b 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Column.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Column.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; - import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java index 25ab57a6e0..dd35228677 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Component.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Component.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.Map; - import org.hibernate.EntityMode; import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; @@ -40,8 +38,6 @@ import org.hibernate.id.factory.IdentifierGeneratorFactory; import org.hibernate.property.Setter; import org.hibernate.tuple.component.ComponentMetamodel; -import org.hibernate.type.ComponentType; -import org.hibernate.type.EmbeddedComponentType; import org.hibernate.type.Type; import org.hibernate.util.JoinedIterator; import org.hibernate.util.ReflectHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Constraint.java b/hibernate-core/src/main/java/org/hibernate/mapping/Constraint.java index da484a9ac0..aef004ed82 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Constraint.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Constraint.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; - import org.hibernate.dialect.Dialect; import org.hibernate.engine.Mapping; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/DenormalizedTable.java b/hibernate-core/src/main/java/org/hibernate/mapping/DenormalizedTable.java index b2f1cd2aaa..e321bed8f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/DenormalizedTable.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/DenormalizedTable.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; - import org.hibernate.util.JoinedIterator; /** diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/DependantValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/DependantValue.java index c8acaf0e57..a7375bb913 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/DependantValue.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/DependantValue.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/FetchProfile.java b/hibernate-core/src/main/java/org/hibernate/mapping/FetchProfile.java index 196f273172..028a17f56f 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/FetchProfile.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/FetchProfile.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.LinkedHashSet; /** diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Fetchable.java b/hibernate-core/src/main/java/org/hibernate/mapping/Fetchable.java index 2a1bb03915..43596b62ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Fetchable.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Fetchable.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.FetchMode; /** diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Filterable.java b/hibernate-core/src/main/java/org/hibernate/mapping/Filterable.java index 39585bc96b..71d43b3fb2 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Filterable.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Filterable.java @@ -23,6 +23,7 @@ */ package org.hibernate.mapping; + /** * Defines mapping elements to which filters may be applied. * diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java b/hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java index 9993b9dd5f..6732f100c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/ForeignKey.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; - import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java b/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java index 808eaad224..5a432a93d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Formula.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; - import org.hibernate.dialect.Dialect; import org.hibernate.dialect.function.SQLFunctionRegistry; import org.hibernate.sql.Template; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdGenerator.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdGenerator.java index 2f3737edcc..7be317de5c 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/IdGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/IdGenerator.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; import java.util.Properties; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java index 07324c3507..ed8f1ed0ea 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierBag.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.cfg.Mappings; import org.hibernate.type.CollectionType; -import org.hibernate.type.TypeFactory; /** * An IdentifierBag has a primary key consisting of diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java index 54249723ae..9d68df6226 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/IdentifierCollection.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; import org.hibernate.engine.Mapping; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Index.java b/hibernate-core/src/main/java/org/hibernate/mapping/Index.java index d3037df798..7374bdd5ac 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Index.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Index.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; - import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.Mapping; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java b/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java index b8d0c3d8ac..8a15df8f92 100755 --- a/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/IndexBackref.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.property.IndexPropertyAccessor; import org.hibernate.property.PropertyAccessor; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java b/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java index 2ebd79f31f..cd2033d36c 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/IndexedCollection.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.Iterator; - import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; import org.hibernate.engine.Mapping; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Join.java b/hibernate-core/src/main/java/org/hibernate/mapping/Join.java index ee7b607797..2b734ad211 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Join.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Join.java @@ -22,13 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; - -import org.hibernate.sql.Alias; import org.hibernate.engine.ExecuteUpdateResultCheckStyle; +import org.hibernate.sql.Alias; /** * @author Gavin King diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java index e16be6b51f..318e0a4133 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/JoinedSubclass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.Iterator; - import org.hibernate.MappingException; import org.hibernate.engine.Mapping; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java index d6fb83da35..db4a7c325a 100755 --- a/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/KeyValue.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; import org.hibernate.id.IdentifierGenerator; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/List.java b/hibernate-core/src/main/java/org/hibernate/mapping/List.java index 5e31e3c25c..132d708204 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/List.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/List.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; import org.hibernate.type.CollectionType; -import org.hibernate.type.TypeFactory; /** * A list mapping has a primary key consisting of the key columns + index column. diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java index f2597f6931..a0ac7ad54d 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/ManyToOne.java @@ -22,16 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.ArrayList; import java.util.Iterator; import java.util.Map; - import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; import org.hibernate.type.EntityType; import org.hibernate.type.Type; -import org.hibernate.type.TypeFactory; /** * A many-to-one association mapping 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 50fc8f420e..3751eae2ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Map.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Map.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; import org.hibernate.type.CollectionType; -import org.hibernate.type.TypeFactory; /** * A map has a primary key consisting of diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java index 426ca29e8f..2d9dcfae0b 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/MappedSuperclass.java @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; import java.util.List; /** diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttributable.java b/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttributable.java index 70234f864c..80b6806167 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttributable.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttributable.java @@ -23,6 +23,7 @@ */ package org.hibernate.mapping; + /** * Common interface for things that can handle meta attributes. * diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttribute.java b/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttribute.java index 00a602d1ae..5378b45800 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/MetaAttribute.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MetadataSource.java b/hibernate-core/src/main/java/org/hibernate/mapping/MetadataSource.java index 609e5868ff..8804119a84 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/MetadataSource.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/MetadataSource.java @@ -23,6 +23,7 @@ */ package org.hibernate.mapping; + /** * Enumeration of the known places from which a piece of metadata may come. * diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java b/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java index 074bf2ba7d..fe40f741ae 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/OneToMany.java @@ -22,16 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.Iterator; - import org.hibernate.FetchMode; import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; import org.hibernate.engine.Mapping; import org.hibernate.type.EntityType; import org.hibernate.type.Type; -import org.hibernate.type.TypeFactory; /** * A mapping for a one-to-many association diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java index 8567a3c057..218e91d480 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/OneToOne.java @@ -22,17 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.ArrayList; import java.util.Iterator; - import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; import org.hibernate.type.EntityType; import org.hibernate.type.ForeignKeyDirection; -import org.hibernate.type.SpecialOneToOneType; import org.hibernate.type.Type; -import org.hibernate.type.TypeFactory; /** * A one-to-one association mapping diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java index f2c941a081..a229ef42d5 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java @@ -22,16 +22,18 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; import java.util.Set; - -import org.hibernate.MappingException; +import java.util.StringTokenizer; import org.hibernate.EntityMode; +import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.Mapping; import org.hibernate.engine.ExecuteUpdateResultCheckStyle; +import org.hibernate.engine.Mapping; import org.hibernate.sql.Alias; import org.hibernate.util.EmptyIterator; import org.hibernate.util.JoinedIterator; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClassVisitor.java b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClassVisitor.java index 22e67beb74..c92cdf58db 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClassVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/PersistentClassVisitor.java @@ -23,6 +23,7 @@ */ package org.hibernate.mapping; + /** * @author max * diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java b/hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java index b8ff4d1e71..0befa41b33 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/PrimaryKey.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.Iterator; - import org.hibernate.dialect.Dialect; /** diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PrimitiveArray.java b/hibernate-core/src/main/java/org/hibernate/mapping/PrimitiveArray.java index 7b824d7395..aecf5537b7 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/PrimitiveArray.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/PrimitiveArray.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.cfg.Mappings; /** 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 9a1afd5ecd..e6d2df4ed8 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java @@ -22,11 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; import java.util.Iterator; import java.util.StringTokenizer; - import org.hibernate.EntityMode; import org.hibernate.MappingException; import org.hibernate.PropertyNotFoundException; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/PropertyGeneration.java b/hibernate-core/src/main/java/org/hibernate/mapping/PropertyGeneration.java index 2fc3e65c61..1d83752ae5 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/PropertyGeneration.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/PropertyGeneration.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; /** diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/RelationalModel.java b/hibernate-core/src/main/java/org/hibernate/mapping/RelationalModel.java index 58f9c77733..e3a20a3f3b 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/RelationalModel.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/RelationalModel.java @@ -22,10 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - -import org.hibernate.engine.Mapping; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; +import org.hibernate.engine.Mapping; /** * A relational object which may be created using DDL diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java index 70ab74165a..97db450930 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java @@ -22,17 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; import java.util.HashSet; import java.util.Iterator; import java.util.Set; - -import org.slf4j.LoggerFactory; +import org.hibernate.HibernateLogger; import org.hibernate.MappingException; import org.hibernate.engine.Mapping; import org.hibernate.util.ReflectHelper; import org.hibernate.util.SingletonIterator; +import org.jboss.logging.Logger; /** * The root class of an inheritance hierarchy @@ -40,6 +39,8 @@ */ public class RootClass extends PersistentClass implements TableOwner { + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, RootClass.class.getName()); + public static final String DEFAULT_IDENTIFIER_COLUMN_NAME = "id"; public static final String DEFAULT_DISCRIMINATOR_COLUMN_NAME = "class"; @@ -63,26 +64,31 @@ public class RootClass extends PersistentClass implements TableOwner { private Property declaredIdentifierProperty; private Property declaredVersion; - int nextSubclassId() { + @Override + int nextSubclassId() { return ++nextSubclassId; } - public int getSubclassId() { + @Override + public int getSubclassId() { return 0; } - + public void setTable(Table table) { this.table=table; } - public Table getTable() { + @Override + public Table getTable() { return table; } - public Property getIdentifierProperty() { + @Override + public Property getIdentifierProperty() { return identifierProperty; } - public Property getDeclaredIdentifierProperty() { + @Override + public Property getDeclaredIdentifierProperty() { return declaredIdentifierProperty; } @@ -90,21 +96,26 @@ public void setDeclaredIdentifierProperty(Property declaredIdentifierProperty) { this.declaredIdentifierProperty = declaredIdentifierProperty; } - public KeyValue getIdentifier() { + @Override + public KeyValue getIdentifier() { return identifier; } - public boolean hasIdentifierProperty() { + @Override + public boolean hasIdentifierProperty() { return identifierProperty!=null; } - public Value getDiscriminator() { + @Override + public Value getDiscriminator() { return discriminator; } - public boolean isInherited() { + @Override + public boolean isInherited() { return false; } - public boolean isPolymorphic() { + @Override + public boolean isPolymorphic() { return polymorphic; } @@ -112,34 +123,42 @@ public void setPolymorphic(boolean polymorphic) { this.polymorphic = polymorphic; } - public RootClass getRootClass() { + @Override + public RootClass getRootClass() { return this; } - public Iterator getPropertyClosureIterator() { + @Override + public Iterator getPropertyClosureIterator() { return getPropertyIterator(); } - public Iterator getTableClosureIterator() { + @Override + public Iterator getTableClosureIterator() { return new SingletonIterator( getTable() ); } - public Iterator getKeyClosureIterator() { + @Override + public Iterator getKeyClosureIterator() { return new SingletonIterator( getKey() ); } - public void addSubclass(Subclass subclass) throws MappingException { + @Override + public void addSubclass(Subclass subclass) throws MappingException { super.addSubclass(subclass); setPolymorphic(true); } - public boolean isExplicitPolymorphism() { + @Override + public boolean isExplicitPolymorphism() { return explicitPolymorphism; } - public Property getVersion() { + @Override + public Property getVersion() { return version; } - public Property getDeclaredVersion() { + @Override + public Property getDeclaredVersion() { return declaredVersion; } @@ -150,34 +169,42 @@ public void setDeclaredVersion(Property declaredVersion) { public void setVersion(Property version) { this.version = version; } - public boolean isVersioned() { + @Override + public boolean isVersioned() { return version!=null; } - public boolean isMutable() { + @Override + public boolean isMutable() { return mutable; } - public boolean hasEmbeddedIdentifier() { + @Override + public boolean hasEmbeddedIdentifier() { return embeddedIdentifier; } - public Class getEntityPersisterClass() { + @Override + public Class getEntityPersisterClass() { return entityPersisterClass; } - public Table getRootTable() { + @Override + public Table getRootTable() { return getTable(); } - public void setEntityPersisterClass(Class persister) { + @Override + public void setEntityPersisterClass(Class persister) { this.entityPersisterClass = persister; } - public PersistentClass getSuperclass() { + @Override + public PersistentClass getSuperclass() { return null; } - public KeyValue getKey() { + @Override + public KeyValue getKey() { return getIdentifier(); } @@ -207,15 +234,17 @@ public void setMutable(boolean mutable) { this.mutable = mutable; } - public boolean isDiscriminatorInsertable() { + @Override + public boolean isDiscriminatorInsertable() { return discriminatorInsertable; } - + public void setDiscriminatorInsertable(boolean insertable) { this.discriminatorInsertable = insertable; } - public boolean isForceDiscriminator() { + @Override + public boolean isForceDiscriminator() { return forceDiscriminator; } @@ -223,7 +252,8 @@ public void setForceDiscriminator(boolean forceDiscriminator) { this.forceDiscriminator = forceDiscriminator; } - public String getWhere() { + @Override + public String getWhere() { return where; } @@ -231,7 +261,8 @@ public void setWhere(String string) { where = string; } - public void validate(Mapping mapping) throws MappingException { + @Override + public void validate(Mapping mapping) throws MappingException { super.validate(mapping); if ( !getIdentifier().isValid(mapping) ) { throw new MappingException( @@ -249,25 +280,17 @@ private void checkCompositeIdentifier() { Component id = (Component) getIdentifier(); if ( !id.isDynamic() ) { Class idClass = id.getComponentClass(); - if ( idClass != null && !ReflectHelper.overridesEquals( idClass ) ) { - LoggerFactory.getLogger( RootClass.class ) - .warn( "composite-id class does not override equals(): " - + id.getComponentClass().getName() ); - } - if ( !ReflectHelper.overridesHashCode( idClass ) ) { - LoggerFactory.getLogger( RootClass.class ) - .warn( "composite-id class does not override hashCode(): " - + id.getComponentClass().getName() ); - } - if ( !Serializable.class.isAssignableFrom( idClass ) ) { - throw new MappingException( "composite-id class must implement Serializable: " - + id.getComponentClass().getName() ); - } + if (idClass != null && !ReflectHelper.overridesEquals(idClass)) LOG.compositeIdClassDoesNotOverrideEquals(id.getComponentClass().getName()); + if (!ReflectHelper.overridesHashCode(idClass)) LOG.compositeIdClassDoesNotOverrideHashCode(id.getComponentClass().getName()); + if (!Serializable.class.isAssignableFrom(idClass)) throw new MappingException( + "Composite-id class must implement Serializable: " + + id.getComponentClass().getName()); } } } - - public String getCacheConcurrencyStrategy() { + + @Override + public String getCacheConcurrencyStrategy() { return cacheConcurrencyStrategy; } @@ -282,22 +305,25 @@ public void setCacheRegionName(String cacheRegionName) { this.cacheRegionName = cacheRegionName; } - public boolean isLazyPropertiesCacheable() { + @Override + public boolean isLazyPropertiesCacheable() { return lazyPropertiesCacheable; } public void setLazyPropertiesCacheable(boolean lazyPropertiesCacheable) { this.lazyPropertiesCacheable = lazyPropertiesCacheable; } - - public boolean isJoinedSubclass() { + + @Override + public boolean isJoinedSubclass() { return false; } - public java.util.Set getSynchronizedTables() { + @Override + public java.util.Set getSynchronizedTables() { return synchronizedTables; } - + public Set getIdentityTables() { Set tables = new HashSet(); Iterator iter = getSubclassClosureIterator(); @@ -307,12 +333,14 @@ public Set getIdentityTables() { } return tables; } - - public Object accept(PersistentClassVisitor mv) { + + @Override + public Object accept(PersistentClassVisitor mv) { return mv.accept(this); } - - public int getOptimisticLockMode() { + + @Override + public int getOptimisticLockMode() { return optimisticLockMode; } diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java b/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java index f62ddcd866..92a370e8f3 100755 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Selectable.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.dialect.Dialect; import org.hibernate.dialect.function.SQLFunctionRegistry; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Set.java b/hibernate-core/src/main/java/org/hibernate/mapping/Set.java index e1d1afc999..52856a13e6 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Set.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Set.java @@ -22,14 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.Iterator; - import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; import org.hibernate.engine.Mapping; import org.hibernate.type.CollectionType; -import org.hibernate.type.TypeFactory; /** * A set with no nullable element columns. It will have a primary key diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleAuxiliaryDatabaseObject.java b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleAuxiliaryDatabaseObject.java index 3f61bb40d7..60d8ba19b6 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleAuxiliaryDatabaseObject.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleAuxiliaryDatabaseObject.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.HashSet; - +import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.engine.Mapping; -import org.hibernate.HibernateException; import org.hibernate.util.StringHelper; /** 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 da302ecdc0..b227ce4cca 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java @@ -22,12 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Properties; - import org.hibernate.FetchMode; import org.hibernate.MappingException; import org.hibernate.cfg.Environment; @@ -39,7 +37,6 @@ import org.hibernate.id.PersistentIdentifierGenerator; import org.hibernate.id.factory.IdentifierGeneratorFactory; import org.hibernate.type.Type; -import org.hibernate.type.TypeFactory; import org.hibernate.util.ReflectHelper; /** diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java index cb83388b7c..3f12967297 100755 --- a/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/SingleTableSubclass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.Iterator; - import org.hibernate.MappingException; import org.hibernate.engine.Mapping; import org.hibernate.util.JoinedIterator; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java index 40f7b42658..80bff94816 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Subclass.java @@ -22,10 +22,10 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; import java.util.Map; - import org.hibernate.AssertionFailure; import org.hibernate.EntityMode; import org.hibernate.util.JoinedIterator; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SyntheticProperty.java b/hibernate-core/src/main/java/org/hibernate/mapping/SyntheticProperty.java index 52baf62ac2..36cfb8c832 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/SyntheticProperty.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/SyntheticProperty.java @@ -23,6 +23,7 @@ */ package org.hibernate.mapping; + /** * Models a property which does not actually exist in the model. It is created by Hibernate during * the metamodel binding process. diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java index 9ca5df65cb..1345efabb9 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Table.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Table.java @@ -22,15 +22,13 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.LinkedHashMap; - import org.hibernate.HibernateException; import org.hibernate.MappingException; import org.hibernate.dialect.Dialect; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java b/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java index 53d952fe5f..6be738cd32 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/TableOwner.java @@ -23,6 +23,7 @@ */ package org.hibernate.mapping; + /** * Interface allowing to differenciate SubClasses * from Classes, JoinedSubClasses and UnionSubClasses diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java b/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java index bd3cfb34fe..1bf935ff23 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/ToOne.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import org.hibernate.FetchMode; import org.hibernate.MappingException; import org.hibernate.cfg.Mappings; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/TypeDef.java b/hibernate-core/src/main/java/org/hibernate/mapping/TypeDef.java index eb8ff7083a..36bb7efb1d 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/TypeDef.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/TypeDef.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; import java.util.Properties; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/UnionSubclass.java b/hibernate-core/src/main/java/org/hibernate/mapping/UnionSubclass.java index c927d1136f..255abee918 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/UnionSubclass.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/UnionSubclass.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.Iterator; - import org.hibernate.MappingException; import org.hibernate.engine.Mapping; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java b/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java index f42a0b1531..f123b1778b 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/UniqueKey.java @@ -22,9 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.util.Iterator; - import org.hibernate.dialect.Dialect; import org.hibernate.engine.Mapping; import org.hibernate.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Value.java b/hibernate-core/src/main/java/org/hibernate/mapping/Value.java index 41884f5324..53af114e0b 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/Value.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/Value.java @@ -22,10 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.mapping; - import java.io.Serializable; import java.util.Iterator; - import org.hibernate.FetchMode; import org.hibernate.MappingException; import org.hibernate.engine.Mapping; diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/ValueVisitor.java b/hibernate-core/src/main/java/org/hibernate/mapping/ValueVisitor.java index 0457ee4728..0807d414df 100644 --- a/hibernate-core/src/main/java/org/hibernate/mapping/ValueVisitor.java +++ b/hibernate-core/src/main/java/org/hibernate/mapping/ValueVisitor.java @@ -23,6 +23,7 @@ */ package org.hibernate.mapping; + /** * @author max * diff --git a/hibernate-core/src/main/java/org/hibernate/metadata/ClassMetadata.java b/hibernate-core/src/main/java/org/hibernate/metadata/ClassMetadata.java index 17403b9f33..1c91eaa027 100644 --- a/hibernate-core/src/main/java/org/hibernate/metadata/ClassMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/metadata/ClassMetadata.java @@ -23,12 +23,10 @@ * */ package org.hibernate.metadata; - import java.io.Serializable; import java.util.Map; - -import org.hibernate.HibernateException; import org.hibernate.EntityMode; +import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.type.Type; diff --git a/hibernate-core/src/main/java/org/hibernate/metadata/CollectionMetadata.java b/hibernate-core/src/main/java/org/hibernate/metadata/CollectionMetadata.java index ddb1d58b31..8dd4cfbc8a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metadata/CollectionMetadata.java +++ b/hibernate-core/src/main/java/org/hibernate/metadata/CollectionMetadata.java @@ -23,7 +23,6 @@ * */ package org.hibernate.metadata; - import org.hibernate.type.Type; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/AbstractAttributeContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/AbstractAttributeContainer.java index d885c5b6af..686449c7bd 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/AbstractAttributeContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/AbstractAttributeContainer.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.metamodel.logical; - import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashSet; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Attribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Attribute.java index 4b373fa136..0f9229e258 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Attribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Attribute.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.metamodel.logical; +import javax.persistence.metamodel.PluralAttribute; /** * Desribes an attribute. diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/AttributeContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/AttributeContainer.java index f97257a3c5..9898c3eb6b 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/AttributeContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/AttributeContainer.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.metamodel.logical; - import java.util.Set; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/BasicType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/BasicType.java index 350fbcff22..c9b935f68f 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/BasicType.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/BasicType.java @@ -23,6 +23,7 @@ */ package org.hibernate.metamodel.logical; + /** * Models a basic type, a simple value. * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Component.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Component.java index 1743f56fb6..7371d30f06 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Component.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Component.java @@ -23,6 +23,7 @@ */ package org.hibernate.metamodel.logical; + /** * Models the notion of a component (what JPA calls an Embeddable). *

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Entity.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Entity.java index 4139fa2081..3f577e6b20 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Entity.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Entity.java @@ -23,6 +23,7 @@ */ package org.hibernate.metamodel.logical; + /** * Models the notion of an entity * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Hierarchical.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Hierarchical.java index 0e1f7d8d93..0ebeb7b7f7 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Hierarchical.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Hierarchical.java @@ -23,6 +23,7 @@ */ package org.hibernate.metamodel.logical; + /** * Additional contract for things that can occur in an inheritance hierarchy (specifically ones we would * need to traverse). diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/PluralAttributeNature.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/PluralAttributeNature.java index c85e295f25..7348aeed37 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/PluralAttributeNature.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/PluralAttributeNature.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.metamodel.logical; - import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/SingularAttribute.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/SingularAttribute.java index 929667e73a..ca3d8ba9d9 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/SingularAttribute.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/SingularAttribute.java @@ -23,6 +23,7 @@ */ package org.hibernate.metamodel.logical; + /** * A single valued (non-collection) attribute * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Superclass.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Superclass.java index 5bd1a1d8ca..85dada11c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Superclass.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Superclass.java @@ -23,6 +23,7 @@ */ package org.hibernate.metamodel.logical; + /** * Models the concept of a (intermediate) superclass * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Type.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Type.java index 6e359539a6..3bca324042 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Type.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/Type.java @@ -23,6 +23,7 @@ */ package org.hibernate.metamodel.logical; + /** * Basic information about a Java type, in regards to its role in particular set of mappings. * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/TypeNature.java b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/TypeNature.java index 872433f649..5834cd40ce 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/logical/TypeNature.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/logical/TypeNature.java @@ -23,6 +23,7 @@ */ package org.hibernate.metamodel.logical; + /** * Describes the type of a type :/ * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractConstraint.java b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractConstraint.java index 2075a44eea..73f7b854c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractConstraint.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractConstraint.java @@ -22,9 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.metamodel.relational; - -import java.util.List; import java.util.ArrayList; +import java.util.List; /** * Support for writing {@link Constraint} implementations diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractSimpleValue.java b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractSimpleValue.java index 77ef5d1cac..4a63cfcdc8 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractSimpleValue.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractSimpleValue.java @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.metamodel.relational; - -import org.hibernate.Logger; +import org.hibernate.HibernateLogger; +import org.jboss.logging.Logger; /** * Basic support for {@link SimpleValue} implementations. @@ -32,7 +32,7 @@ */ public abstract class AbstractSimpleValue implements SimpleValue { - private static final Logger LOG = org.jboss.logging.Logger.getMessageLogger(Logger.class, Logger.class.getPackage().getName()); + private static final HibernateLogger LOG = Logger.getMessageLogger(HibernateLogger.class, AbstractSimpleValue.class.getName()); private final ValueContainer container; private Datatype datatype; @@ -59,8 +59,8 @@ public Datatype getDatatype() { * {@inheritDoc} */ public void setDatatype(Datatype datatype) { - LOG.debug("Setting datatype for column " + toLoggableString() + " : " + datatype); - if (this.datatype != null && !this.datatype.equals(datatype)) LOG.debug("Overriding previous datatype : " + this.datatype); + LOG.debugf("Setting datatype for column %s : %s", toLoggableString(), datatype); + if (this.datatype != null && !this.datatype.equals(datatype)) LOG.debugf("Overriding previous datatype : %s", this.datatype); this.datatype = datatype; } } diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractTableSpecification.java b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractTableSpecification.java index 8f80eee3dc..9288ad974e 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractTableSpecification.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractTableSpecification.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.metamodel.relational; - import java.util.ArrayList; import java.util.List; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractValueContainer.java b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractValueContainer.java index c183b64fdf..116745cfd3 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractValueContainer.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractValueContainer.java @@ -22,7 +22,6 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.metamodel.relational; - import java.util.LinkedHashSet; /** diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/Column.java b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/Column.java index 13218533bf..ff8ca7703c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/Column.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/Column.java @@ -23,6 +23,7 @@ */ package org.hibernate.metamodel.relational; + /** * Models a physical column * diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/Constraint.java b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/Constraint.java index c1348eeed1..32870f9097 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/relational/Constraint.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/relational/Constraint.java @@ -23,7 +23,7 @@ */ package org.hibernate.metamodel.relational; -import java.util.List; + /** * Basic contract for the types of constraints we fully support as metadata constructs: