From 5cc051e1dfeb5664d8d1eb9a289097d7f9bfb0e2 Mon Sep 17 00:00:00 2001 From: Lukasz Antoniak Date: Mon, 8 Apr 2013 14:43:29 +0200 Subject: [PATCH] HHH-7944 - Separation of Envers API, SPI and internal packages --- .../main/docbook/devguide/en-US/Envers.xml | 57 ++-- .../hibernate/envers/AuditReaderFactory.java | 4 +- ...AnnotationConfigurationTaskWithEnvers.java | 38 --- .../ant/ConfigurationTaskWithEnvers.java | 38 --- .../ant/JPAConfigurationTaskWithEnvers.java | 38 --- .../AuditEntitiesConfiguration.java | 185 ------------- .../envers/configuration/EnversSettings.java | 102 +++++++ .../configuration/GlobalConfiguration.java | 198 -------------- .../internal/AuditEntitiesConfiguration.java | 170 ++++++++++++ .../{ => internal}/ClassesAuditingData.java | 8 +- .../{ => internal}/EntitiesConfigurator.java | 24 +- .../internal/GlobalConfiguration.java | 184 +++++++++++++ .../PersistentClassGraphDefiner.java | 6 +- .../RevisionInfoConfiguration.java | 98 ++----- .../RevisionInfoConfigurationResult.java | 77 ++++++ .../metadata/AuditEntityNameRegister.java | 2 +- .../metadata/AuditMetadataGenerator.java | 38 +-- .../metadata/AuditTableData.java | 2 +- .../metadata/BasicMetadataGenerator.java | 6 +- .../metadata/CollectionMetadataGenerator.java | 85 +++--- .../metadata/ComponentMetadataGenerator.java | 14 +- .../metadata/EntityXmlMappingData.java | 2 +- .../metadata/IdMetadataGenerator.java | 30 ++- .../metadata/InheritanceType.java | 2 +- .../metadata/MetadataTools.java | 4 +- .../metadata/QueryGeneratorBuilder.java | 20 +- .../ToOneRelationMetadataGenerator.java | 22 +- .../reader/AnnotationsMetadataReader.java | 4 +- .../reader/AuditedPropertiesHolder.java | 2 +- .../reader/AuditedPropertiesReader.java | 33 ++- .../metadata/reader/ClassAuditingData.java | 4 +- .../ComponentAuditedPropertiesReader.java | 4 +- .../reader/ComponentAuditingData.java | 4 +- .../reader/PersistentPropertiesSource.java | 2 +- .../metadata/reader/PropertyAuditingData.java | 4 +- .../{ => spi}/AuditConfiguration.java | 44 +-- .../enhanced/SequenceIdRevisionEntity.java | 16 +- ...rackingModifiedEntitiesRevisionEntity.java | 13 +- .../BaseEnversCollectionEventListener.java | 22 +- .../{ => spi}/BaseEnversEventListener.java | 20 +- .../event/{ => spi}/EnversIntegrator.java | 6 +- .../event/{ => spi}/EnversListener.java | 4 +- .../EnversListenerDuplicationStrategy.java | 2 +- ...stCollectionRecreateEventListenerImpl.java | 4 +- .../EnversPostDeleteEventListenerImpl.java | 10 +- .../EnversPostInsertEventListenerImpl.java | 10 +- .../EnversPostUpdateEventListenerImpl.java | 10 +- ...sPreCollectionRemoveEventListenerImpl.java | 4 +- ...sPreCollectionUpdateEventListenerImpl.java | 4 +- .../entities/EntitiesConfigurations.java | 2 +- .../entities/EntityConfiguration.java | 8 +- .../entities/EntityInstantiator.java | 33 +-- .../entities/IdMappingData.java | 4 +- .../{ => internal}/entities/PropertyData.java | 2 +- .../entities/RelationDescription.java | 6 +- .../{ => internal}/entities/RelationType.java | 2 +- .../entities/RevisionTypeType.java | 2 +- .../mapper/ComponentPropertyMapper.java | 23 +- .../mapper/CompositeMapperBuilder.java | 6 +- .../mapper/ExtendedPropertyMapper.java | 2 +- .../entities/mapper/MultiPropertyMapper.java | 19 +- .../PersistentCollectionChangeData.java | 2 +- .../entities/mapper/PropertyMapper.java | 6 +- .../entities/mapper/SimpleMapperBuilder.java | 4 +- .../entities/mapper/SinglePropertyMapper.java | 15 +- .../mapper/SubclassPropertyMapper.java | 12 +- .../mapper/id/AbstractCompositeIdMapper.java | 15 +- .../entities/mapper/id/AbstractIdMapper.java | 4 +- .../entities/mapper/id/EmbeddedIdMapper.java | 8 +- .../entities/mapper/id/IdMapper.java | 4 +- .../entities/mapper/id/MultipleIdMapper.java | 10 +- .../mapper/id/QueryParameterData.java | 2 +- .../mapper/id/SimpleIdMapperBuilder.java | 4 +- .../entities/mapper/id/SingleIdMapper.java | 7 +- .../relation/AbstractCollectionMapper.java | 18 +- .../relation/AbstractOneToOneMapper.java | 8 +- .../mapper/relation/AbstractToOneMapper.java | 26 +- .../relation/BasicCollectionMapper.java | 12 +- .../relation/CommonCollectionMapperData.java | 8 +- .../mapper/relation/ListCollectionMapper.java | 17 +- .../mapper/relation/MapCollectionMapper.java | 12 +- .../mapper/relation/MiddleComponentData.java | 4 +- .../mapper/relation/MiddleIdData.java | 8 +- .../relation/OneToOneNotOwningMapper.java | 6 +- .../OneToOnePrimaryKeyJoinColumnMapper.java | 6 +- .../relation/SortedMapCollectionMapper.java | 10 +- .../relation/SortedSetCollectionMapper.java | 10 +- .../mapper/relation/ToOneEntityLoader.java | 8 +- .../mapper/relation/ToOneIdMapper.java | 19 +- .../component/MiddleComponentMapper.java | 8 +- .../component/MiddleDummyComponentMapper.java | 6 +- .../MiddleEmbeddableComponentMapper.java | 29 +- .../MiddleMapKeyIdComponentMapper.java | 10 +- .../MiddleMapKeyPropertyComponentMapper.java | 9 +- .../MiddleRelatedComponentMapper.java | 8 +- .../MiddleSimpleComponentMapper.java | 8 +- .../MiddleStraightComponentMapper.java | 6 +- .../AbstractDelegateSessionImplementor.java | 2 +- .../lazy/ToOneDelegateSessionImplementor.java | 10 +- .../AbstractCollectionInitializor.java | 10 +- .../ArrayCollectionInitializor.java | 10 +- .../BasicCollectionInitializor.java | 10 +- .../lazy/initializor/Initializor.java | 2 +- .../ListCollectionInitializor.java | 10 +- .../initializor/MapCollectionInitializor.java | 10 +- .../SortedMapCollectionInitializor.java | 10 +- .../SortedSetCollectionInitializor.java | 10 +- .../relation/lazy/proxy/CollectionProxy.java | 6 +- .../mapper/relation/lazy/proxy/ListProxy.java | 4 +- .../mapper/relation/lazy/proxy/MapProxy.java | 6 +- .../mapper/relation/lazy/proxy/SetProxy.java | 4 +- .../relation/lazy/proxy/SortedMapProxy.java | 6 +- .../relation/lazy/proxy/SortedSetProxy.java | 4 +- .../query/AbstractRelationQueryGenerator.java | 14 +- .../query/OneAuditEntityQueryGenerator.java | 23 +- .../query/OneEntityQueryGenerator.java | 21 +- .../mapper/relation/query/QueryConstants.java | 2 +- .../query/RelationQueryGenerator.java | 4 +- .../query/ThreeEntityQueryGenerator.java | 31 +-- .../TwoEntityOneAuditedQueryGenerator.java | 23 +- .../query/TwoEntityQueryGenerator.java | 27 +- .../reader/AuditReaderImpl.java | 15 +- .../reader/AuditReaderImplementor.java | 2 +- .../CrossTypeRevisionChangesReaderImpl.java | 14 +- .../reader/FirstLevelCache.java | 8 +- .../DefaultRevisionInfoGenerator.java | 8 +- ...ModifiedEntitiesRevisionInfoGenerator.java | 6 +- .../ModifiedEntityNamesReader.java | 6 +- .../revisioninfo/RevisionInfoGenerator.java | 2 +- .../RevisionInfoNumberReader.java | 6 +- .../RevisionInfoQueryCreator.java | 2 +- .../synchronization/AuditProcess.java | 6 +- .../synchronization/AuditProcessManager.java | 4 +- .../synchronization/EntityChangeNotifier.java | 12 +- .../synchronization/SessionCacheCleaner.java | 2 +- .../work/AbstractAuditWorkUnit.java | 6 +- .../synchronization/work/AddWorkUnit.java | 9 +- .../synchronization/work/AuditWorkUnit.java | 2 +- .../work/CollectionChangeWorkUnit.java | 4 +- .../synchronization/work/DelWorkUnit.java | 9 +- .../FakeBidirectionalRelationWorkUnit.java | 6 +- .../synchronization/work/ModWorkUnit.java | 4 +- .../PersistentCollectionChangeWorkUnit.java | 9 +- .../work/WorkUnitMergeDispatcher.java | 2 +- .../work/WorkUnitMergeVisitor.java | 2 +- .../tools/ArgumentsTools.java} | 23 +- .../envers/internal/tools/ArraysTools.java | 71 +++++ .../envers/internal/tools/EntityTools.java | 86 ++++++ .../envers/internal/tools/MappingTools.java | 43 +++ .../{ => internal}/tools/MutableBoolean.java | 2 +- .../{ => internal}/tools/MutableInteger.java | 2 +- .../internal/tools/ReflectionTools.java | 142 ++++++++++ .../envers/internal/tools/StringTools.java | 77 ++++++ .../envers/internal/tools/Tools.java | 103 +++++++ .../envers/{ => internal}/tools/Triple.java | 3 +- .../tools/graph/GraphDefiner.java | 2 +- .../tools/graph/GraphTopologicalSort.java | 2 +- .../tools/graph/TopologicalSort.java | 2 +- .../{ => internal}/tools/graph/Vertex.java | 2 +- .../tools/query/Parameters.java | 6 +- .../tools/query/QueryBuilder.java | 7 +- .../tools/query/UpdateBuilder.java | 14 +- .../hibernate/envers/query/AuditEntity.java | 12 +- .../envers/query/AuditQueryCreator.java | 16 +- .../criteria/AggregatedAuditExpression.java | 12 +- .../query/criteria/AuditConjunction.java | 9 +- .../envers/query/criteria/AuditCriterion.java | 8 +- .../query/criteria/AuditDisjunction.java | 9 +- .../envers/query/criteria/AuditId.java | 9 +- .../envers/query/criteria/AuditProperty.java | 26 +- .../envers/query/criteria/AuditRelatedId.java | 5 +- .../BetweenAuditExpression.java | 14 +- .../{ => internal}/CriteriaTools.java | 19 +- .../IdentifierEqAuditExpression.java | 12 +- .../{ => internal}/InAuditExpression.java | 14 +- .../LogicalAuditExpression.java | 12 +- .../{ => internal}/NotAuditExpression.java | 11 +- .../NotNullAuditExpression.java | 15 +- .../{ => internal}/NullAuditExpression.java | 15 +- .../PropertyAuditExpression.java | 13 +- .../RelatedAuditExpression.java | 15 +- .../RevisionTypeAuditExpression.java | 11 +- .../{ => internal}/SimpleAuditExpression.java | 15 +- .../impl/AbstractAuditQuery.java | 16 +- .../impl/EntitiesAtRevisionQuery.java | 16 +- .../impl/EntitiesModifiedAtRevisionQuery.java | 8 +- .../impl/RevisionsOfEntityQuery.java | 9 +- .../property/EntityPropertyName.java | 4 +- .../property/ModifiedFlagPropertyName.java | 6 +- .../property/OriginalIdPropertyName.java | 4 +- .../property/PropertyNameGetter.java | 4 +- .../property/RevisionNumberPropertyName.java | 4 +- .../RevisionPropertyPropertyName.java | 4 +- .../property/RevisionTypePropertyName.java | 4 +- .../envers/query/order/AuditOrder.java | 3 +- .../{ => internal}/PropertyAuditOrder.java | 7 +- .../query/projection/AuditProjection.java | 5 +- .../PropertyAuditProjection.java | 9 +- .../envers/strategy/AuditStrategy.java | 12 +- .../envers/strategy/DefaultAuditStrategy.java | 20 +- .../strategy/ValidityAuditStrategy.java | 27 +- .../envers/tools/ArgumentsTools.java | 42 --- .../hibernate/envers/tools/MappingTools.java | 39 --- .../java/org/hibernate/envers/tools/Pair.java | 1 - .../hibernate/envers/tools/StringTools.java | 77 ------ .../org/hibernate/envers/tools/Tools.java | 253 ------------------ .../tools/hbm2ddl}/EnversSchemaGenerator.java | 4 +- .../tools/reflection/ReflectionTools.java | 85 ------ .../tool/ant/EnversHibernateToolTask.java | 61 ----- .../org.hibernate.integrator.spi.Integrator | 2 +- .../envers/test/AbstractOneSessionTest.java | 7 +- .../test/BaseEnversFunctionalTestCase.java | 5 +- .../test/BaseEnversJPAFunctionalTestCase.java | 21 +- .../ExtendedRevisionEntity.java | 2 +- .../envers/test/integration/basic/Delete.java | 2 +- .../basic/OutsideTransactionTest.java | 8 +- .../basic/TransactionRollbackBehaviour.java | 6 +- .../basic/UnversionedProperty.java | 2 +- .../test/integration/collection/EnumSet.java | 2 +- .../embeddable/EmbeddableList2.java | 1 - .../collection/embeddable/EmbeddableMap.java | 7 +- .../AbstractCollectionChangeTest.java | 10 +- .../integration/components/Components.java | 2 +- .../components/PropertiesGroupTest.java | 7 +- .../relations/ManyToOneInComponent.java | 2 +- .../relations/OneToManyInComponent.java | 2 +- .../customtype/ObjectUserTypeTest.java | 3 +- .../integration/data/LobSerializables.java | 2 +- .../envers/test/integration/data/Lobs.java | 2 +- .../flush/ManualFlushAutoCommitDisabled.java | 4 +- .../test/integration/ids/embeddedid/Item.java | 4 +- .../integration/ids/embeddedid/Producer.java | 4 +- .../ids/embeddedid/PurchaseOrder.java | 12 +- .../RelationInsideEmbeddableTest.java | 11 +- .../integration/ids/idclass/ClassType.java | 1 - .../ids/idclass/IdClassWithRelationTest.java | 9 +- .../MixedInheritanceStrategiesEntityTest.java | 2 +- .../AbstractPropertiesAuditedTest.java | 2 +- .../integration/jta/JtaExceptionListener.java | 1 - .../test/integration/jta/JtaTransaction.java | 6 +- .../test/integration/manytomany/BasicSet.java | 2 +- .../ManyToManyInverseToSuperclassTest.java | 6 +- .../manytomany/sametable/BasicSametable.java | 2 +- .../test/integration/merge/AddDelTest.java | 2 +- .../AbstractModifiedFlagsEntityTest.java | 4 +- .../AbstractModifiedFlagsOneSessionTest.java | 5 +- .../HasChangedComponentCollection.java | 2 +- .../HasChangedDetachedMultipleCollection.java | 2 +- .../modifiedflags/ModifiedFlagSuffix.java | 4 +- .../ids/JoinMulIdNamingRefIngEntity.java | 2 +- .../PropertyNotUpdatableTest.java | 19 +- .../test/integration/onetomany/BasicList.java | 2 +- .../detached/DataChangesDetachedSet.java | 2 +- .../onetomany/embeddedid/Constant.java | 6 +- .../onetomany/embeddedid/MapsIdTest.java | 7 +- .../onetomany/embeddedid/Person.java | 9 +- .../onetomany/embeddedid/PersonTuple.java | 12 +- .../OneToManyInverseToSuperclassTest.java | 6 +- .../UnversionedOptimisticLockingField.java | 5 +- .../properties/VersionsProperties.java | 9 +- .../proxy/QueryingWithProxyObjectTest.java | 2 - .../proxy/RemovedObjectQueryTest.java | 17 +- .../query/CustomRevEntityQuery.java | 2 +- .../integration/query/DeletedEntities.java | 2 +- .../query/MaximalizePropertyQuery.java | 7 +- .../query/RevisionConstraintQuery.java | 2 +- .../test/integration/query/SimpleQuery.java | 2 +- .../integration/query/StoreDeletedData.java | 3 +- .../ReadWriteExpressionChange.java | 2 +- .../reventity/DifferentDBSchemaTest.java | 3 +- .../GloballyConfiguredRevListenerTest.java | 3 +- .../reventity/InheritedRevEntity.java | 3 +- .../OverrideCustomRevListenerTest.java | 1 - .../OverrideDefaultRevListenerTest.java | 1 - .../AnnotatedTrackingEntitiesTest.java | 3 +- .../DefaultTrackingEntitiesTest.java | 3 +- .../EntityNamesTest.java | 12 +- .../ExtendedRevisionEntityTest.java | 3 +- .../TrackingEntitiesMultipleChangesTest.java | 3 +- .../ValidityAuditStrategyManyToManyTest.java | 3 +- ...tyAuditStrategyRevEndTestCustomRevEnt.java | 7 +- .../ValidityAuditStrategyRevEndTsTest.java | 7 +- .../integration/tools/SchemaExportTest.java | 11 +- .../AbstractEntityManagerTest.java | 19 +- .../envers/test/tools/TestTools.java | 98 +++---- 285 files changed, 2279 insertions(+), 2325 deletions(-) delete mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java delete mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/ant/ConfigurationTaskWithEnvers.java delete mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/ant/JPAConfigurationTaskWithEnvers.java delete mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditEntitiesConfiguration.java create mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/configuration/EnversSettings.java delete mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java create mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/AuditEntitiesConfiguration.java rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/ClassesAuditingData.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/EntitiesConfigurator.java (88%) create mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/GlobalConfiguration.java rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/PersistentClassGraphDefiner.java (94%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/RevisionInfoConfiguration.java (83%) create mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfigurationResult.java rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/AuditEntityNameRegister.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/AuditMetadataGenerator.java (95%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/AuditTableData.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/BasicMetadataGenerator.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/CollectionMetadataGenerator.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/ComponentMetadataGenerator.java (71%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/EntityXmlMappingData.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/IdMetadataGenerator.java (85%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/InheritanceType.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/MetadataTools.java (99%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/QueryGeneratorBuilder.java (83%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/ToOneRelationMetadataGenerator.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/reader/AnnotationsMetadataReader.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/reader/AuditedPropertiesHolder.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/reader/AuditedPropertiesReader.java (95%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/reader/ClassAuditingData.java (95%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/reader/ComponentAuditedPropertiesReader.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/reader/ComponentAuditingData.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/reader/PersistentPropertiesSource.java (85%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => internal}/metadata/reader/PropertyAuditingData.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/configuration/{ => spi}/AuditConfiguration.java (80%) rename hibernate-envers/src/main/java/org/hibernate/envers/event/{ => spi}/BaseEnversCollectionEventListener.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/event/{ => spi}/BaseEnversEventListener.java (88%) rename hibernate-envers/src/main/java/org/hibernate/envers/event/{ => spi}/EnversIntegrator.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/event/{ => spi}/EnversListener.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/event/{ => spi}/EnversListenerDuplicationStrategy.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/event/{ => spi}/EnversPostCollectionRecreateEventListenerImpl.java (94%) rename hibernate-envers/src/main/java/org/hibernate/envers/event/{ => spi}/EnversPostDeleteEventListenerImpl.java (89%) rename hibernate-envers/src/main/java/org/hibernate/envers/event/{ => spi}/EnversPostInsertEventListenerImpl.java (89%) rename hibernate-envers/src/main/java/org/hibernate/envers/event/{ => spi}/EnversPostUpdateEventListenerImpl.java (91%) rename hibernate-envers/src/main/java/org/hibernate/envers/event/{ => spi}/EnversPreCollectionRemoveEventListenerImpl.java (95%) rename hibernate-envers/src/main/java/org/hibernate/envers/event/{ => spi}/EnversPreCollectionUpdateEventListenerImpl.java (94%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/EntitiesConfigurations.java (99%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/EntityConfiguration.java (95%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/EntityInstantiator.java (91%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/IdMappingData.java (94%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/PropertyData.java (98%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/RelationDescription.java (94%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/RelationType.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/RevisionTypeType.java (98%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/ComponentPropertyMapper.java (89%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/CompositeMapperBuilder.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/ExtendedPropertyMapper.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/MultiPropertyMapper.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/PersistentCollectionChangeData.java (98%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/PropertyMapper.java (94%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/SimpleMapperBuilder.java (91%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/SinglePropertyMapper.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/SubclassPropertyMapper.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/id/AbstractCompositeIdMapper.java (83%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/id/AbstractIdMapper.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/id/EmbeddedIdMapper.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/id/IdMapper.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/id/MultipleIdMapper.java (91%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/id/QueryParameterData.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/id/SimpleIdMapperBuilder.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/id/SingleIdMapper.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/AbstractCollectionMapper.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/AbstractOneToOneMapper.java (91%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/AbstractToOneMapper.java (81%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/BasicCollectionMapper.java (86%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/CommonCollectionMapperData.java (89%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/ListCollectionMapper.java (85%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/MapCollectionMapper.java (87%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/MiddleComponentData.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/MiddleIdData.java (91%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/OneToOneNotOwningMapper.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/SortedMapCollectionMapper.java (84%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/SortedSetCollectionMapper.java (84%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/ToOneEntityLoader.java (88%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/ToOneIdMapper.java (87%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/component/MiddleComponentMapper.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/component/MiddleDummyComponentMapper.java (89%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/component/MiddleEmbeddableComponentMapper.java (83%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java (87%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/component/MiddleRelatedComponentMapper.java (88%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/component/MiddleSimpleComponentMapper.java (89%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/component/MiddleStraightComponentMapper.java (91%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java (99%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java (87%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java (87%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java (88%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/initializor/Initializor.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/initializor/SortedMapCollectionInitializor.java (86%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/initializor/SortedSetCollectionInitializor.java (86%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/proxy/CollectionProxy.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/proxy/ListProxy.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/proxy/MapProxy.java (91%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/proxy/SetProxy.java (87%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/proxy/SortedMapProxy.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/lazy/proxy/SortedSetProxy.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/query/AbstractRelationQueryGenerator.java (80%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java (80%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/query/OneEntityQueryGenerator.java (82%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/query/QueryConstants.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/query/RelationQueryGenerator.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/query/ThreeEntityQueryGenerator.java (85%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java (82%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/entities/mapper/relation/query/TwoEntityQueryGenerator.java (83%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/reader/AuditReaderImpl.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/reader/AuditReaderImplementor.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/reader/CrossTypeRevisionChangesReaderImpl.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/reader/FirstLevelCache.java (95%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/revisioninfo/DefaultRevisionInfoGenerator.java (94%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/revisioninfo/DefaultTrackingModifiedEntitiesRevisionInfoGenerator.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/revisioninfo/ModifiedEntityNamesReader.java (80%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/revisioninfo/RevisionInfoGenerator.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/revisioninfo/RevisionInfoNumberReader.java (90%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/revisioninfo/RevisionInfoQueryCreator.java (98%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/AuditProcess.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/AuditProcessManager.java (95%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/EntityChangeNotifier.java (79%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/SessionCacheCleaner.java (95%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/work/AbstractAuditWorkUnit.java (94%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/work/AddWorkUnit.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/work/AuditWorkUnit.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/work/CollectionChangeWorkUnit.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/work/DelWorkUnit.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/work/FakeBidirectionalRelationWorkUnit.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/work/ModWorkUnit.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/work/PersistentCollectionChangeWorkUnit.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/work/WorkUnitMergeDispatcher.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/synchronization/work/WorkUnitMergeVisitor.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/{tools/ArraysTools.java => internal/tools/ArgumentsTools.java} (72%) create mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java create mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/EntityTools.java create mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MappingTools.java rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/tools/MutableBoolean.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/tools/MutableInteger.java (96%) create mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java create mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java create mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/tools/Triple.java (98%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/tools/graph/GraphDefiner.java (96%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/tools/graph/GraphTopologicalSort.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/tools/graph/TopologicalSort.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/tools/graph/Vertex.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/tools/query/Parameters.java (98%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/tools/query/QueryBuilder.java (97%) rename hibernate-envers/src/main/java/org/hibernate/envers/{ => internal}/tools/query/UpdateBuilder.java (91%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/BetweenAuditExpression.java (82%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/CriteriaTools.java (86%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/IdentifierEqAuditExpression.java (83%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/InAuditExpression.java (78%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/LogicalAuditExpression.java (83%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/NotAuditExpression.java (81%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/NotNullAuditExpression.java (79%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/NullAuditExpression.java (79%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/PropertyAuditExpression.java (82%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/RelatedAuditExpression.java (81%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/RevisionTypeAuditExpression.java (81%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/{ => internal}/SimpleAuditExpression.java (83%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/{ => internal}/impl/AbstractAuditQuery.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/{ => internal}/impl/EntitiesAtRevisionQuery.java (87%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/{ => internal}/impl/EntitiesModifiedAtRevisionQuery.java (89%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/{ => internal}/impl/RevisionsOfEntityQuery.java (95%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/{ => internal}/property/EntityPropertyName.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/{ => internal}/property/ModifiedFlagPropertyName.java (89%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/{ => internal}/property/OriginalIdPropertyName.java (93%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/{ => internal}/property/PropertyNameGetter.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/{ => internal}/property/RevisionNumberPropertyName.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/{ => internal}/property/RevisionPropertyPropertyName.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/{ => internal}/property/RevisionTypePropertyName.java (92%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/order/{ => internal}/PropertyAuditOrder.java (86%) rename hibernate-envers/src/main/java/org/hibernate/envers/query/projection/{ => internal}/PropertyAuditProjection.java (85%) delete mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/tools/ArgumentsTools.java delete mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/tools/MappingTools.java delete mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/tools/StringTools.java delete mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java rename hibernate-envers/src/main/java/org/hibernate/{tool => envers/tools/hbm2ddl}/EnversSchemaGenerator.java (93%) delete mode 100644 hibernate-envers/src/main/java/org/hibernate/envers/tools/reflection/ReflectionTools.java delete mode 100644 hibernate-envers/src/main/java/org/hibernate/tool/ant/EnversHibernateToolTask.java diff --git a/documentation/src/main/docbook/devguide/en-US/Envers.xml b/documentation/src/main/docbook/devguide/en-US/Envers.xml index d2e1fd7d0a..1e03a0d1f7 100644 --- a/documentation/src/main/docbook/devguide/en-US/Envers.xml +++ b/documentation/src/main/docbook/devguide/en-US/Envers.xml @@ -1,4 +1,4 @@ - + @@ -40,7 +40,7 @@ which stores the historical data, whenever you commit a transaction. Envers automatically creates audit tables if hibernate.hbm2ddl.auto option is set to create, create-drop or update. Otherwise, to export complete database schema - programatically, use org.hibernate.tool.EnversSchemaGenerator. Appropriate DDL + programatically, use org.hibernate.envers.tools.hbm2ddl.EnversSchemaGenerator. Appropriate DDL statements can be also generated with Ant task described later in this manual. @@ -58,7 +58,7 @@ -
+
Configuration It is possible to configure various aspects of Hibernate Envers behavior, such as table names, etc. @@ -300,7 +300,7 @@ When set to false, such column can be added to selected entities or properties using the @Audited annotation. For more information refer to - and . + and . @@ -480,7 +480,7 @@ class is inaccessible from @RevisionEntity (e.g. exists in a different module), set org.hibernate.envers.revision_listener property to it's fully qualified name. Class name defined by the configuration parameter overrides revision entity's - value attribute. + value attribute. @@ -621,7 +621,7 @@ public class AnnotatedTrackingRevisionEntity { EntityTrackingRevisionListener interface exposes one method that notifies whenever audited entity instance has been added, modified or removed within current revision boundaries. - + Custom implementation of tracking entity classes modified during revisions @@ -735,7 +735,7 @@ Set modifiedEntityTypes = revEntity.getModifiedEntityT To see how "Modified Flags" can be utilized, check out the very - simple query API that uses them: . + simple query API that uses them: .
@@ -771,7 +771,7 @@ Set modifiedEntityTypes = revEntity.getModifiedEntityT In the future, queries will be improved both in terms of speed and possibilities, when using the valid-time audit strategy, that is when storing both start and end revisions for entities. See - . + .
@@ -929,7 +929,7 @@ query.add(AuditEntity.relatedId("address").eq(relatedEntityId));]]> -
+
Querying for revisions of entity that modified given property @@ -948,11 +948,10 @@ query.add(AuditEntity.relatedId("address").eq(relatedEntityId));]]> - + @@ -967,11 +966,10 @@ query.add(AuditEntity.relatedId("address").eq(relatedEntityId));]]> - + @@ -991,11 +989,10 @@ query.add(AuditEntity.relatedId("address").eq(relatedEntityId));]]>forEntitiesModifiedAtRevision query: - +
@@ -1049,7 +1046,7 @@ query.add(AuditEntity.relatedId("address").eq(relatedEntityId));]]>Conditional auditing Envers persists audit data in reaction to various Hibernate events (e.g. post update, post insert, and - so on), using a series of even listeners from the org.hibernate.envers.event + so on), using a series of even listeners from the org.hibernate.envers.event.spi package. By default, if the Envers jar is in the classpath, the event listeners are auto-registered with Hibernate. @@ -1062,13 +1059,13 @@ query.add(AuditEntity.relatedId("address").eq(relatedEntityId));]]>hibernate.listeners.envers.autoRegister Hibernate property to false. - + Create subclasses for appropriate event listeners. For example, if you want to conditionally audit entity insertions, extend the - org.hibernate.envers.eventEnversPostInsertEventListenerImpl + org.hibernate.envers.event.spi.EnversPostInsertEventListenerImpl class. Place the conditional-auditing logic in the subclasses, call the super method if auditing should be performed. @@ -1076,7 +1073,7 @@ query.add(AuditEntity.relatedId("address").eq(relatedEntityId));]]> Create your own implementation of org.hibernate.integrator.spi.Integrator, - similar to org.hibernate.envers.event.EnversIntegrator. Use your event + similar to org.hibernate.envers.event.spi.EnversIntegrator. Use your event listener classes instead of the default ones. @@ -1398,7 +1395,7 @@ query.add(AuditEntity.relatedId("address").eq(relatedEntityId));]]> - Optionally, you can also override the default values following properties: + Optionally, you can also override the default values using following properties: org.hibernate.envers.audit_strategy_validity_end_rev_field_name @@ -1408,7 +1405,7 @@ query.add(AuditEntity.relatedId("address").eq(relatedEntityId));]]> - For more information, see . + For more information, see . diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java index 773555988b..74302e7fb9 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/AuditReaderFactory.java @@ -27,9 +27,9 @@ import org.hibernate.Session; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.event.EnversListener; +import org.hibernate.envers.event.spi.EnversListener; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.reader.AuditReaderImpl; +import org.hibernate.envers.internal.reader.AuditReaderImpl; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; import org.hibernate.event.spi.PostInsertEventListener; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java b/hibernate-envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java deleted file mode 100644 index 0d66130a91..0000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/ant/AnnotationConfigurationTaskWithEnvers.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.envers.ant; -import org.hibernate.cfg.Configuration; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.tool.ant.AnnotationConfigurationTask; - -/** - * @author Adam Warski (adam at warski dot org) - */ -public class AnnotationConfigurationTaskWithEnvers extends AnnotationConfigurationTask { - protected void doConfiguration(Configuration configuration) { - super.doConfiguration(configuration); - configuration.buildMappings(); - AuditConfiguration.getFor(configuration); - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/ant/ConfigurationTaskWithEnvers.java b/hibernate-envers/src/main/java/org/hibernate/envers/ant/ConfigurationTaskWithEnvers.java deleted file mode 100644 index a7ead2364f..0000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/ant/ConfigurationTaskWithEnvers.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.envers.ant; -import org.hibernate.cfg.Configuration; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.tool.ant.ConfigurationTask; - -/** - * @author Adam Warski (adam at warski dot org) - */ -public class ConfigurationTaskWithEnvers extends ConfigurationTask { - protected void doConfiguration(Configuration configuration) { - AuditConfiguration.getFor(configuration); - - super.doConfiguration(configuration); - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/ant/JPAConfigurationTaskWithEnvers.java b/hibernate-envers/src/main/java/org/hibernate/envers/ant/JPAConfigurationTaskWithEnvers.java deleted file mode 100644 index 89eefb2d94..0000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/ant/JPAConfigurationTaskWithEnvers.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.envers.ant; -import org.hibernate.cfg.Configuration; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.tool.ant.JPAConfigurationTask; - -/** - * @author Adam Warski (adam at warski dot org) - */ -public class JPAConfigurationTaskWithEnvers extends JPAConfigurationTask { - protected void doConfiguration(Configuration configuration) { - AuditConfiguration.getFor(configuration); - - super.doConfiguration(configuration); - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditEntitiesConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditEntitiesConfiguration.java deleted file mode 100644 index e4ebd44dff..0000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditEntitiesConfiguration.java +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.envers.configuration; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import org.hibernate.envers.strategy.DefaultAuditStrategy; - -import static org.hibernate.envers.tools.Tools.getProperty; - -/** - * Configuration of versions entities - names of fields, entities and tables created to store versioning information. - * @author Adam Warski (adam at warski dot org) - * @author Stephanie Pau at Markit Group Plc - */ -public class AuditEntitiesConfiguration { - private final String auditTablePrefix; - private final String auditTableSuffix; - - private final String auditStrategyName; - private final String originalIdPropName; - - private final String revisionFieldName; - private final String revisionNumberPath; - private final String revisionPropBasePath; - - private final String revisionTypePropName; - private final String revisionTypePropType; - - private final String revisionInfoEntityName; - - private final Map customAuditTablesNames; - - private final String revisionEndFieldName; - - private final boolean revisionEndTimestampEnabled; - private final String revisionEndTimestampFieldName; - - public AuditEntitiesConfiguration(Properties properties, String revisionInfoEntityName) { - this.revisionInfoEntityName = revisionInfoEntityName; - - auditTablePrefix = getProperty(properties, - "org.hibernate.envers.audit_table_prefix", - "org.hibernate.envers.auditTablePrefix", - ""); - auditTableSuffix = getProperty(properties, - "org.hibernate.envers.audit_table_suffix", - "org.hibernate.envers.auditTableSuffix", - "_AUD"); - - auditStrategyName = getProperty(properties, - "org.hibernate.envers.audit_strategy", - "org.hibernate.envers.audit_strategy", - DefaultAuditStrategy.class.getName()); - - originalIdPropName = "originalId"; - - revisionFieldName = getProperty(properties, - "org.hibernate.envers.revision_field_name", - "org.hibernate.envers.revisionFieldName", - "REV"); - - revisionTypePropName = getProperty(properties, - "org.hibernate.envers.revision_type_field_name", - "org.hibernate.envers.revisionTypeFieldName", - "REVTYPE"); - revisionTypePropType = "byte"; - - revisionEndFieldName = getProperty(properties, - "org.hibernate.envers.audit_strategy_validity_end_rev_field_name", - "org.hibernate.envers.audit_strategy_valid_time_end_name", - "REVEND"); - - String revisionEndTimestampEnabledStr = getProperty(properties, - "org.hibernate.envers.audit_strategy_validity_store_revend_timestamp", - "org.hibernate.envers.audit_strategy_validity_store_revend_timestamp", - "false"); - revisionEndTimestampEnabled = Boolean.parseBoolean(revisionEndTimestampEnabledStr); - - if (revisionEndTimestampEnabled) { - revisionEndTimestampFieldName = getProperty(properties, - "org.hibernate.envers.audit_strategy_validity_revend_timestamp_field_name", - "org.hibernate.envers.audit_strategy_validity_revend_timestamp_field_name", - "REVEND_TSTMP"); - } else { - revisionEndTimestampFieldName = null; - } - - customAuditTablesNames = new HashMap(); - - revisionNumberPath = originalIdPropName + "." + revisionFieldName + ".id"; - revisionPropBasePath = originalIdPropName + "." + revisionFieldName + "."; - } - - public String getOriginalIdPropName() { - return originalIdPropName; - } - - public String getRevisionFieldName() { - return revisionFieldName; - } - - public boolean isRevisionEndTimestampEnabled() { - return revisionEndTimestampEnabled; - } - - public String getRevisionEndTimestampFieldName() { - return revisionEndTimestampFieldName; - } - - public String getRevisionNumberPath() { - return revisionNumberPath; - } - - /** - * @param propertyName Property of the revision entity. - * @return A path to the given property of the revision entity associated with an audit entity. - */ - public String getRevisionPropPath(String propertyName) { - return revisionPropBasePath + propertyName; - } - - public String getRevisionTypePropName() { - return revisionTypePropName; - } - - public String getRevisionTypePropType() { - return revisionTypePropType; - } - - public String getRevisionInfoEntityName() { - return revisionInfoEntityName; - } - - // - - public void addCustomAuditTableName(String entityName, String tableName) { - customAuditTablesNames.put(entityName, tableName); - } - - // - - public String getAuditEntityName(String entityName) { - return auditTablePrefix + entityName + auditTableSuffix; - } - - public String getAuditTableName(String entityName, String tableName) { - String customHistoryTableName = customAuditTablesNames.get(entityName); - if (customHistoryTableName == null) { - return auditTablePrefix + tableName + auditTableSuffix; - } - - return customHistoryTableName; - } - - public String getAuditStrategyName() { - return auditStrategyName; - } - - public String getRevisionEndFieldName() { - return revisionEndFieldName; - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/EnversSettings.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/EnversSettings.java new file mode 100644 index 0000000000..8b8d889156 --- /dev/null +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/EnversSettings.java @@ -0,0 +1,102 @@ +package org.hibernate.envers.configuration; + +import org.hibernate.envers.strategy.DefaultAuditStrategy; + +/** + * Configuration property names. + * + * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) + */ +public interface EnversSettings { + /** + * Triggers revision generation when not-owned relation field changes. Defaults to {@code true}. + */ + public static final String REVISION_ON_COLLECTION_CHANGE = "org.hibernate.envers.revision_on_collection_change"; + + /** + * Treats optimistic locking properties as unversioned. Defaults to {@code true}. + */ + public static final String DO_NOT_AUDIT_OPTIMISTIC_LOCKING_FIELD = "org.hibernate.envers.do_not_audit_optimistic_locking_field"; + + /** + * Indicates whether entity data should be stored during removal. Defaults to {@code false}. + */ + public static final String STORE_DATA_AT_DELETE = "org.hibernate.envers.store_data_at_delete"; + + /** + * Default name of the schema containing audit tables. + */ + public static final String DEFAULT_SCHEMA = "org.hibernate.envers.default_schema"; + + /** + * Default name of the catalog containing audit tables. + */ + public static final String DEFAULT_CATALOG = "org.hibernate.envers.default_catalog"; + + /** + * Track entity names that have been changed during each revision. Defaults to {@code false}. + */ + public static final String TRACK_ENTITIES_CHANGED_IN_REVISION = "org.hibernate.envers.track_entities_changed_in_revision"; + + /** + * Use revision entity with native identifier generator. Defaults to {@code true} for backward compatibility. + */ + public static final String USE_REVISION_ENTITY_WITH_NATIVE_ID = "org.hibernate.envers.use_revision_entity_with_native_id"; + + /** + * Globally activates modified properties flag feature. Defaults to {@code false}. + */ + public static final String GLOBAL_WITH_MODIFIED_FLAG = "org.hibernate.envers.global_with_modified_flag"; + + /** + * Suffix of modified flag columns. Defaults to {@literal _MOD}. + */ + public static final String MODIFIED_FLAG_SUFFIX = "org.hibernate.envers.modified_flag_suffix"; + + /** + * Fully qualified class name of user defined revision listener. + */ + public static final String REVISION_LISTENER = "org.hibernate.envers.revision_listener"; + + /** + * Audit table prefix. Empty by default. + */ + public static final String AUDIT_TABLE_PREFIX = "org.hibernate.envers.audit_table_prefix"; + + /** + * Audit table suffix. Defaults to {@literal _AUD}. + */ + public static final String AUDIT_TABLE_SUFFIX = "org.hibernate.envers.audit_table_suffix"; + + /** + * Audit strategy. Defaults to {@link DefaultAuditStrategy}. + */ + public static final String AUDIT_STRATEGY = "org.hibernate.envers.audit_strategy"; + + /** + * Revision field name. Defaults to {@literal REV}. + */ + public static final String REVISION_FIELD_NAME = "org.hibernate.envers.revision_field_name"; + + /** + * Revision type field name. Defaults to {@literal REVTYPE}. + */ + public static final String REVISION_TYPE_FIELD_NAME = "org.hibernate.envers.revision_type_field_name"; + + /** + * Column name that will hold the end revision number in audit entities. Defaults to {@literal REVEND}. + */ + public static final String AUDIT_STRATEGY_VALIDITY_END_REV_FIELD_NAME = "org.hibernate.envers.audit_strategy_validity_end_rev_field_name"; + + /** + * Store the timestamp of the end revision, until which the data was valid, + * in addition to the end revision itself. Defaults to {@code false}. + */ + public static final String AUDIT_STRATEGY_VALIDITY_STORE_REVEND_TIMESTAMP = "org.hibernate.envers.audit_strategy_validity_store_revend_timestamp"; + + /** + * Column name of the timestamp of the end revision until which the data was valid. + * Defaults to {@literal REVEND_TSTMP}. + */ + public static final String AUDIT_STRATEGY_VALIDITY_REVEND_TIMESTAMP_FIELD_NAME = "org.hibernate.envers.audit_strategy_validity_revend_timestamp_field_name"; +} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java deleted file mode 100644 index 34f3d51f3f..0000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/GlobalConfiguration.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.envers.configuration; -import static org.hibernate.envers.tools.Tools.getProperty; - -import java.util.Properties; - -import org.hibernate.MappingException; -import org.hibernate.envers.RevisionListener; -import org.hibernate.internal.util.ReflectHelper; - -/** - * @author Adam Warski (adam at warski dot org) - * @author Nicolas Doroskevich - * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) - * @author Michal Skowronek (mskowr at o2 dot pl) - */ -public class GlobalConfiguration { - public static final String GLOBAL_WITH_MODIFIED_FLAG_PROPERTY = "org.hibernate.envers.global_with_modified_flag"; - public static final String MODIFIED_FLAG_SUFFIX_PROPERTY = "org.hibernate.envers.modified_flag_suffix"; - public static final String DEFAULT_MODIFIED_FLAG_SUFFIX = "_MOD"; - - // Should a revision be generated when a not-owned relation field changes - private final boolean generateRevisionsForCollections; - - // Should the optimistic locking property of an entity be considered unversioned - private final boolean doNotAuditOptimisticLockingField; - - // Should entity data be stored when it is deleted - private final boolean storeDataAtDelete; - - // The default name of the schema of audit tables. - private final String defaultSchemaName; - - // The default name of the catalog of the audit tables. - private final String defaultCatalogName; - - // Should Envers track (persist) entity names that have been changed during each revision. - private boolean trackEntitiesChangedInRevisionEnabled; - - // Revision listener class name. - private final Class revisionListenerClass; - - // Should Envers use modified property flags by default - private boolean globalWithModifiedFlag; - - // Indicates that user defined global behavior for modified flags feature - private boolean hasGlobalSettingForWithModifiedFlag; - - // Suffix to be used for modified flags columns - private String modifiedFlagSuffix; - - // Use revision entity with native id generator - private final boolean useRevisionEntityWithNativeId; - - /* - Which operator to use in correlated subqueries (when we want a property to be equal to the result of - a correlated subquery, for example: e.p (select max(e2.p) where e2.p2 = e.p2 ...). - Normally, this should be "=". However, HSQLDB has an issue related to that, so as a workaround, - "in" is used. See {@link org.hibernate.envers.test.various.HsqlTest}. - */ - private final String correlatedSubqueryOperator; - - public GlobalConfiguration(Properties properties) { - String generateRevisionsForCollectionsStr = getProperty(properties, - "org.hibernate.envers.revision_on_collection_change", - "org.hibernate.envers.revisionOnCollectionChange", - "true"); - generateRevisionsForCollections = Boolean.parseBoolean(generateRevisionsForCollectionsStr); - - String ignoreOptimisticLockingPropertyStr = getProperty(properties, - "org.hibernate.envers.do_not_audit_optimistic_locking_field", - "org.hibernate.envers.doNotAuditOptimisticLockingField", - "true"); - doNotAuditOptimisticLockingField = Boolean.parseBoolean(ignoreOptimisticLockingPropertyStr); - - String storeDataDeletedEntityStr = getProperty(properties, - "org.hibernate.envers.store_data_at_delete", - "org.hibernate.envers.storeDataAtDelete", - "false"); - storeDataAtDelete = Boolean.parseBoolean(storeDataDeletedEntityStr); - - defaultSchemaName = properties.getProperty("org.hibernate.envers.default_schema", null); - defaultCatalogName = properties.getProperty("org.hibernate.envers.default_catalog", null); - - correlatedSubqueryOperator = "org.hibernate.dialect.HSQLDialect".equals( - properties.getProperty("hibernate.dialect")) ? "in" : "="; - - String trackEntitiesChangedInRevisionEnabledStr = getProperty(properties, - "org.hibernate.envers.track_entities_changed_in_revision", - "org.hibernate.envers.track_entities_changed_in_revision", - "false"); - trackEntitiesChangedInRevisionEnabled = Boolean.parseBoolean(trackEntitiesChangedInRevisionEnabledStr); - - String useRevisionEntityWithNativeIdStr = getProperty(properties, - "org.hibernate.envers.use_revision_entity_with_native_id", - "org.hibernate.envers.use_revision_entity_with_native_id", - "true"); - useRevisionEntityWithNativeId = Boolean.parseBoolean(useRevisionEntityWithNativeIdStr); - - hasGlobalSettingForWithModifiedFlag = - properties.getProperty(GLOBAL_WITH_MODIFIED_FLAG_PROPERTY) != null; - String usingModifiedFlagStr = getProperty(properties, - GLOBAL_WITH_MODIFIED_FLAG_PROPERTY, - GLOBAL_WITH_MODIFIED_FLAG_PROPERTY, - "false"); - globalWithModifiedFlag = Boolean.parseBoolean(usingModifiedFlagStr); - - modifiedFlagSuffix = - getProperty(properties, MODIFIED_FLAG_SUFFIX_PROPERTY, - MODIFIED_FLAG_SUFFIX_PROPERTY, - DEFAULT_MODIFIED_FLAG_SUFFIX); - - String revisionListenerClassName = properties.getProperty("org.hibernate.envers.revision_listener", null); - if (revisionListenerClassName != null) { - try { - revisionListenerClass = (Class) ReflectHelper.classForName(revisionListenerClassName); - } catch (ClassNotFoundException e) { - throw new MappingException("Revision listener class not found: " + revisionListenerClassName + ".", e); - } - } else { - revisionListenerClass = null; - } - } - - public boolean isGenerateRevisionsForCollections() { - return generateRevisionsForCollections; - } - - public boolean isDoNotAuditOptimisticLockingField() { - return doNotAuditOptimisticLockingField; - } - - public String getCorrelatedSubqueryOperator() { - return correlatedSubqueryOperator; - } - - public boolean isStoreDataAtDelete() { - return storeDataAtDelete; - } - - public String getDefaultSchemaName() { - return defaultSchemaName; - } - - public String getDefaultCatalogName() { - return defaultCatalogName; - } - - public boolean isTrackEntitiesChangedInRevisionEnabled() { - return trackEntitiesChangedInRevisionEnabled; - } - - public void setTrackEntitiesChangedInRevisionEnabled(boolean trackEntitiesChangedInRevisionEnabled) { - this.trackEntitiesChangedInRevisionEnabled = trackEntitiesChangedInRevisionEnabled; - } - - public Class getRevisionListenerClass() { - return revisionListenerClass; - } - - public boolean hasSettingForUsingModifiedFlag() { - return hasGlobalSettingForWithModifiedFlag; - } - - public boolean isGlobalWithModifiedFlag() { - return globalWithModifiedFlag; - } - - public String getModifiedFlagSuffix() { - return modifiedFlagSuffix; - } - - public boolean isUseRevisionEntityWithNativeId() { - return useRevisionEntityWithNativeId; - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/AuditEntitiesConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/AuditEntitiesConfiguration.java new file mode 100644 index 0000000000..ac8ca6d5f6 --- /dev/null +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/AuditEntitiesConfiguration.java @@ -0,0 +1,170 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.envers.configuration.internal; + +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import org.hibernate.envers.configuration.EnversSettings; +import org.hibernate.envers.strategy.DefaultAuditStrategy; +import org.hibernate.internal.util.config.ConfigurationHelper; + +/** + * Configuration of versions entities - names of fields, entities and tables created to store versioning information. + * + * @author Adam Warski (adam at warski dot org) + * @author Stephanie Pau at Markit Group Plc + */ +public class AuditEntitiesConfiguration { + private final String auditTablePrefix; + private final String auditTableSuffix; + + private final String auditStrategyName; + private final String originalIdPropName; + + private final String revisionFieldName; + private final String revisionNumberPath; + private final String revisionPropBasePath; + + private final String revisionTypePropName; + private final String revisionTypePropType; + + private final String revisionInfoEntityName; + + private final Map customAuditTablesNames; + + private final String revisionEndFieldName; + + private final boolean revisionEndTimestampEnabled; + private final String revisionEndTimestampFieldName; + + public AuditEntitiesConfiguration(Properties properties, String revisionInfoEntityName) { + this.revisionInfoEntityName = revisionInfoEntityName; + + auditTablePrefix = ConfigurationHelper.getString( EnversSettings.AUDIT_TABLE_PREFIX, properties, "" ); + auditTableSuffix = ConfigurationHelper.getString( EnversSettings.AUDIT_TABLE_SUFFIX, properties, "_AUD" ); + + auditStrategyName = ConfigurationHelper.getString( + EnversSettings.AUDIT_STRATEGY, properties, DefaultAuditStrategy.class.getName() + ); + + originalIdPropName = "originalId"; + + revisionFieldName = ConfigurationHelper.getString( EnversSettings.REVISION_FIELD_NAME, properties, "REV" ); + + revisionTypePropName = ConfigurationHelper.getString( + EnversSettings.REVISION_TYPE_FIELD_NAME, properties, "REVTYPE" + ); + revisionTypePropType = "byte"; + + revisionEndFieldName = ConfigurationHelper.getString( + EnversSettings.AUDIT_STRATEGY_VALIDITY_END_REV_FIELD_NAME, properties, "REVEND" + ); + + revisionEndTimestampEnabled = ConfigurationHelper.getBoolean( + EnversSettings.AUDIT_STRATEGY_VALIDITY_STORE_REVEND_TIMESTAMP, properties, false + ); + + if ( revisionEndTimestampEnabled ) { + revisionEndTimestampFieldName = ConfigurationHelper.getString( + EnversSettings.AUDIT_STRATEGY_VALIDITY_REVEND_TIMESTAMP_FIELD_NAME, properties, "REVEND_TSTMP" + ); + } + else { + revisionEndTimestampFieldName = null; + } + + customAuditTablesNames = new HashMap(); + + revisionNumberPath = originalIdPropName + "." + revisionFieldName + ".id"; + revisionPropBasePath = originalIdPropName + "." + revisionFieldName + "."; + } + + public String getOriginalIdPropName() { + return originalIdPropName; + } + + public String getRevisionFieldName() { + return revisionFieldName; + } + + public boolean isRevisionEndTimestampEnabled() { + return revisionEndTimestampEnabled; + } + + public String getRevisionEndTimestampFieldName() { + return revisionEndTimestampFieldName; + } + + public String getRevisionNumberPath() { + return revisionNumberPath; + } + + /** + * @param propertyName Property of the revision entity. + * + * @return A path to the given property of the revision entity associated with an audit entity. + */ + public String getRevisionPropPath(String propertyName) { + return revisionPropBasePath + propertyName; + } + + public String getRevisionTypePropName() { + return revisionTypePropName; + } + + public String getRevisionTypePropType() { + return revisionTypePropType; + } + + public String getRevisionInfoEntityName() { + return revisionInfoEntityName; + } + + public void addCustomAuditTableName(String entityName, String tableName) { + customAuditTablesNames.put( entityName, tableName ); + } + + public String getAuditEntityName(String entityName) { + return auditTablePrefix + entityName + auditTableSuffix; + } + + public String getAuditTableName(String entityName, String tableName) { + final String customHistoryTableName = customAuditTablesNames.get( entityName ); + if ( customHistoryTableName == null ) { + return auditTablePrefix + tableName + auditTableSuffix; + } + + return customHistoryTableName; + } + + public String getAuditStrategyName() { + return auditStrategyName; + } + + public String getRevisionEndFieldName() { + return revisionEndFieldName; + } +} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/ClassesAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/ClassesAuditingData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java index 9b24956811..d9a95069f3 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/ClassesAuditingData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ClassesAuditingData.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.configuration; +package org.hibernate.envers.configuration.internal; import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; @@ -7,10 +7,10 @@ import org.jboss.logging.Logger; import org.hibernate.MappingException; -import org.hibernate.envers.configuration.metadata.reader.ClassAuditingData; -import org.hibernate.envers.configuration.metadata.reader.PropertyAuditingData; +import org.hibernate.envers.configuration.internal.metadata.reader.ClassAuditingData; +import org.hibernate.envers.configuration.internal.metadata.reader.PropertyAuditingData; import org.hibernate.envers.internal.EnversMessageLogger; -import org.hibernate.envers.tools.MappingTools; +import org.hibernate.envers.internal.tools.MappingTools; import org.hibernate.mapping.PersistentClass; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/EntitiesConfigurator.java similarity index 88% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/EntitiesConfigurator.java index 7ea58c68b1..a12f588edb 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/EntitiesConfigurator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/EntitiesConfigurator.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration; +package org.hibernate.envers.configuration.internal; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintWriter; @@ -39,16 +40,17 @@ import org.hibernate.MappingException; import org.hibernate.annotations.common.reflection.ReflectionManager; +import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.cfg.Configuration; -import org.hibernate.envers.configuration.metadata.AuditEntityNameRegister; -import org.hibernate.envers.configuration.metadata.AuditMetadataGenerator; -import org.hibernate.envers.configuration.metadata.EntityXmlMappingData; -import org.hibernate.envers.configuration.metadata.reader.AnnotationsMetadataReader; -import org.hibernate.envers.configuration.metadata.reader.ClassAuditingData; -import org.hibernate.envers.entities.EntitiesConfigurations; +import org.hibernate.envers.configuration.internal.metadata.AuditEntityNameRegister; +import org.hibernate.envers.configuration.internal.metadata.AuditMetadataGenerator; +import org.hibernate.envers.configuration.internal.metadata.EntityXmlMappingData; +import org.hibernate.envers.configuration.internal.metadata.reader.AnnotationsMetadataReader; +import org.hibernate.envers.configuration.internal.metadata.reader.ClassAuditingData; +import org.hibernate.envers.internal.entities.EntitiesConfigurations; +import org.hibernate.envers.internal.tools.StringTools; +import org.hibernate.envers.internal.tools.graph.GraphTopologicalSort; import org.hibernate.envers.strategy.AuditStrategy; -import org.hibernate.envers.tools.StringTools; -import org.hibernate.envers.tools.graph.GraphTopologicalSort; import org.hibernate.mapping.PersistentClass; /** @@ -57,7 +59,7 @@ public class EntitiesConfigurator { public EntitiesConfigurations configure(Configuration cfg, ReflectionManager reflectionManager, GlobalConfiguration globalCfg, AuditEntitiesConfiguration verEntCfg, - AuditStrategy auditStrategy, + AuditStrategy auditStrategy, ClassLoaderService classLoaderService, Document revisionInfoXmlMapping, Element revisionInfoRelationMapping) { // Creating a name register to capture all audit entity names created. AuditEntityNameRegister auditEntityNameRegister = new AuditEntityNameRegister(); @@ -85,7 +87,7 @@ public EntitiesConfigurations configure(Configuration cfg, ReflectionManager ref classesAuditingData.updateCalculatedFields(); AuditMetadataGenerator auditMetaGen = new AuditMetadataGenerator(cfg, globalCfg, verEntCfg, auditStrategy, - revisionInfoRelationMapping, auditEntityNameRegister); + classLoaderService, revisionInfoRelationMapping, auditEntityNameRegister); // First pass for (Map.Entry pcDatasEntry : classesAuditingData.getAllClassAuditedData()) { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/GlobalConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/GlobalConfiguration.java new file mode 100644 index 0000000000..295f9d4585 --- /dev/null +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/GlobalConfiguration.java @@ -0,0 +1,184 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.envers.configuration.internal; + +import java.util.Properties; + +import org.hibernate.MappingException; +import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; +import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; +import org.hibernate.cfg.Environment; +import org.hibernate.dialect.HSQLDialect; +import org.hibernate.envers.RevisionListener; +import org.hibernate.envers.configuration.EnversSettings; +import org.hibernate.envers.internal.tools.ReflectionTools; +import org.hibernate.internal.util.config.ConfigurationHelper; + +/** + * @author Adam Warski (adam at warski dot org) + * @author Nicolas Doroskevich + * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) + * @author Michal Skowronek (mskowr at o2 dot pl) + */ +public class GlobalConfiguration { + // Should a revision be generated when a not-owned relation field changes + private final boolean generateRevisionsForCollections; + + // Should the optimistic locking property of an entity be considered unversioned + private final boolean doNotAuditOptimisticLockingField; + + // Should entity data be stored when it is deleted + private final boolean storeDataAtDelete; + + // The default name of the schema of audit tables. + private final String defaultSchemaName; + + // The default name of the catalog of the audit tables. + private final String defaultCatalogName; + + // Should Envers track (persist) entity names that have been changed during each revision. + private boolean trackEntitiesChangedInRevision; + + // Revision listener class name. + private final Class revisionListenerClass; + + // Should Envers use modified property flags by default + private boolean globalWithModifiedFlag; + + // Indicates that user defined global behavior for modified flags feature + private boolean hasGlobalSettingForWithModifiedFlag; + + // Suffix to be used for modified flags columns + private String modifiedFlagSuffix; + + // Use revision entity with native id generator + private final boolean useRevisionEntityWithNativeId; + + /* + Which operator to use in correlated subqueries (when we want a property to be equal to the result of + a correlated subquery, for example: e.p (select max(e2.p) where e2.p2 = e.p2 ...). + Normally, this should be "=". However, HSQLDB has an issue related to that, so as a workaround, + "in" is used. See {@link org.hibernate.envers.test.various.HsqlTest}. + */ + private final String correlatedSubqueryOperator; + + public GlobalConfiguration(Properties properties, ClassLoaderService classLoaderService) { + generateRevisionsForCollections = ConfigurationHelper.getBoolean( + EnversSettings.REVISION_ON_COLLECTION_CHANGE, properties, true + ); + + doNotAuditOptimisticLockingField = ConfigurationHelper.getBoolean( + EnversSettings.DO_NOT_AUDIT_OPTIMISTIC_LOCKING_FIELD, properties, true + ); + + storeDataAtDelete = ConfigurationHelper.getBoolean( EnversSettings.STORE_DATA_AT_DELETE, properties, false ); + + defaultSchemaName = properties.getProperty( EnversSettings.DEFAULT_SCHEMA, null ); + defaultCatalogName = properties.getProperty( EnversSettings.DEFAULT_CATALOG, null ); + + correlatedSubqueryOperator = HSQLDialect.class.getName() + .equals( properties.get( Environment.DIALECT ) ) ? "in" : "="; + + trackEntitiesChangedInRevision = ConfigurationHelper.getBoolean( + EnversSettings.TRACK_ENTITIES_CHANGED_IN_REVISION, properties, false + ); + + useRevisionEntityWithNativeId = ConfigurationHelper.getBoolean( + EnversSettings.USE_REVISION_ENTITY_WITH_NATIVE_ID, properties, true + ); + + hasGlobalSettingForWithModifiedFlag = properties.get( EnversSettings.GLOBAL_WITH_MODIFIED_FLAG ) != null; + globalWithModifiedFlag = ConfigurationHelper.getBoolean( + EnversSettings.GLOBAL_WITH_MODIFIED_FLAG, properties, false + ); + modifiedFlagSuffix = ConfigurationHelper.getString( + EnversSettings.MODIFIED_FLAG_SUFFIX, properties, "_MOD" + ); + + String revisionListenerClassName = properties.getProperty( EnversSettings.REVISION_LISTENER, null ); + if ( revisionListenerClassName != null ) { + try { + revisionListenerClass = ReflectionTools.loadClass( revisionListenerClassName, classLoaderService ); + } + catch ( ClassLoadingException e ) { + throw new MappingException( "Revision listener class not found: " + revisionListenerClassName + ".", e ); + } + } + else { + revisionListenerClass = null; + } + } + + public boolean isGenerateRevisionsForCollections() { + return generateRevisionsForCollections; + } + + public boolean isDoNotAuditOptimisticLockingField() { + return doNotAuditOptimisticLockingField; + } + + public String getCorrelatedSubqueryOperator() { + return correlatedSubqueryOperator; + } + + public boolean isStoreDataAtDelete() { + return storeDataAtDelete; + } + + public String getDefaultSchemaName() { + return defaultSchemaName; + } + + public String getDefaultCatalogName() { + return defaultCatalogName; + } + + public boolean isTrackEntitiesChangedInRevision() { + return trackEntitiesChangedInRevision; + } + + public void setTrackEntitiesChangedInRevision(boolean trackEntitiesChangedInRevision) { + this.trackEntitiesChangedInRevision = trackEntitiesChangedInRevision; + } + + public Class getRevisionListenerClass() { + return revisionListenerClass; + } + + public boolean hasSettingForUsingModifiedFlag() { + return hasGlobalSettingForWithModifiedFlag; + } + + public boolean isGlobalWithModifiedFlag() { + return globalWithModifiedFlag; + } + + public String getModifiedFlagSuffix() { + return modifiedFlagSuffix; + } + + public boolean isUseRevisionEntityWithNativeId() { + return useRevisionEntityWithNativeId; + } +} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/PersistentClassGraphDefiner.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/PersistentClassGraphDefiner.java similarity index 94% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/PersistentClassGraphDefiner.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/PersistentClassGraphDefiner.java index fc116123df..f82ef769a5 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/PersistentClassGraphDefiner.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/PersistentClassGraphDefiner.java @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration; +package org.hibernate.envers.configuration.internal; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import org.hibernate.cfg.Configuration; -import org.hibernate.envers.tools.Tools; -import org.hibernate.envers.tools.graph.GraphDefiner; +import org.hibernate.envers.internal.tools.Tools; +import org.hibernate.envers.internal.tools.graph.GraphDefiner; import org.hibernate.mapping.PersistentClass; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/RevisionInfoConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java similarity index 83% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/RevisionInfoConfiguration.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java index 02ac460ba7..7e14efa32b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/RevisionInfoConfiguration.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfiguration.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration; +package org.hibernate.envers.configuration.internal; import java.util.Date; import java.util.Iterator; import java.util.Set; @@ -43,18 +43,18 @@ import org.hibernate.envers.RevisionListener; import org.hibernate.envers.RevisionNumber; import org.hibernate.envers.RevisionTimestamp; -import org.hibernate.envers.configuration.metadata.AuditTableData; -import org.hibernate.envers.configuration.metadata.MetadataTools; +import org.hibernate.envers.configuration.internal.metadata.AuditTableData; +import org.hibernate.envers.configuration.internal.metadata.MetadataTools; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.enhanced.SequenceIdTrackingModifiedEntitiesRevisionEntity; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.revisioninfo.DefaultRevisionInfoGenerator; -import org.hibernate.envers.revisioninfo.DefaultTrackingModifiedEntitiesRevisionInfoGenerator; -import org.hibernate.envers.revisioninfo.ModifiedEntityNamesReader; -import org.hibernate.envers.revisioninfo.RevisionInfoGenerator; -import org.hibernate.envers.revisioninfo.RevisionInfoNumberReader; -import org.hibernate.envers.revisioninfo.RevisionInfoQueryCreator; -import org.hibernate.envers.tools.MutableBoolean; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.revisioninfo.DefaultRevisionInfoGenerator; +import org.hibernate.envers.internal.revisioninfo.DefaultTrackingModifiedEntitiesRevisionInfoGenerator; +import org.hibernate.envers.internal.revisioninfo.ModifiedEntityNamesReader; +import org.hibernate.envers.internal.revisioninfo.RevisionInfoGenerator; +import org.hibernate.envers.internal.revisioninfo.RevisionInfoNumberReader; +import org.hibernate.envers.internal.revisioninfo.RevisionInfoQueryCreator; +import org.hibernate.envers.internal.tools.MutableBoolean; import org.hibernate.internal.util.xml.XMLHelper; import org.hibernate.mapping.PersistentClass; import org.hibernate.type.LongType; @@ -106,7 +106,7 @@ private Document generateDefaultRevisionInfoXmlMapping() { revisionInfoTimestampType.getName(), true, false); MetadataTools.addColumn(timestampProperty, "REVTSTMP", null, null, null, null, null, null, false); - if (globalCfg.isTrackEntitiesChangedInRevisionEnabled()) { + if (globalCfg.isTrackEntitiesChangedInRevision()) { generateEntityNamesTrackingTableMapping(class_mapping, "modifiedEntityNames", globalCfg.getDefaultSchemaName(), globalCfg.getDefaultCatalogName(), "REVCHANGES", "REV", "ENTITYNAME", "string"); @@ -297,7 +297,7 @@ public RevisionInfoConfigurationResult configure(Configuration cfg, ReflectionMa revisionInfoClass = pc.getMappedClass(); Class revisionListenerClass = getRevisionListenerClass(revisionEntity.value()); revisionInfoTimestampType = pc.getProperty(revisionInfoTimestampData.getName()).getType(); - if (globalCfg.isTrackEntitiesChangedInRevisionEnabled() + if (globalCfg.isTrackEntitiesChangedInRevision() || (globalCfg.isUseRevisionEntityWithNativeId() && DefaultTrackingModifiedEntitiesRevisionEntity.class.isAssignableFrom(revisionInfoClass)) || (!globalCfg.isUseRevisionEntityWithNativeId() && SequenceIdTrackingModifiedEntitiesRevisionEntity.class.isAssignableFrom(revisionInfoClass)) || modifiedEntityNamesFound.isSet()) { @@ -306,7 +306,7 @@ public RevisionInfoConfigurationResult configure(Configuration cfg, ReflectionMa revisionInfoGenerator = new DefaultTrackingModifiedEntitiesRevisionInfoGenerator(revisionInfoEntityName, revisionInfoClass, revisionListenerClass, revisionInfoTimestampData, isTimestampAsDate(), modifiedEntityNamesData); - globalCfg.setTrackEntitiesChangedInRevisionEnabled(true); + globalCfg.setTrackEntitiesChangedInRevision(true); } else { revisionInfoGenerator = new DefaultRevisionInfoGenerator(revisionInfoEntityName, revisionInfoClass, revisionListenerClass, revisionInfoTimestampData, isTimestampAsDate()); @@ -320,7 +320,7 @@ revisionInfoClass, revisionListenerClass, revisionInfoTimestampData, isTimestamp Class revisionListenerClass = getRevisionListenerClass(RevisionListener.class); if (revisionInfoGenerator == null) { - if (globalCfg.isTrackEntitiesChangedInRevisionEnabled()) { + if (globalCfg.isTrackEntitiesChangedInRevision()) { revisionInfoClass = globalCfg.isUseRevisionEntityWithNativeId() ? DefaultTrackingModifiedEntitiesRevisionEntity.class : SequenceIdTrackingModifiedEntitiesRevisionEntity.class; revisionInfoEntityName = revisionInfoClass.getName(); @@ -341,8 +341,8 @@ revisionInfoClass, revisionListenerClass, revisionInfoTimestampData, isTimestamp revisionInfoTimestampData.getName(), isTimestampAsDate()), generateRevisionInfoRelationMapping(), new RevisionInfoNumberReader(revisionInfoClass, revisionInfoIdData), - globalCfg.isTrackEntitiesChangedInRevisionEnabled() ? new ModifiedEntityNamesReader(revisionInfoClass, modifiedEntityNamesData) - : null, + globalCfg.isTrackEntitiesChangedInRevision() ? new ModifiedEntityNamesReader(revisionInfoClass, modifiedEntityNamesData) + : null, revisionInfoEntityName, revisionInfoClass, revisionInfoTimestampData); } @@ -363,67 +363,3 @@ private Class getRevisionListenerClass(Class revisionInfoClass; - private final PropertyData revisionInfoTimestampData; - - RevisionInfoConfigurationResult(RevisionInfoGenerator revisionInfoGenerator, - Document revisionInfoXmlMapping, RevisionInfoQueryCreator revisionInfoQueryCreator, - Element revisionInfoRelationMapping, RevisionInfoNumberReader revisionInfoNumberReader, - ModifiedEntityNamesReader modifiedEntityNamesReader, String revisionInfoEntityName, - Class revisionInfoClass, PropertyData revisionInfoTimestampData) { - this.revisionInfoGenerator = revisionInfoGenerator; - this.revisionInfoXmlMapping = revisionInfoXmlMapping; - this.revisionInfoQueryCreator = revisionInfoQueryCreator; - this.revisionInfoRelationMapping = revisionInfoRelationMapping; - this.revisionInfoNumberReader = revisionInfoNumberReader; - this.modifiedEntityNamesReader = modifiedEntityNamesReader; - this.revisionInfoEntityName = revisionInfoEntityName; - this.revisionInfoClass = revisionInfoClass; - this.revisionInfoTimestampData = revisionInfoTimestampData; - } - - public RevisionInfoGenerator getRevisionInfoGenerator() { - return revisionInfoGenerator; - } - - public Document getRevisionInfoXmlMapping() { - return revisionInfoXmlMapping; - } - - public RevisionInfoQueryCreator getRevisionInfoQueryCreator() { - return revisionInfoQueryCreator; - } - - public Element getRevisionInfoRelationMapping() { - return revisionInfoRelationMapping; - } - - public RevisionInfoNumberReader getRevisionInfoNumberReader() { - return revisionInfoNumberReader; - } - - public String getRevisionInfoEntityName() { - return revisionInfoEntityName; - } - - public Class getRevisionInfoClass() { - return revisionInfoClass; - } - - public PropertyData getRevisionInfoTimestampData() { - return revisionInfoTimestampData; - } - - public ModifiedEntityNamesReader getModifiedEntityNamesReader() { - return modifiedEntityNamesReader; - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfigurationResult.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfigurationResult.java new file mode 100644 index 0000000000..0b89067929 --- /dev/null +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/RevisionInfoConfigurationResult.java @@ -0,0 +1,77 @@ +package org.hibernate.envers.configuration.internal; + +import org.dom4j.Document; +import org.dom4j.Element; + +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.revisioninfo.ModifiedEntityNamesReader; +import org.hibernate.envers.internal.revisioninfo.RevisionInfoGenerator; +import org.hibernate.envers.internal.revisioninfo.RevisionInfoNumberReader; +import org.hibernate.envers.internal.revisioninfo.RevisionInfoQueryCreator; + +/** + * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) + */ +public class RevisionInfoConfigurationResult { + private final RevisionInfoGenerator revisionInfoGenerator; + private final Document revisionInfoXmlMapping; + private final RevisionInfoQueryCreator revisionInfoQueryCreator; + private final Element revisionInfoRelationMapping; + private final RevisionInfoNumberReader revisionInfoNumberReader; + private final ModifiedEntityNamesReader modifiedEntityNamesReader; + private final String revisionInfoEntityName; + private final Class revisionInfoClass; + private final PropertyData revisionInfoTimestampData; + + RevisionInfoConfigurationResult(RevisionInfoGenerator revisionInfoGenerator, + Document revisionInfoXmlMapping, RevisionInfoQueryCreator revisionInfoQueryCreator, + Element revisionInfoRelationMapping, RevisionInfoNumberReader revisionInfoNumberReader, + ModifiedEntityNamesReader modifiedEntityNamesReader, String revisionInfoEntityName, + Class revisionInfoClass, PropertyData revisionInfoTimestampData) { + this.revisionInfoGenerator = revisionInfoGenerator; + this.revisionInfoXmlMapping = revisionInfoXmlMapping; + this.revisionInfoQueryCreator = revisionInfoQueryCreator; + this.revisionInfoRelationMapping = revisionInfoRelationMapping; + this.revisionInfoNumberReader = revisionInfoNumberReader; + this.modifiedEntityNamesReader = modifiedEntityNamesReader; + this.revisionInfoEntityName = revisionInfoEntityName; + this.revisionInfoClass = revisionInfoClass; + this.revisionInfoTimestampData = revisionInfoTimestampData; + } + + public RevisionInfoGenerator getRevisionInfoGenerator() { + return revisionInfoGenerator; + } + + public Document getRevisionInfoXmlMapping() { + return revisionInfoXmlMapping; + } + + public RevisionInfoQueryCreator getRevisionInfoQueryCreator() { + return revisionInfoQueryCreator; + } + + public Element getRevisionInfoRelationMapping() { + return revisionInfoRelationMapping; + } + + public RevisionInfoNumberReader getRevisionInfoNumberReader() { + return revisionInfoNumberReader; + } + + public String getRevisionInfoEntityName() { + return revisionInfoEntityName; + } + + public Class getRevisionInfoClass() { + return revisionInfoClass; + } + + public PropertyData getRevisionInfoTimestampData() { + return revisionInfoTimestampData; + } + + public ModifiedEntityNamesReader getModifiedEntityNamesReader() { + return modifiedEntityNamesReader; + } +} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditEntityNameRegister.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditEntityNameRegister.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditEntityNameRegister.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditEntityNameRegister.java index 53eb159a44..c2d00fdcf6 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditEntityNameRegister.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditEntityNameRegister.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; import java.util.HashSet; import java.util.Set; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java similarity index 95% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java index 8695b69503..a0994f789e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditMetadataGenerator.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; + import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -30,23 +31,24 @@ import org.jboss.logging.Logger; import org.hibernate.MappingException; +import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.cfg.Configuration; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.configuration.GlobalConfiguration; -import org.hibernate.envers.configuration.metadata.reader.ClassAuditingData; -import org.hibernate.envers.configuration.metadata.reader.PropertyAuditingData; -import org.hibernate.envers.entities.EntityConfiguration; -import org.hibernate.envers.entities.IdMappingData; -import org.hibernate.envers.entities.mapper.CompositeMapperBuilder; -import org.hibernate.envers.entities.mapper.ExtendedPropertyMapper; -import org.hibernate.envers.entities.mapper.MultiPropertyMapper; -import org.hibernate.envers.entities.mapper.SubclassPropertyMapper; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; +import org.hibernate.envers.configuration.internal.metadata.reader.ClassAuditingData; +import org.hibernate.envers.configuration.internal.metadata.reader.PropertyAuditingData; import org.hibernate.envers.internal.EnversMessageLogger; +import org.hibernate.envers.internal.entities.EntityConfiguration; +import org.hibernate.envers.internal.entities.IdMappingData; +import org.hibernate.envers.internal.entities.mapper.CompositeMapperBuilder; +import org.hibernate.envers.internal.entities.mapper.ExtendedPropertyMapper; +import org.hibernate.envers.internal.entities.mapper.MultiPropertyMapper; +import org.hibernate.envers.internal.entities.mapper.SubclassPropertyMapper; +import org.hibernate.envers.internal.tools.StringTools; +import org.hibernate.envers.internal.tools.Triple; import org.hibernate.envers.strategy.AuditStrategy; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.tools.StringTools; -import org.hibernate.envers.tools.Triple; import org.hibernate.mapping.Collection; import org.hibernate.mapping.Join; import org.hibernate.mapping.OneToOne; @@ -78,6 +80,7 @@ public final class AuditMetadataGenerator { private final GlobalConfiguration globalCfg; private final AuditEntitiesConfiguration verEntCfg; private final AuditStrategy auditStrategy; + private final ClassLoaderService classLoaderService; private final Element revisionInfoRelationMapping; /* @@ -101,13 +104,14 @@ public final class AuditMetadataGenerator { public AuditMetadataGenerator(Configuration cfg, GlobalConfiguration globalCfg, AuditEntitiesConfiguration verEntCfg, - AuditStrategy auditStrategy, + AuditStrategy auditStrategy, ClassLoaderService classLoaderService, Element revisionInfoRelationMapping, AuditEntityNameRegister auditEntityNameRegister) { this.cfg = cfg; this.globalCfg = globalCfg; this.verEntCfg = verEntCfg; this.auditStrategy = auditStrategy; + this.classLoaderService = classLoaderService; this.revisionInfoRelationMapping = revisionInfoRelationMapping; this.basicMetadataGenerator = new BasicMetadataGenerator(); @@ -143,7 +147,7 @@ void addRevisionInfoRelation(Element any_mapping) { void addRevisionType(Element any_mapping, Element any_mapping_end) { Element revTypeProperty = MetadataTools.addProperty(any_mapping, verEntCfg.getRevisionTypePropName(), verEntCfg.getRevisionTypePropType(), true, false); - revTypeProperty.addAttribute("type", "org.hibernate.envers.entities.RevisionTypeType"); + revTypeProperty.addAttribute("type", "org.hibernate.envers.internal.entities.RevisionTypeType"); // Adding the end revision, if appropriate addEndRevision(any_mapping_end); @@ -549,6 +553,10 @@ AuditStrategy getAuditStrategy() { return auditStrategy; } + ClassLoaderService getClassLoaderService() { + return classLoaderService; + } + AuditEntityNameRegister getAuditEntityNameRegister() { return auditEntityNameRegister; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditTableData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditTableData.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditTableData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditTableData.java index 2e21896d3c..3d68cfcd2b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditTableData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/AuditTableData.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/BasicMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/BasicMetadataGenerator.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/BasicMetadataGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/BasicMetadataGenerator.java index d793d8bc7b..62cdf89678 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/BasicMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/BasicMetadataGenerator.java @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; import java.util.Properties; import org.dom4j.Element; -import org.hibernate.envers.configuration.metadata.reader.PropertyAuditingData; -import org.hibernate.envers.entities.mapper.SimpleMapperBuilder; +import org.hibernate.envers.configuration.internal.metadata.reader.PropertyAuditingData; +import org.hibernate.envers.internal.entities.mapper.SimpleMapperBuilder; import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Value; import org.hibernate.type.BasicType; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataGenerator.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataGenerator.java index e10964cff2..ef2f1ccfd5 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/CollectionMetadataGenerator.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; import java.util.ArrayList; import java.util.HashMap; @@ -41,45 +41,46 @@ import org.hibernate.annotations.common.reflection.ReflectionManager; import org.hibernate.envers.ModificationStore; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.configuration.metadata.reader.AuditedPropertiesReader; -import org.hibernate.envers.configuration.metadata.reader.ComponentAuditedPropertiesReader; -import org.hibernate.envers.configuration.metadata.reader.ComponentAuditingData; -import org.hibernate.envers.configuration.metadata.reader.PropertyAuditingData; -import org.hibernate.envers.entities.EntityConfiguration; -import org.hibernate.envers.entities.IdMappingData; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.entities.mapper.CompositeMapperBuilder; -import org.hibernate.envers.entities.mapper.MultiPropertyMapper; -import org.hibernate.envers.entities.mapper.PropertyMapper; -import org.hibernate.envers.entities.mapper.SinglePropertyMapper; -import org.hibernate.envers.entities.mapper.id.IdMapper; -import org.hibernate.envers.entities.mapper.relation.BasicCollectionMapper; -import org.hibernate.envers.entities.mapper.relation.CommonCollectionMapperData; -import org.hibernate.envers.entities.mapper.relation.ListCollectionMapper; -import org.hibernate.envers.entities.mapper.relation.MapCollectionMapper; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.entities.mapper.relation.SortedMapCollectionMapper; -import org.hibernate.envers.entities.mapper.relation.SortedSetCollectionMapper; -import org.hibernate.envers.entities.mapper.relation.ToOneIdMapper; -import org.hibernate.envers.entities.mapper.relation.component.MiddleDummyComponentMapper; -import org.hibernate.envers.entities.mapper.relation.component.MiddleEmbeddableComponentMapper; -import org.hibernate.envers.entities.mapper.relation.component.MiddleMapKeyIdComponentMapper; -import org.hibernate.envers.entities.mapper.relation.component.MiddleMapKeyPropertyComponentMapper; -import org.hibernate.envers.entities.mapper.relation.component.MiddleRelatedComponentMapper; -import org.hibernate.envers.entities.mapper.relation.component.MiddleSimpleComponentMapper; -import org.hibernate.envers.entities.mapper.relation.component.MiddleStraightComponentMapper; -import org.hibernate.envers.entities.mapper.relation.lazy.proxy.ListProxy; -import org.hibernate.envers.entities.mapper.relation.lazy.proxy.MapProxy; -import org.hibernate.envers.entities.mapper.relation.lazy.proxy.SetProxy; -import org.hibernate.envers.entities.mapper.relation.lazy.proxy.SortedMapProxy; -import org.hibernate.envers.entities.mapper.relation.lazy.proxy.SortedSetProxy; -import org.hibernate.envers.entities.mapper.relation.query.OneAuditEntityQueryGenerator; -import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.configuration.internal.metadata.reader.AuditedPropertiesReader; +import org.hibernate.envers.configuration.internal.metadata.reader.ComponentAuditedPropertiesReader; +import org.hibernate.envers.configuration.internal.metadata.reader.ComponentAuditingData; +import org.hibernate.envers.configuration.internal.metadata.reader.PropertyAuditingData; import org.hibernate.envers.internal.EnversMessageLogger; -import org.hibernate.envers.tools.MappingTools; -import org.hibernate.envers.tools.StringTools; -import org.hibernate.envers.tools.Tools; +import org.hibernate.envers.internal.entities.EntityConfiguration; +import org.hibernate.envers.internal.entities.IdMappingData; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.entities.mapper.CompositeMapperBuilder; +import org.hibernate.envers.internal.entities.mapper.MultiPropertyMapper; +import org.hibernate.envers.internal.entities.mapper.PropertyMapper; +import org.hibernate.envers.internal.entities.mapper.SinglePropertyMapper; +import org.hibernate.envers.internal.entities.mapper.id.IdMapper; +import org.hibernate.envers.internal.entities.mapper.relation.BasicCollectionMapper; +import org.hibernate.envers.internal.entities.mapper.relation.CommonCollectionMapperData; +import org.hibernate.envers.internal.entities.mapper.relation.ListCollectionMapper; +import org.hibernate.envers.internal.entities.mapper.relation.MapCollectionMapper; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.entities.mapper.relation.SortedMapCollectionMapper; +import org.hibernate.envers.internal.entities.mapper.relation.SortedSetCollectionMapper; +import org.hibernate.envers.internal.entities.mapper.relation.ToOneIdMapper; +import org.hibernate.envers.internal.entities.mapper.relation.component.MiddleDummyComponentMapper; +import org.hibernate.envers.internal.entities.mapper.relation.component.MiddleEmbeddableComponentMapper; +import org.hibernate.envers.internal.entities.mapper.relation.component.MiddleMapKeyIdComponentMapper; +import org.hibernate.envers.internal.entities.mapper.relation.component.MiddleMapKeyPropertyComponentMapper; +import org.hibernate.envers.internal.entities.mapper.relation.component.MiddleRelatedComponentMapper; +import org.hibernate.envers.internal.entities.mapper.relation.component.MiddleSimpleComponentMapper; +import org.hibernate.envers.internal.entities.mapper.relation.component.MiddleStraightComponentMapper; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy.ListProxy; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy.MapProxy; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy.SetProxy; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy.SortedMapProxy; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy.SortedSetProxy; +import org.hibernate.envers.internal.entities.mapper.relation.query.OneAuditEntityQueryGenerator; +import org.hibernate.envers.internal.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.internal.tools.MappingTools; +import org.hibernate.envers.internal.tools.ReflectionTools; +import org.hibernate.envers.internal.tools.StringTools; +import org.hibernate.envers.internal.tools.Tools; import org.hibernate.mapping.Collection; import org.hibernate.mapping.Component; import org.hibernate.mapping.IndexedCollection; @@ -125,8 +126,7 @@ public final class CollectionMetadataGenerator { /** * @param mainGenerator Main generator, giving access to configuration and the basic mapper. * @param propertyValue Value of the collection, as mapped by Hibernate. - * @param currentMapper Mapper, to which the appropriate {@link org.hibernate.envers.entities.mapper.PropertyMapper} - * will be added. + * @param currentMapper Mapper, to which the appropriate {@link PropertyMapper} will be added. * @param referencingEntityName Name of the entity that owns this collection. * @param xmlMappingData In case this collection requires a middle table, additional mapping documents will * be created using this object. @@ -474,7 +474,8 @@ private MiddleComponentData addValueToMiddleTable(Value value, Element xmlMappin } else if ( type instanceof ComponentType ) { // Collection of embeddable elements. final Component component = (Component) value; - final MiddleEmbeddableComponentMapper componentMapper = new MiddleEmbeddableComponentMapper( new MultiPropertyMapper(), component.getComponentClassName() ); + final Class componentClass = ReflectionTools.loadClass( component.getComponentClassName(), mainGenerator.getClassLoaderService() ); + final MiddleEmbeddableComponentMapper componentMapper = new MiddleEmbeddableComponentMapper( new MultiPropertyMapper(), componentClass ); final Element parentXmlMapping = xmlMapping.getParent(); final ComponentAuditingData auditData = new ComponentAuditingData(); diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ComponentMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java similarity index 71% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ComponentMetadataGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java index 9f0d62525d..b1efd5c803 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ComponentMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ComponentMetadataGenerator.java @@ -1,11 +1,13 @@ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; + import java.util.Iterator; import org.dom4j.Element; -import org.hibernate.envers.configuration.metadata.reader.ComponentAuditingData; -import org.hibernate.envers.configuration.metadata.reader.PropertyAuditingData; -import org.hibernate.envers.entities.mapper.CompositeMapperBuilder; +import org.hibernate.envers.configuration.internal.metadata.reader.ComponentAuditingData; +import org.hibernate.envers.configuration.internal.metadata.reader.PropertyAuditingData; +import org.hibernate.envers.internal.entities.mapper.CompositeMapperBuilder; +import org.hibernate.envers.internal.tools.ReflectionTools; import org.hibernate.mapping.Component; import org.hibernate.mapping.Property; import org.hibernate.mapping.Value; @@ -27,8 +29,8 @@ public void addComponent(Element parent, PropertyAuditingData propertyAuditingDa EntityXmlMappingData xmlMappingData, boolean firstPass) { Component prop_component = (Component) value; - CompositeMapperBuilder componentMapper = mapper.addComponent(propertyAuditingData.getPropertyData(), - prop_component.getComponentClassName()); + Class componentClass = ReflectionTools.loadClass( prop_component.getComponentClassName(), mainGenerator.getClassLoaderService() ); + CompositeMapperBuilder componentMapper = mapper.addComponent( propertyAuditingData.getPropertyData(), componentClass ); // The property auditing data must be for a component. ComponentAuditingData componentAuditingData = (ComponentAuditingData) propertyAuditingData; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/EntityXmlMappingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/EntityXmlMappingData.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/EntityXmlMappingData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/EntityXmlMappingData.java index 7982a0ceb0..7584d16643 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/EntityXmlMappingData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/EntityXmlMappingData.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java similarity index 85% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java index 4e580db659..d0064390cc 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/IdMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/IdMetadataGenerator.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; import java.util.Iterator; import org.dom4j.Element; @@ -30,14 +30,15 @@ import org.hibernate.MappingException; import org.hibernate.envers.ModificationStore; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.configuration.metadata.reader.PropertyAuditingData; -import org.hibernate.envers.entities.IdMappingData; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.entities.mapper.SimpleMapperBuilder; -import org.hibernate.envers.entities.mapper.id.EmbeddedIdMapper; -import org.hibernate.envers.entities.mapper.id.MultipleIdMapper; -import org.hibernate.envers.entities.mapper.id.SimpleIdMapperBuilder; -import org.hibernate.envers.entities.mapper.id.SingleIdMapper; +import org.hibernate.envers.configuration.internal.metadata.reader.PropertyAuditingData; +import org.hibernate.envers.internal.entities.IdMappingData; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.entities.mapper.SimpleMapperBuilder; +import org.hibernate.envers.internal.entities.mapper.id.EmbeddedIdMapper; +import org.hibernate.envers.internal.entities.mapper.id.MultipleIdMapper; +import org.hibernate.envers.internal.entities.mapper.id.SimpleIdMapperBuilder; +import org.hibernate.envers.internal.entities.mapper.id.SingleIdMapper; +import org.hibernate.envers.internal.tools.ReflectionTools; import org.hibernate.mapping.Component; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; @@ -108,7 +109,10 @@ IdMappingData addId(PersistentClass pc, boolean audited) { if (id_mapper != null) { // Multiple id - mapper = new MultipleIdMapper(((Component) pc.getIdentifier()).getComponentClassName()); + Class componentClass = ReflectionTools.loadClass( + ( (Component) pc.getIdentifier() ).getComponentClassName(), mainGenerator.getClassLoaderService() + ); + mapper = new MultipleIdMapper( componentClass ); if (!addIdProperties(rel_id_mapping, (Iterator) id_mapper.getPropertyIterator(), mapper, false, audited)) { return null; } @@ -121,8 +125,10 @@ IdMappingData addId(PersistentClass pc, boolean audited) { // Embedded id Component id_component = (Component) id_prop.getValue(); - - mapper = new EmbeddedIdMapper(getIdPropertyData(id_prop), id_component.getComponentClassName()); + Class embeddableClass = ReflectionTools.loadClass( + id_component.getComponentClassName(), mainGenerator.getClassLoaderService() + ); + mapper = new EmbeddedIdMapper( getIdPropertyData(id_prop), embeddableClass ); if (!addIdProperties(rel_id_mapping, (Iterator) id_component.getPropertyIterator(), mapper, false, audited)) { return null; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/InheritanceType.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/InheritanceType.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/InheritanceType.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/InheritanceType.java index b29b899b0d..87cb5a7f0c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/InheritanceType.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/InheritanceType.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; import org.hibernate.MappingException; import org.hibernate.mapping.JoinedSubclass; import org.hibernate.mapping.PersistentClass; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MetadataTools.java similarity index 99% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MetadataTools.java index c0e3315335..4b2c1058d8 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/MetadataTools.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/MetadataTools.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; import java.util.Iterator; import javax.persistence.JoinColumn; @@ -29,7 +29,7 @@ import org.dom4j.Document; import org.dom4j.Element; -import org.hibernate.envers.tools.StringTools; +import org.hibernate.envers.internal.tools.StringTools; import org.hibernate.mapping.Column; import org.hibernate.mapping.Formula; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/QueryGeneratorBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/QueryGeneratorBuilder.java similarity index 83% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/QueryGeneratorBuilder.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/QueryGeneratorBuilder.java index bc210a0af9..4312097d19 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/QueryGeneratorBuilder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/QueryGeneratorBuilder.java @@ -21,20 +21,20 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; import java.util.ArrayList; import java.util.List; import org.hibernate.MappingException; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.configuration.GlobalConfiguration; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.entities.mapper.relation.query.OneEntityQueryGenerator; -import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; -import org.hibernate.envers.entities.mapper.relation.query.ThreeEntityQueryGenerator; -import org.hibernate.envers.entities.mapper.relation.query.TwoEntityOneAuditedQueryGenerator; -import org.hibernate.envers.entities.mapper.relation.query.TwoEntityQueryGenerator; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.entities.mapper.relation.query.OneEntityQueryGenerator; +import org.hibernate.envers.internal.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.internal.entities.mapper.relation.query.ThreeEntityQueryGenerator; +import org.hibernate.envers.internal.entities.mapper.relation.query.TwoEntityOneAuditedQueryGenerator; +import org.hibernate.envers.internal.entities.mapper.relation.query.TwoEntityQueryGenerator; import org.hibernate.envers.strategy.AuditStrategy; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ToOneRelationMetadataGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ToOneRelationMetadataGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java index 9a8501335e..2e644d8e11 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/ToOneRelationMetadataGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/ToOneRelationMetadataGenerator.java @@ -21,20 +21,20 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata; +package org.hibernate.envers.configuration.internal.metadata; import org.dom4j.Element; import org.hibernate.MappingException; -import org.hibernate.envers.configuration.metadata.reader.PropertyAuditingData; -import org.hibernate.envers.entities.EntityConfiguration; -import org.hibernate.envers.entities.IdMappingData; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.entities.mapper.CompositeMapperBuilder; -import org.hibernate.envers.entities.mapper.id.IdMapper; -import org.hibernate.envers.entities.mapper.relation.OneToOneNotOwningMapper; -import org.hibernate.envers.entities.mapper.relation.OneToOnePrimaryKeyJoinColumnMapper; -import org.hibernate.envers.entities.mapper.relation.ToOneIdMapper; -import org.hibernate.envers.tools.MappingTools; +import org.hibernate.envers.configuration.internal.metadata.reader.PropertyAuditingData; +import org.hibernate.envers.internal.entities.EntityConfiguration; +import org.hibernate.envers.internal.entities.IdMappingData; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.entities.mapper.CompositeMapperBuilder; +import org.hibernate.envers.internal.entities.mapper.id.IdMapper; +import org.hibernate.envers.internal.entities.mapper.relation.OneToOneNotOwningMapper; +import org.hibernate.envers.internal.entities.mapper.relation.OneToOnePrimaryKeyJoinColumnMapper; +import org.hibernate.envers.internal.entities.mapper.relation.ToOneIdMapper; +import org.hibernate.envers.internal.tools.MappingTools; import org.hibernate.mapping.OneToOne; import org.hibernate.mapping.ToOne; import org.hibernate.mapping.Value; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AnnotationsMetadataReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AnnotationsMetadataReader.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AnnotationsMetadataReader.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AnnotationsMetadataReader.java index ba384226f3..0a3b5d512e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AnnotationsMetadataReader.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AnnotationsMetadataReader.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata.reader; +package org.hibernate.envers.configuration.internal.metadata.reader; import java.lang.annotation.Annotation; import java.util.Iterator; @@ -33,7 +33,7 @@ import org.hibernate.envers.ModificationStore; import org.hibernate.envers.SecondaryAuditTable; import org.hibernate.envers.SecondaryAuditTables; -import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesHolder.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesHolder.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesHolder.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesHolder.java index dc91cb6c8f..5cd511c74b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesHolder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesHolder.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.configuration.metadata.reader; +package org.hibernate.envers.configuration.internal.metadata.reader; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java similarity index 95% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesReader.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java index 96c1e21afd..6c54447d1c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/AuditedPropertiesReader.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java @@ -1,4 +1,5 @@ -package org.hibernate.envers.configuration.metadata.reader; +package org.hibernate.envers.configuration.internal.metadata.reader; + import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.Collections; @@ -23,24 +24,22 @@ import org.hibernate.envers.ModificationStore; import org.hibernate.envers.NotAudited; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.configuration.GlobalConfiguration; -import org.hibernate.envers.configuration.metadata.MetadataTools; -import org.hibernate.envers.tools.MappingTools; -import org.hibernate.envers.tools.StringTools; -import org.hibernate.envers.tools.Tools; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; +import org.hibernate.envers.configuration.internal.metadata.MetadataTools; +import org.hibernate.envers.internal.tools.MappingTools; +import org.hibernate.envers.internal.tools.ReflectionTools; +import org.hibernate.envers.internal.tools.StringTools; import org.hibernate.mapping.Component; import org.hibernate.mapping.Property; import org.hibernate.mapping.Value; -import static org.hibernate.envers.tools.Tools.newHashMap; -import static org.hibernate.envers.tools.Tools.newHashSet; +import static org.hibernate.envers.internal.tools.Tools.newHashMap; +import static org.hibernate.envers.internal.tools.Tools.newHashSet; /** - * Reads persistent properties form a - * {@link org.hibernate.envers.configuration.metadata.reader.PersistentPropertiesSource} - * and adds the ones that are audited to a - * {@link org.hibernate.envers.configuration.metadata.reader.AuditedPropertiesHolder}, - * filling all the auditing data. + * Reads persistent properties form a {@link PersistentPropertiesSource} and adds the ones that are audited to a + * {@link AuditedPropertiesHolder}, filling all the auditing data. + * * @author Adam Warski (adam at warski dot org) * @author Erik-Berndt Scheper * @author Hern&aacut;n Chanfreau @@ -201,7 +200,7 @@ private void checkSuperclass(XClass child, XClass parent) { * @return Property object. */ private XProperty getProperty(XClass clazz, String propertyName) { - XProperty property = Tools.getProperty(clazz, propertyName); + XProperty property = ReflectionTools.getProperty(clazz, propertyName); if (property == null) { throw new MappingException("Property '" + propertyName + "' not found in class " + clazz.getName() + ". " + "Please revise Envers annotations applied to class " + persistentPropertiesSource.getXClass() + "."); @@ -478,7 +477,7 @@ private void addPropertyJoinTables(XProperty property, PropertyAuditingData prop } /*** - * Add the {@link org.hibernate.envers.AuditOverride} annotations. + * Add the {@link AuditOverride} annotations. * * @param property the property being processed * @param propertyData the Envers auditing data for this property @@ -495,10 +494,10 @@ private void addPropertyAuditingOverrides(XProperty property, PropertyAuditingDa } /** - * Process the {@link org.hibernate.envers.AuditOverride} annotations for this property. + * Process the {@link AuditOverride} annotations for this property. * * @param property - * the property for which the {@link org.hibernate.envers.AuditOverride} + * the property for which the {@link AuditOverride} * annotations are being processed * @param propertyData * the Envers auditing data for this property diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ClassAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java similarity index 95% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ClassAuditingData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java index 53b13f5010..785c11fd75 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ClassAuditingData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ClassAuditingData.java @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration.metadata.reader; +package org.hibernate.envers.configuration.internal.metadata.reader; import java.util.Map; import org.hibernate.envers.AuditTable; -import static org.hibernate.envers.tools.Tools.newHashMap; +import static org.hibernate.envers.internal.tools.Tools.newHashMap; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ComponentAuditedPropertiesReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ComponentAuditedPropertiesReader.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java index bcf9b56b37..3e970cfe78 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ComponentAuditedPropertiesReader.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditedPropertiesReader.java @@ -1,9 +1,9 @@ -package org.hibernate.envers.configuration.metadata.reader; +package org.hibernate.envers.configuration.internal.metadata.reader; import org.hibernate.annotations.common.reflection.ReflectionManager; import org.hibernate.annotations.common.reflection.XProperty; import org.hibernate.envers.Audited; import org.hibernate.envers.ModificationStore; -import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; /** * Reads the audited properties for components. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ComponentAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditingData.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ComponentAuditingData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditingData.java index b6108477b5..60c3ff2299 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/ComponentAuditingData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/ComponentAuditingData.java @@ -22,11 +22,11 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.envers.configuration.metadata.reader; +package org.hibernate.envers.configuration.internal.metadata.reader; import java.util.Map; import java.util.Set; -import static org.hibernate.envers.tools.Tools.newHashMap; +import static org.hibernate.envers.internal.tools.Tools.newHashMap; /** * Audit mapping meta-data for component. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/PersistentPropertiesSource.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PersistentPropertiesSource.java similarity index 85% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/PersistentPropertiesSource.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PersistentPropertiesSource.java index 8a92d46bf5..864d5382b7 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/PersistentPropertiesSource.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PersistentPropertiesSource.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.configuration.metadata.reader; +package org.hibernate.envers.configuration.internal.metadata.reader; import java.util.Iterator; import org.hibernate.annotations.common.reflection.XClass; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/PropertyAuditingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/PropertyAuditingData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java index 68ccce4243..500ad95403 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/reader/PropertyAuditingData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/PropertyAuditingData.java @@ -22,7 +22,7 @@ * Boston, MA 02110-1301 USA * */ -package org.hibernate.envers.configuration.metadata.reader; +package org.hibernate.envers.configuration.internal.metadata.reader; import java.util.ArrayList; import java.util.List; @@ -31,7 +31,7 @@ import org.hibernate.envers.AuditOverrides; import org.hibernate.envers.ModificationStore; import org.hibernate.envers.RelationTargetAuditMode; -import org.hibernate.envers.entities.PropertyData; +import org.hibernate.envers.internal.entities.PropertyData; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/spi/AuditConfiguration.java similarity index 80% rename from hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java rename to hibernate-envers/src/main/java/org/hibernate/envers/configuration/spi/AuditConfiguration.java index eb705e47cc..ccf294c410 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/configuration/AuditConfiguration.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/configuration/spi/AuditConfiguration.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.configuration; +package org.hibernate.envers.configuration.spi; import java.util.Map; import java.util.Properties; @@ -29,19 +29,24 @@ import org.hibernate.MappingException; import org.hibernate.annotations.common.reflection.ReflectionManager; +import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.cfg.Configuration; -import org.hibernate.envers.entities.EntitiesConfigurations; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.revisioninfo.ModifiedEntityNamesReader; -import org.hibernate.envers.revisioninfo.RevisionInfoNumberReader; -import org.hibernate.envers.revisioninfo.RevisionInfoQueryCreator; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.internal.EntitiesConfigurator; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; +import org.hibernate.envers.configuration.internal.RevisionInfoConfiguration; +import org.hibernate.envers.configuration.internal.RevisionInfoConfigurationResult; +import org.hibernate.envers.internal.entities.EntitiesConfigurations; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.revisioninfo.ModifiedEntityNamesReader; +import org.hibernate.envers.internal.revisioninfo.RevisionInfoNumberReader; +import org.hibernate.envers.internal.revisioninfo.RevisionInfoQueryCreator; +import org.hibernate.envers.internal.synchronization.AuditProcessManager; +import org.hibernate.envers.internal.tools.ReflectionTools; import org.hibernate.envers.strategy.AuditStrategy; import org.hibernate.envers.strategy.ValidityAuditStrategy; -import org.hibernate.envers.synchronization.AuditProcessManager; -import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.property.Getter; -import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; /** * @author Adam Warski (adam at warski dot org) @@ -90,6 +95,10 @@ public AuditStrategy getAuditStrategy() { return auditStrategy; } + public ClassLoaderService getClassLoaderService() { + return classLoaderService; + } + public AuditConfiguration(Configuration cfg) { this( cfg, null ); } @@ -98,7 +107,7 @@ public AuditConfiguration(Configuration cfg, ClassLoaderService classLoaderServi Properties properties = cfg.getProperties(); ReflectionManager reflectionManager = cfg.getReflectionManager(); - globalCfg = new GlobalConfiguration( properties ); + globalCfg = new GlobalConfiguration( properties, classLoaderService ); RevisionInfoConfiguration revInfoCfg = new RevisionInfoConfiguration( globalCfg ); RevisionInfoConfigurationResult revInfoCfgResult = revInfoCfg.configure( cfg, reflectionManager ); auditEntCfg = new AuditEntitiesConfiguration( properties, revInfoCfgResult.getRevisionInfoEntityName() ); @@ -112,7 +121,7 @@ public AuditConfiguration(Configuration cfg, ClassLoaderService classLoaderServi revInfoCfgResult.getRevisionInfoTimestampData() ); entCfg = new EntitiesConfigurator().configure( - cfg, reflectionManager, globalCfg, auditEntCfg, auditStrategy, + cfg, reflectionManager, globalCfg, auditEntCfg, auditStrategy, classLoaderService, revInfoCfgResult.getRevisionInfoXmlMapping(), revInfoCfgResult.getRevisionInfoRelationMapping() ); } @@ -121,15 +130,7 @@ private AuditStrategy initializeAuditStrategy(Class revisionInfoClass, Proper AuditStrategy strategy; try { - - Class auditStrategyClass = null; - if ( classLoaderService != null ) { - auditStrategyClass = classLoaderService.classForName( auditEntCfg.getAuditStrategyName() ); - } - else { - auditStrategyClass = ReflectHelper.classForName( auditEntCfg.getAuditStrategyName() ); - } - + Class auditStrategyClass = ReflectionTools.loadClass( auditEntCfg.getAuditStrategyName(), classLoaderService ); strategy = (AuditStrategy) ReflectHelper.getDefaultConstructor(auditStrategyClass).newInstance(); } catch ( Exception e ) { @@ -150,8 +151,7 @@ private AuditStrategy initializeAuditStrategy(Class revisionInfoClass, Proper // - private static Map cfgs - = new WeakHashMap(); + private static Map cfgs = new WeakHashMap(); public synchronized static AuditConfiguration getFor(Configuration cfg) { return getFor( cfg, null ); diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java index eb65728c88..41a78fdebc 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java @@ -23,18 +23,18 @@ */ package org.hibernate.envers.enhanced; -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Parameter; -import org.hibernate.envers.RevisionNumber; -import org.hibernate.envers.RevisionTimestamp; - +import java.io.Serializable; +import java.text.DateFormat; +import java.util.Date; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.MappedSuperclass; import javax.persistence.Transient; -import java.io.Serializable; -import java.text.DateFormat; -import java.util.Date; + +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Parameter; +import org.hibernate.envers.RevisionNumber; +import org.hibernate.envers.RevisionTimestamp; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java index fd02295ea4..889cd723cb 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java @@ -23,14 +23,19 @@ */ package org.hibernate.envers.enhanced; +import java.util.HashSet; +import java.util.Set; +import javax.persistence.Column; +import javax.persistence.ElementCollection; +import javax.persistence.FetchType; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.MappedSuperclass; + import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.envers.ModifiedEntityNames; -import javax.persistence.*; -import java.util.HashSet; -import java.util.Set; - /** * Extension of standard {@link SequenceIdRevisionEntity} that allows tracking entity names changed in each revision. * This revision entity is implicitly used when {@code org.hibernate.envers.track_entities_changed_in_revision} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversCollectionEventListener.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversCollectionEventListener.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversCollectionEventListener.java rename to hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversCollectionEventListener.java index 2cbd8a0553..b8fe96286f 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversCollectionEventListener.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversCollectionEventListener.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.event; +package org.hibernate.envers.event.spi; import java.io.Serializable; import java.util.List; @@ -30,16 +30,16 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.CollectionEntry; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.EntityConfiguration; -import org.hibernate.envers.entities.RelationDescription; -import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; -import org.hibernate.envers.entities.mapper.id.IdMapper; -import org.hibernate.envers.synchronization.AuditProcess; -import org.hibernate.envers.synchronization.work.AuditWorkUnit; -import org.hibernate.envers.synchronization.work.CollectionChangeWorkUnit; -import org.hibernate.envers.synchronization.work.FakeBidirectionalRelationWorkUnit; -import org.hibernate.envers.synchronization.work.PersistentCollectionChangeWorkUnit; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.EntityConfiguration; +import org.hibernate.envers.internal.entities.RelationDescription; +import org.hibernate.envers.internal.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.internal.entities.mapper.id.IdMapper; +import org.hibernate.envers.internal.synchronization.AuditProcess; +import org.hibernate.envers.internal.synchronization.work.AuditWorkUnit; +import org.hibernate.envers.internal.synchronization.work.CollectionChangeWorkUnit; +import org.hibernate.envers.internal.synchronization.work.FakeBidirectionalRelationWorkUnit; +import org.hibernate.envers.internal.synchronization.work.PersistentCollectionChangeWorkUnit; import org.hibernate.event.spi.AbstractCollectionEvent; import org.hibernate.persister.collection.AbstractCollectionPersister; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversEventListener.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversEventListener.java similarity index 88% rename from hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversEventListener.java rename to hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversEventListener.java index 4443e5394d..6e4e4e2408 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversEventListener.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/BaseEnversEventListener.java @@ -21,20 +21,20 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.event; +package org.hibernate.envers.event.spi; import java.io.Serializable; import java.util.Set; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.RelationDescription; -import org.hibernate.envers.entities.RelationType; -import org.hibernate.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.synchronization.AuditProcess; -import org.hibernate.envers.synchronization.work.CollectionChangeWorkUnit; -import org.hibernate.envers.tools.Tools; +import org.hibernate.envers.internal.entities.RelationDescription; +import org.hibernate.envers.internal.entities.RelationType; +import org.hibernate.envers.internal.entities.mapper.id.IdMapper; +import org.hibernate.envers.internal.synchronization.AuditProcess; +import org.hibernate.envers.internal.synchronization.work.CollectionChangeWorkUnit; +import org.hibernate.envers.internal.tools.EntityTools; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.proxy.HibernateProxy; @@ -84,7 +84,7 @@ protected final void generateBidirectionalCollectionChangeWorkUnits( Object oldValue = oldState == null ? null : oldState[i]; Object newValue = newState == null ? null : newState[i]; - if (!Tools.entitiesEqual( session, relDesc.getToEntityName(), oldValue, newValue )) { + if (!EntityTools.entitiesEqual( session, relDesc.getToEntityName(), oldValue, newValue )) { // We have to generate changes both in the old collection (size decreses) and new collection // (size increases). if (newValue != null) { @@ -111,7 +111,7 @@ private void addCollectionChangeWorkUnit(AuditProcess auditProcess, SessionImple toEntityName = session.bestGuessEntityName(value); id = hibernateProxy.getHibernateLazyInitializer().getIdentifier(); // We've got to initialize the object from the proxy to later read its state. - value = Tools.getTargetFromProxy(session.getFactory(), hibernateProxy); + value = EntityTools.getTargetFromProxy(session.getFactory(), hibernateProxy); } else { toEntityName = session.guessEntityName(value); diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversIntegrator.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversIntegrator.java index 65f84b1df0..36abe0f220 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversIntegrator.java @@ -21,20 +21,20 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.event; +package org.hibernate.envers.event.spi; import org.jboss.logging.Logger; +import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.cfg.Configuration; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; import org.hibernate.integrator.spi.Integrator; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.metamodel.source.MetadataImplementor; -import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.service.spi.SessionFactoryServiceRegistry; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversListener.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListener.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/event/EnversListener.java rename to hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListener.java index 0a2ec6d215..9cd8086635 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversListener.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListener.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.event; +package org.hibernate.envers.event.spi; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; /** * Marker interface for Envers listeners for duplication handling. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversListenerDuplicationStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListenerDuplicationStrategy.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/event/EnversListenerDuplicationStrategy.java rename to hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListenerDuplicationStrategy.java index ae46616d89..d5442adc83 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversListenerDuplicationStrategy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversListenerDuplicationStrategy.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.event; +package org.hibernate.envers.event.spi; import org.hibernate.event.service.spi.DuplicationStrategy; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostCollectionRecreateEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java similarity index 94% rename from hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostCollectionRecreateEventListenerImpl.java rename to hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java index d4888da441..64c615dc4b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostCollectionRecreateEventListenerImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostCollectionRecreateEventListenerImpl.java @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.event; +package org.hibernate.envers.event.spi; import org.hibernate.engine.spi.CollectionEntry; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.event.spi.PostCollectionRecreateEvent; import org.hibernate.event.spi.PostCollectionRecreateEventListener; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostDeleteEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostDeleteEventListenerImpl.java similarity index 89% rename from hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostDeleteEventListenerImpl.java rename to hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostDeleteEventListenerImpl.java index 9a80ae803c..9782e25d79 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostDeleteEventListenerImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostDeleteEventListenerImpl.java @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.event; +package org.hibernate.envers.event.spi; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.synchronization.AuditProcess; -import org.hibernate.envers.synchronization.work.AuditWorkUnit; -import org.hibernate.envers.synchronization.work.DelWorkUnit; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.synchronization.AuditProcess; +import org.hibernate.envers.internal.synchronization.work.AuditWorkUnit; +import org.hibernate.envers.internal.synchronization.work.DelWorkUnit; import org.hibernate.event.spi.PostDeleteEvent; import org.hibernate.event.spi.PostDeleteEventListener; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostInsertEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostInsertEventListenerImpl.java similarity index 89% rename from hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostInsertEventListenerImpl.java rename to hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostInsertEventListenerImpl.java index 7819b5b549..e0e8d48b2c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostInsertEventListenerImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostInsertEventListenerImpl.java @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.event; +package org.hibernate.envers.event.spi; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.synchronization.AuditProcess; -import org.hibernate.envers.synchronization.work.AddWorkUnit; -import org.hibernate.envers.synchronization.work.AuditWorkUnit; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.synchronization.AuditProcess; +import org.hibernate.envers.internal.synchronization.work.AddWorkUnit; +import org.hibernate.envers.internal.synchronization.work.AuditWorkUnit; import org.hibernate.event.spi.PostInsertEvent; import org.hibernate.event.spi.PostInsertEventListener; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostUpdateEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostUpdateEventListenerImpl.java similarity index 91% rename from hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostUpdateEventListenerImpl.java rename to hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostUpdateEventListenerImpl.java index d14819b3e4..ea399a5c63 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostUpdateEventListenerImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPostUpdateEventListenerImpl.java @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.event; +package org.hibernate.envers.event.spi; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.synchronization.AuditProcess; -import org.hibernate.envers.synchronization.work.AuditWorkUnit; -import org.hibernate.envers.synchronization.work.ModWorkUnit; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.synchronization.AuditProcess; +import org.hibernate.envers.internal.synchronization.work.AuditWorkUnit; +import org.hibernate.envers.internal.synchronization.work.ModWorkUnit; import org.hibernate.event.spi.PostUpdateEvent; import org.hibernate.event.spi.PostUpdateEventListener; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPreCollectionRemoveEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java similarity index 95% rename from hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPreCollectionRemoveEventListenerImpl.java rename to hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java index 84ed830874..aa4204f99a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPreCollectionRemoveEventListenerImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionRemoveEventListenerImpl.java @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.event; +package org.hibernate.envers.event.spi; import java.io.Serializable; import org.hibernate.engine.spi.CollectionEntry; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.event.spi.PreCollectionRemoveEvent; import org.hibernate.event.spi.PreCollectionRemoveEventListener; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPreCollectionUpdateEventListenerImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java similarity index 94% rename from hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPreCollectionUpdateEventListenerImpl.java rename to hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java index f494724956..a088c2c891 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPreCollectionUpdateEventListenerImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversPreCollectionUpdateEventListenerImpl.java @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.event; +package org.hibernate.envers.event.spi; import org.hibernate.engine.spi.CollectionEntry; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.event.spi.PreCollectionUpdateEvent; import org.hibernate.event.spi.PreCollectionUpdateEventListener; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/EntitiesConfigurations.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntitiesConfigurations.java similarity index 99% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/EntitiesConfigurations.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntitiesConfigurations.java index 93a664e0af..0221e5229c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/EntitiesConfigurations.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntitiesConfigurations.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities; +package org.hibernate.envers.internal.entities; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java similarity index 95% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java index 97e5a3606c..ba5a59e81d 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityConfiguration.java @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities; +package org.hibernate.envers.internal.entities; import java.util.HashMap; import java.util.Map; -import org.hibernate.envers.entities.mapper.ExtendedPropertyMapper; -import org.hibernate.envers.entities.mapper.PropertyMapper; -import org.hibernate.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.internal.entities.mapper.ExtendedPropertyMapper; +import org.hibernate.envers.internal.entities.mapper.PropertyMapper; +import org.hibernate.envers.internal.entities.mapper.id.IdMapper; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/EntityInstantiator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java similarity index 91% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/EntityInstantiator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java index 39f8f414ca..cf9cf211cb 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/EntityInstantiator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/EntityInstantiator.java @@ -21,23 +21,24 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities; - -import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.id.IdMapper; -import org.hibernate.envers.entities.mapper.relation.lazy.ToOneDelegateSessionImplementor; -import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.internal.util.ReflectHelper; -import org.hibernate.proxy.HibernateProxy; -import org.hibernate.proxy.LazyInitializer; +package org.hibernate.envers.internal.entities; import java.io.Serializable; import java.util.Collection; import java.util.List; import java.util.Map; +import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.exception.AuditException; +import org.hibernate.envers.internal.entities.mapper.id.IdMapper; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.ToOneDelegateSessionImplementor; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.ReflectionTools; +import org.hibernate.internal.util.ReflectHelper; +import org.hibernate.proxy.HibernateProxy; +import org.hibernate.proxy.LazyInitializer; + /** * @author Adam Warski (adam at warski dot org) * @author Hernán Chanfreau @@ -96,7 +97,7 @@ public Object createInstanceFromVersionsEntity(String entityName, Map versionsEn entCfg = verCfg.getEntCfg().getNotVersionEntityConfiguration(entityName); } - Class cls = ReflectHelper.classForName(entCfg.getEntityClassName()); + Class cls = ReflectionTools.loadClass( entCfg.getEntityClassName(), verCfg.getClassLoaderService() ); ret = ReflectHelper.getDefaultConstructor(cls).newInstance(); } catch (Exception e) { throw new AuditException(e); @@ -128,13 +129,7 @@ private void replaceNonAuditIdProxies(Map versionsEntity, Number revision) { final Serializable entityId = initializer.getIdentifier(); if (verCfg.getEntCfg().isVersioned(entityName)) { final String entityClassName = verCfg.getEntCfg().get(entityName).getEntityClassName(); - Class entityClass; - try { - entityClass = ReflectHelper.classForName(entityClassName); - } - catch ( ClassNotFoundException e ) { - throw new AuditException( e ); - } + final Class entityClass = ReflectionTools.loadClass( entityClassName, verCfg.getClassLoaderService() ); final ToOneDelegateSessionImplementor delegate = new ToOneDelegateSessionImplementor( versionsReader, entityClass, entityId, revision, RevisionType.DEL.equals( versionsEntity.get( verCfg.getAuditEntCfg().getRevisionTypePropName() ) ), diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/IdMappingData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/IdMappingData.java similarity index 94% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/IdMappingData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/IdMappingData.java index ce1dd8671d..e554f28eeb 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/IdMappingData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/IdMappingData.java @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities; +package org.hibernate.envers.internal.entities; import org.dom4j.Element; -import org.hibernate.envers.entities.mapper.id.IdMapper; +import org.hibernate.envers.internal.entities.mapper.id.IdMapper; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/PropertyData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/PropertyData.java similarity index 98% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/PropertyData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/PropertyData.java index 672430d5e5..0494d2db7b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/PropertyData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/PropertyData.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities; +package org.hibernate.envers.internal.entities; import org.hibernate.envers.ModificationStore; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/RelationDescription.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationDescription.java similarity index 94% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/RelationDescription.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationDescription.java index ab0b12d241..b129500944 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/RelationDescription.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationDescription.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities; -import org.hibernate.envers.entities.mapper.PropertyMapper; -import org.hibernate.envers.entities.mapper.id.IdMapper; +package org.hibernate.envers.internal.entities; +import org.hibernate.envers.internal.entities.mapper.PropertyMapper; +import org.hibernate.envers.internal.entities.mapper.id.IdMapper; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/RelationType.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationType.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/RelationType.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationType.java index 93759b588f..449b4ecfd9 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/RelationType.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RelationType.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities; +package org.hibernate.envers.internal.entities; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/RevisionTypeType.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTypeType.java similarity index 98% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/RevisionTypeType.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTypeType.java index 2fcef4f29d..0580c804c2 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/RevisionTypeType.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/RevisionTypeType.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities; +package org.hibernate.envers.internal.entities; import java.io.Serializable; import java.sql.PreparedStatement; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java similarity index 89% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java index 045adf7813..52d0323998 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ComponentPropertyMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ComponentPropertyMapper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper; +package org.hibernate.envers.internal.entities.mapper; import java.io.Serializable; import java.util.HashMap; @@ -30,11 +30,11 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.PropertyData; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.ReflectionTools; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.property.Setter; @@ -45,20 +45,20 @@ public class ComponentPropertyMapper implements PropertyMapper, CompositeMapperBuilder { private final PropertyData propertyData; private final MultiPropertyMapper delegate; - private final String componentClassName; + private final Class componentClass; - public ComponentPropertyMapper(PropertyData propertyData, String componentClassName) { + public ComponentPropertyMapper(PropertyData propertyData, Class componentClass) { this.propertyData = propertyData; this.delegate = new MultiPropertyMapper(); - this.componentClassName = componentClassName; + this.componentClass = componentClass; } public void add(PropertyData propertyData) { delegate.add(propertyData); } - public CompositeMapperBuilder addComponent(PropertyData propertyData, String componentClassName) { - return delegate.addComponent(propertyData, componentClassName); + public CompositeMapperBuilder addComponent(PropertyData propertyData, Class componentClass) { + return delegate.addComponent(propertyData, componentClass); } public void addComposite(PropertyData propertyData, PropertyMapper propertyMapper) { @@ -120,8 +120,7 @@ public void mapToEntityFromMap(AuditConfiguration verCfg, Object obj, Map data, } else { // set the component try { - Object subObj = ReflectHelper.getDefaultConstructor( - ReflectHelper.classForName(componentClassName)).newInstance(); + Object subObj = ReflectHelper.getDefaultConstructor(componentClass).newInstance(); setter.set(obj, subObj, null); delegate.mapToEntityFromMap(verCfg, subObj, data, primaryKey, versionsReader, revision); } catch (Exception e) { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/CompositeMapperBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/CompositeMapperBuilder.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/CompositeMapperBuilder.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/CompositeMapperBuilder.java index 420c47fe90..c863249ea0 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/CompositeMapperBuilder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/CompositeMapperBuilder.java @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper; +package org.hibernate.envers.internal.entities.mapper; import java.util.Map; -import org.hibernate.envers.entities.PropertyData; +import org.hibernate.envers.internal.entities.PropertyData; /** * @author Adam Warski (adam at warski dot org) */ public interface CompositeMapperBuilder extends SimpleMapperBuilder { - public CompositeMapperBuilder addComponent(PropertyData propertyData, String componentClassName); + public CompositeMapperBuilder addComponent(PropertyData propertyData, Class componentClass); public void addComposite(PropertyData propertyData, PropertyMapper propertyMapper); public Map getProperties(); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ExtendedPropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ExtendedPropertyMapper.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ExtendedPropertyMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ExtendedPropertyMapper.java index a2644c74ac..a804087836 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/ExtendedPropertyMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/ExtendedPropertyMapper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper; +package org.hibernate.envers.internal.entities.mapper; import java.util.Map; import org.hibernate.engine.spi.SessionImplementor; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/MultiPropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiPropertyMapper.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/MultiPropertyMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiPropertyMapper.java index 018a4c90ed..cff9d7aff1 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/MultiPropertyMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/MultiPropertyMapper.java @@ -21,20 +21,21 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper; +package org.hibernate.envers.internal.entities.mapper; + import java.io.Serializable; import java.util.List; import java.util.Map; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.MappingTools; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.MappingTools; +import org.hibernate.envers.internal.tools.ReflectionTools; +import org.hibernate.envers.internal.tools.Tools; import org.hibernate.envers.tools.Pair; -import org.hibernate.envers.tools.Tools; -import org.hibernate.envers.tools.reflection.ReflectionTools; import org.hibernate.property.Getter; /** @@ -57,13 +58,13 @@ public void add(PropertyData propertyData) { propertyDatas.put(propertyData.getName(), propertyData); } - public CompositeMapperBuilder addComponent(PropertyData propertyData, String componentClassName) { + public CompositeMapperBuilder addComponent(PropertyData propertyData, Class componentClass) { if (properties.get(propertyData) != null) { // This is needed for second pass to work properly in the components mapper return (CompositeMapperBuilder) properties.get(propertyData); } - ComponentPropertyMapper componentMapperBuilder = new ComponentPropertyMapper(propertyData, componentClassName); + ComponentPropertyMapper componentMapperBuilder = new ComponentPropertyMapper(propertyData, componentClass); addComposite(propertyData, componentMapperBuilder); return componentMapperBuilder; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/PersistentCollectionChangeData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PersistentCollectionChangeData.java similarity index 98% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/PersistentCollectionChangeData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PersistentCollectionChangeData.java index 3c608771bc..cce22395ee 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/PersistentCollectionChangeData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PersistentCollectionChangeData.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper; +package org.hibernate.envers.internal.entities.mapper; import java.util.Map; import org.hibernate.envers.tools.Pair; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PropertyMapper.java similarity index 94% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PropertyMapper.java index d2b1bfcfb5..f8e23b044e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/PropertyMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/PropertyMapper.java @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper; +package org.hibernate.envers.internal.entities.mapper; import java.io.Serializable; import java.util.List; import java.util.Map; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SimpleMapperBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SimpleMapperBuilder.java similarity index 91% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SimpleMapperBuilder.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SimpleMapperBuilder.java index d79eee1780..6843e62c63 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SimpleMapperBuilder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SimpleMapperBuilder.java @@ -21,8 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper; -import org.hibernate.envers.entities.PropertyData; +package org.hibernate.envers.internal.entities.mapper; +import org.hibernate.envers.internal.entities.PropertyData; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SinglePropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SinglePropertyMapper.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SinglePropertyMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SinglePropertyMapper.java index fd20bec1fe..329955604e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SinglePropertyMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SinglePropertyMapper.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper; +package org.hibernate.envers.internal.entities.mapper; + import java.io.Serializable; import java.util.List; import java.util.Map; @@ -30,13 +31,13 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.PropertyData; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.StringTools; -import org.hibernate.envers.tools.Tools; -import org.hibernate.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.ReflectionTools; +import org.hibernate.envers.internal.tools.StringTools; +import org.hibernate.envers.internal.tools.Tools; import org.hibernate.property.DirectPropertyAccessor; import org.hibernate.property.Setter; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SubclassPropertyMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SubclassPropertyMapper.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SubclassPropertyMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SubclassPropertyMapper.java index a9a703f936..f673d6e5a9 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/SubclassPropertyMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/SubclassPropertyMapper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper; +package org.hibernate.envers.internal.entities.mapper; import java.io.Serializable; import java.util.HashMap; import java.util.List; @@ -29,9 +29,9 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * A mapper which maps from a parent mapper and a "main" one, but adds only to the "main". The "main" mapper @@ -98,8 +98,8 @@ public List mapCollectionChanges(SessionImplemen } } - public CompositeMapperBuilder addComponent(PropertyData propertyData, String componentClassName) { - return main.addComponent(propertyData, componentClassName); + public CompositeMapperBuilder addComponent(PropertyData propertyData, Class componentClass) { + return main.addComponent(propertyData, componentClass); } public void addComposite(PropertyData propertyData, PropertyMapper propertyMapper) { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractCompositeIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractCompositeIdMapper.java similarity index 83% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractCompositeIdMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractCompositeIdMapper.java index da020efd9f..c60531148a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractCompositeIdMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractCompositeIdMapper.java @@ -21,12 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.id; +package org.hibernate.envers.internal.entities.mapper.id; + import java.util.Map; -import org.hibernate.envers.entities.PropertyData; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.tools.Tools; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.tools.Tools; import org.hibernate.internal.util.ReflectHelper; /** @@ -35,11 +36,10 @@ */ public abstract class AbstractCompositeIdMapper extends AbstractIdMapper implements SimpleIdMapperBuilder { protected Map ids; - protected String compositeIdClass; + protected Class compositeIdClass; - protected AbstractCompositeIdMapper(String compositeIdClass) { + protected AbstractCompositeIdMapper(Class compositeIdClass) { ids = Tools.newLinkedHashMap(); - this.compositeIdClass = compositeIdClass; } @@ -54,8 +54,7 @@ public Object mapToIdFromMap(Map data) { Object ret; try { - final Class clazz = ReflectHelper.classForName(compositeIdClass); - ret = ReflectHelper.getDefaultConstructor(clazz).newInstance(); + ret = ReflectHelper.getDefaultConstructor(compositeIdClass).newInstance(); } catch (Exception e) { throw new AuditException(e); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractIdMapper.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractIdMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractIdMapper.java index d4f24ffe29..111c7b6c54 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/AbstractIdMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/AbstractIdMapper.java @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.id; +package org.hibernate.envers.internal.entities.mapper.id; import java.util.Iterator; import java.util.List; -import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/EmbeddedIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/EmbeddedIdMapper.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/EmbeddedIdMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/EmbeddedIdMapper.java index efa73cff27..4cdc539f91 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/EmbeddedIdMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/EmbeddedIdMapper.java @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.id; +package org.hibernate.envers.internal.entities.mapper.id; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.hibernate.envers.entities.PropertyData; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.tools.ReflectionTools; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.property.Getter; import org.hibernate.property.Setter; @@ -41,7 +41,7 @@ public class EmbeddedIdMapper extends AbstractCompositeIdMapper implements SimpleIdMapperBuilder { private PropertyData idPropertyData; - public EmbeddedIdMapper(PropertyData idPropertyData, String compositeIdClass) { + public EmbeddedIdMapper(PropertyData idPropertyData, Class compositeIdClass) { super(compositeIdClass); this.idPropertyData = idPropertyData; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/IdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/IdMapper.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/IdMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/IdMapper.java index 3bdb1dd43d..c490b1ea1f 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/IdMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/IdMapper.java @@ -21,11 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.id; +package org.hibernate.envers.internal.entities.mapper.id; import java.util.List; import java.util.Map; -import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/MultipleIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/MultipleIdMapper.java similarity index 91% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/MultipleIdMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/MultipleIdMapper.java index 1607971499..25f5e4a1a5 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/MultipleIdMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/MultipleIdMapper.java @@ -21,21 +21,22 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.id; +package org.hibernate.envers.internal.entities.mapper.id; + import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.hibernate.envers.entities.PropertyData; import org.hibernate.envers.exception.AuditException; +import org.hibernate.envers.internal.entities.PropertyData; import org.hibernate.internal.util.ReflectHelper; /** * @author Adam Warski (adam at warski dot org) */ public class MultipleIdMapper extends AbstractCompositeIdMapper implements SimpleIdMapperBuilder { - public MultipleIdMapper(String compositeIdClass) { + public MultipleIdMapper(Class compositeIdClass) { super(compositeIdClass); } @@ -76,8 +77,7 @@ public Object mapToIdFromEntity(Object data) { Object ret; try { - final Class clazz = ReflectHelper.classForName(compositeIdClass); - ret = ReflectHelper.getDefaultConstructor(clazz).newInstance(); + ret = ReflectHelper.getDefaultConstructor(compositeIdClass).newInstance(); } catch (Exception e) { throw new AuditException(e); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/QueryParameterData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/QueryParameterData.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/QueryParameterData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/QueryParameterData.java index 62635a1a32..75201a220d 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/QueryParameterData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/QueryParameterData.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.id; +package org.hibernate.envers.internal.entities.mapper.id; import org.hibernate.Query; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/SimpleIdMapperBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SimpleIdMapperBuilder.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/SimpleIdMapperBuilder.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SimpleIdMapperBuilder.java index 332796c09d..12039e4de2 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/SimpleIdMapperBuilder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SimpleIdMapperBuilder.java @@ -21,8 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.id; -import org.hibernate.envers.entities.mapper.SimpleMapperBuilder; +package org.hibernate.envers.internal.entities.mapper.id; +import org.hibernate.envers.internal.entities.mapper.SimpleMapperBuilder; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/SingleIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SingleIdMapper.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/SingleIdMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SingleIdMapper.java index 98f3b80fd7..0f14c16c4f 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/id/SingleIdMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/id/SingleIdMapper.java @@ -21,14 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.id; +package org.hibernate.envers.internal.entities.mapper.id; + import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.hibernate.envers.entities.PropertyData; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.tools.ReflectionTools; import org.hibernate.property.Getter; import org.hibernate.property.Setter; import org.hibernate.proxy.HibernateProxy; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractCollectionMapper.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractCollectionMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractCollectionMapper.java index 756f4b857d..8fa96a4113 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractCollectionMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractCollectionMapper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; import java.io.Serializable; import java.lang.reflect.Constructor; @@ -37,15 +37,15 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; -import org.hibernate.envers.entities.mapper.PropertyMapper; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.Tools; -import org.hibernate.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.internal.entities.mapper.PropertyMapper; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.ReflectionTools; +import org.hibernate.envers.internal.tools.Tools; import org.hibernate.property.Setter; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractOneToOneMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractOneToOneMapper.java similarity index 91% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractOneToOneMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractOneToOneMapper.java index b1440b7305..31fe58fc19 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractOneToOneMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractOneToOneMapper.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; import java.io.Serializable; import java.util.Map; @@ -6,10 +6,10 @@ import org.hibernate.NonUniqueResultException; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.PropertyData; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * Template class for property mappers that manage one-to-one relation. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractToOneMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractToOneMapper.java similarity index 81% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractToOneMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractToOneMapper.java index b47a2cd3a7..80fcec3bbf 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/AbstractToOneMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/AbstractToOneMapper.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; import java.io.Serializable; import java.util.List; @@ -6,15 +6,13 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.EntityConfiguration; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; -import org.hibernate.envers.entities.mapper.PropertyMapper; -import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.reflection.ReflectionTools; -import org.hibernate.internal.util.ReflectHelper; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.EntityConfiguration; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.internal.entities.mapper.PropertyMapper; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.ReflectionTools; import org.hibernate.property.Setter; /** @@ -61,13 +59,7 @@ protected EntityInfo getEntityInfo(AuditConfiguration verCfg, String entityName) entCfg = verCfg.getEntCfg().getNotVersionEntityConfiguration(entityName); isRelationAudited = false; } - Class entityClass; - try { - entityClass = ReflectHelper.classForName(entCfg.getEntityClassName()); - } - catch ( ClassNotFoundException e ) { - throw new AuditException( e ); - } + Class entityClass = ReflectionTools.loadClass( entCfg.getEntityClassName(), verCfg.getClassLoaderService() ); return new EntityInfo(entityClass, entityName, isRelationAudited); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/BasicCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/BasicCollectionMapper.java similarity index 86% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/BasicCollectionMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/BasicCollectionMapper.java index 1c934f6f7a..49a2db0ed9 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/BasicCollectionMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/BasicCollectionMapper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; import java.io.Serializable; import java.util.Collection; @@ -29,11 +29,11 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.PropertyMapper; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.BasicCollectionInitializor; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.PropertyMapper; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.BasicCollectionInitializor; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/CommonCollectionMapperData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/CommonCollectionMapperData.java similarity index 89% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/CommonCollectionMapperData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/CommonCollectionMapperData.java index fcb784885b..dc22be02d1 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/CommonCollectionMapperData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/CommonCollectionMapperData.java @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +package org.hibernate.envers.internal.entities.mapper.relation; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.entities.mapper.relation.query.RelationQueryGenerator; /** * Data that is used by all collection mappers, regardless of the type. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ListCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ListCollectionMapper.java similarity index 85% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ListCollectionMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ListCollectionMapper.java index f883e68a79..26d6ce3398 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ListCollectionMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ListCollectionMapper.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; + import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -29,14 +30,14 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.PropertyMapper; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.ListCollectionInitializor; -import org.hibernate.envers.entities.mapper.relation.lazy.proxy.ListProxy; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.PropertyMapper; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.ListCollectionInitializor; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy.ListProxy; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.Tools; import org.hibernate.envers.tools.Pair; -import org.hibernate.envers.tools.Tools; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MapCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MapCollectionMapper.java similarity index 87% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MapCollectionMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MapCollectionMapper.java index 44f1ec8827..a2f6d46ea4 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MapCollectionMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MapCollectionMapper.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; import java.io.Serializable; import java.util.Collection; @@ -29,11 +29,11 @@ import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.PropertyMapper; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.MapCollectionInitializor; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.PropertyMapper; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.MapCollectionInitializor; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleComponentData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleComponentData.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleComponentData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleComponentData.java index 2a534ff5c5..7ac2ff25b1 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleComponentData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleComponentData.java @@ -21,8 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation; -import org.hibernate.envers.entities.mapper.relation.component.MiddleComponentMapper; +package org.hibernate.envers.internal.entities.mapper.relation; +import org.hibernate.envers.internal.entities.mapper.relation.component.MiddleComponentMapper; /** * A data holder for a middle relation component (which is either the collection element or index): diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleIdData.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleIdData.java similarity index 91% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleIdData.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleIdData.java index ecde6d77bd..8d688e541e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/MiddleIdData.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/MiddleIdData.java @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.entities.IdMappingData; -import org.hibernate.envers.entities.mapper.id.IdMapper; +package org.hibernate.envers.internal.entities.mapper.relation; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.internal.entities.IdMappingData; +import org.hibernate.envers.internal.entities.mapper.id.IdMapper; /** * A class holding information about ids, which form a virtual "relation" from a middle-table. Middle-tables are used diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOneNotOwningMapper.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOneNotOwningMapper.java index 2eeb2ff2ef..c56754876b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOneNotOwningMapper.java @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; import java.io.Serializable; import javax.persistence.OneToOne; -import org.hibernate.envers.entities.PropertyData; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.reader.AuditReaderImplementor; /** * Property mapper for not owning side of {@link OneToOne} relation. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java index acbe0f6606..6ef8ff4d71 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/OneToOnePrimaryKeyJoinColumnMapper.java @@ -1,13 +1,13 @@ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; import java.io.Serializable; import javax.persistence.OneToOne; import javax.persistence.PrimaryKeyJoinColumn; import org.hibernate.envers.Audited; -import org.hibernate.envers.entities.PropertyData; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; import org.hibernate.envers.query.AuditEntity; -import org.hibernate.envers.reader.AuditReaderImplementor; import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/SortedMapCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedMapCollectionMapper.java similarity index 84% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/SortedMapCollectionMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedMapCollectionMapper.java index a3a512ebd1..e7d0f14b5a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/SortedMapCollectionMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedMapCollectionMapper.java @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; import java.util.Comparator; import java.util.SortedMap; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.SortedMapCollectionInitializor; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.SortedMapCollectionInitializor; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * @author Michal Skowronek (mskowr at o2 dot pl) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/SortedSetCollectionMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedSetCollectionMapper.java similarity index 84% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/SortedSetCollectionMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedSetCollectionMapper.java index 7c4a3b451a..66efdf3736 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/SortedSetCollectionMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/SortedSetCollectionMapper.java @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; import java.util.Comparator; import java.util.SortedSet; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.SortedSetCollectionInitializor; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.SortedSetCollectionInitializor; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * @author Michal Skowronek (mskowr at o2 dot pl) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneEntityLoader.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneEntityLoader.java similarity index 88% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneEntityLoader.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneEntityLoader.java index 8c4c33fd91..3d9aeaa016 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneEntityLoader.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneEntityLoader.java @@ -1,10 +1,10 @@ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; import java.io.Serializable; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.relation.lazy.ToOneDelegateSessionImplementor; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.ToOneDelegateSessionImplementor; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java similarity index 87% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java index 1890ed078c..3382b0136d 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/ToOneIdMapper.java @@ -21,22 +21,19 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation; +package org.hibernate.envers.internal.entities.mapper.relation; -import java.io.Serializable; import java.util.HashMap; import java.util.Map; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.entities.mapper.id.IdMapper; -import org.hibernate.envers.entities.mapper.relation.lazy.ToOneDelegateSessionImplementor; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.Tools; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.persister.entity.EntityPersister; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.entities.mapper.id.IdMapper; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.EntityTools; +import org.hibernate.envers.internal.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) @@ -86,7 +83,7 @@ public void mapModifiedFlagsToMapForCollectionChange(String collectionPropertyNa protected boolean checkModified(SessionImplementor session, Object newObj, Object oldObj) { //noinspection SimplifiableConditionalExpression - return nonInsertableFake ? false : !Tools.entitiesEqual(session, referencedEntityName, newObj, oldObj); + return nonInsertableFake ? false : !EntityTools.entitiesEqual(session, referencedEntityName, newObj, oldObj); } public void nullSafeMapToEntityFromMap(AuditConfiguration verCfg, Object obj, Map data, Object primaryKey, diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleComponentMapper.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleComponentMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleComponentMapper.java index 73775eb4c8..f9213ab8ac 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleComponentMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleComponentMapper.java @@ -21,15 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.component; +package org.hibernate.envers.internal.entities.mapper.relation.component; import java.util.Map; -import javax.persistence.ElementCollection; -import javax.persistence.Embeddable; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.entities.EntityInstantiator; -import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.internal.entities.EntityInstantiator; +import org.hibernate.envers.internal.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleDummyComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleDummyComponentMapper.java similarity index 89% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleDummyComponentMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleDummyComponentMapper.java index 8c681b937f..b4da4f3c37 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleDummyComponentMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleDummyComponentMapper.java @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.component; +package org.hibernate.envers.internal.entities.mapper.relation.component; import java.util.Map; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.entities.EntityInstantiator; -import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.internal.entities.EntityInstantiator; +import org.hibernate.envers.internal.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleEmbeddableComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleEmbeddableComponentMapper.java similarity index 83% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleEmbeddableComponentMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleEmbeddableComponentMapper.java index c287ff6c8d..f599d81e8c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleEmbeddableComponentMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleEmbeddableComponentMapper.java @@ -21,19 +21,19 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.component; +package org.hibernate.envers.internal.entities.mapper.relation.component; import java.util.Map; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.entities.EntityInstantiator; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.entities.mapper.CompositeMapperBuilder; -import org.hibernate.envers.entities.mapper.MultiPropertyMapper; -import org.hibernate.envers.entities.mapper.PropertyMapper; -import org.hibernate.envers.entities.mapper.relation.ToOneIdMapper; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.internal.entities.EntityInstantiator; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.entities.mapper.CompositeMapperBuilder; +import org.hibernate.envers.internal.entities.mapper.MultiPropertyMapper; +import org.hibernate.envers.internal.entities.mapper.PropertyMapper; +import org.hibernate.envers.internal.entities.mapper.relation.ToOneIdMapper; +import org.hibernate.envers.internal.tools.query.Parameters; import org.hibernate.internal.util.ReflectHelper; /** @@ -43,14 +43,9 @@ public class MiddleEmbeddableComponentMapper implements MiddleComponentMapper, C private final MultiPropertyMapper delegate; private final Class componentClass; - public MiddleEmbeddableComponentMapper(MultiPropertyMapper delegate, String componentClassName) { + public MiddleEmbeddableComponentMapper(MultiPropertyMapper delegate, Class componentClass) { this.delegate = delegate; - try { - componentClass = Thread.currentThread().getContextClassLoader().loadClass( componentClassName ); - } - catch ( Exception e ) { - throw new AuditException( e ); - } + this.componentClass = componentClass; } @Override @@ -95,8 +90,8 @@ else if ( nestedMapper instanceof ToOneIdMapper ) { } @Override - public CompositeMapperBuilder addComponent(PropertyData propertyData, String componentClassName) { - return delegate.addComponent( propertyData, componentClassName ); + public CompositeMapperBuilder addComponent(PropertyData propertyData, Class componentClass) { + return delegate.addComponent( propertyData, componentClass ); } @Override diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java similarity index 87% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java index 464f9a2c24..cc9c899e75 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyIdComponentMapper.java @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.component; +package org.hibernate.envers.internal.entities.mapper.relation.component; import java.util.Map; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.entities.EntityInstantiator; -import org.hibernate.envers.entities.mapper.id.IdMapper; -import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.internal.entities.EntityInstantiator; +import org.hibernate.envers.internal.entities.mapper.id.IdMapper; +import org.hibernate.envers.internal.tools.query.Parameters; /** * A component mapper for the @MapKey mapping: the value of the map's key is the id of the entity. This diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java index f619e01ae7..943c22cab4 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleMapKeyPropertyComponentMapper.java @@ -21,13 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.component; +package org.hibernate.envers.internal.entities.mapper.relation.component; + import java.util.Map; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.entities.EntityInstantiator; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.internal.entities.EntityInstantiator; +import org.hibernate.envers.internal.tools.ReflectionTools; +import org.hibernate.envers.internal.tools.query.Parameters; /** * A component mapper for the @MapKey mapping with the name parameter specified: the value of the map's key diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleRelatedComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleRelatedComponentMapper.java similarity index 88% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleRelatedComponentMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleRelatedComponentMapper.java index fb43169c9b..de340038d0 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleRelatedComponentMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleRelatedComponentMapper.java @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.component; +package org.hibernate.envers.internal.entities.mapper.relation.component; import java.util.Map; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.entities.EntityInstantiator; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.internal.entities.EntityInstantiator; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleSimpleComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleSimpleComponentMapper.java similarity index 89% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleSimpleComponentMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleSimpleComponentMapper.java index f6cc572943..4ccf1de192 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleSimpleComponentMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleSimpleComponentMapper.java @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.component; +package org.hibernate.envers.internal.entities.mapper.relation.component; import java.util.Map; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.entities.EntityInstantiator; -import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.internal.entities.EntityInstantiator; +import org.hibernate.envers.internal.tools.query.Parameters; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleStraightComponentMapper.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleStraightComponentMapper.java similarity index 91% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleStraightComponentMapper.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleStraightComponentMapper.java index 30fdd16535..2457155d6d 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/component/MiddleStraightComponentMapper.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/component/MiddleStraightComponentMapper.java @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.component; +package org.hibernate.envers.internal.entities.mapper.relation.component; import java.util.Map; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.entities.EntityInstantiator; -import org.hibernate.envers.tools.query.Parameters; +import org.hibernate.envers.internal.entities.EntityInstantiator; +import org.hibernate.envers.internal.tools.query.Parameters; /** * A mapper for reading and writing a property straight to/from maps. This mapper cannot be used with middle tables, diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java similarity index 99% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java index 59f2a92fa8..cd4823b78c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/AbstractDelegateSessionImplementor.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy; +package org.hibernate.envers.internal.entities.mapper.relation.lazy; import java.io.Serializable; import java.sql.Connection; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java similarity index 87% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java index 2a1721debb..13394d437f 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java @@ -21,14 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy; -import java.io.Serializable; +package org.hibernate.envers.internal.entities.mapper.relation.lazy; import org.hibernate.HibernateException; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.EntitiesConfigurations; -import org.hibernate.envers.entities.mapper.relation.ToOneEntityLoader; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.ToOneEntityLoader; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java similarity index 87% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java index 635b9a2720..bc6fd61688 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/AbstractCollectionInitializor.java @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor; import java.util.List; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.EntityInstantiator; -import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.EntityInstantiator; +import org.hibernate.envers.internal.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * Initializes a persistent collection. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java similarity index 88% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java index 91c2888ce5..066906c796 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ArrayCollectionInitializor.java @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor; import java.util.List; import java.util.Map; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * Initializes a map. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java index 9a3bcda897..b0205eb304 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/BasicCollectionInitializor.java @@ -21,18 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor; import java.lang.reflect.InvocationTargetException; import java.util.Collection; import java.util.List; import java.util.Map; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; import org.hibernate.internal.util.ReflectHelper; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/Initializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/Initializor.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/Initializor.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/Initializor.java index 4f115dd4bb..a283eb1d57 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/Initializor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/Initializor.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java index edee51b780..fd106fe583 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/ListCollectionInitializor.java @@ -21,15 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor; import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * Initializes a map. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java index 5b75027a6b..bed9d90a98 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/MapCollectionInitializor.java @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor; import java.lang.reflect.InvocationTargetException; import java.util.List; import java.util.Map; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; import org.hibernate.internal.util.ReflectHelper; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/SortedMapCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedMapCollectionInitializor.java similarity index 86% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/SortedMapCollectionInitializor.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedMapCollectionInitializor.java index 021432184c..faba2f4c1e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/SortedMapCollectionInitializor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedMapCollectionInitializor.java @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor; import java.lang.reflect.InvocationTargetException; import java.util.Comparator; import java.util.SortedMap; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * Initializes SortedMap collection with proper Comparator diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/SortedSetCollectionInitializor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedSetCollectionInitializor.java similarity index 86% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/SortedSetCollectionInitializor.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedSetCollectionInitializor.java index 21f6bb32a8..cf70f8c6ac 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/initializor/SortedSetCollectionInitializor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/initializor/SortedSetCollectionInitializor.java @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.initializor; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor; import java.lang.reflect.InvocationTargetException; import java.util.Comparator; import java.util.SortedSet; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.query.RelationQueryGenerator; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * Initializes SortedSet collection with proper Comparator diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/CollectionProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/CollectionProxy.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/CollectionProxy.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/CollectionProxy.java index 1753bc3617..d44180cbe0 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/CollectionProxy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/CollectionProxy.java @@ -21,12 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor; /** * @author Adam Warski (adam at warski dot org) @@ -34,7 +34,7 @@ public abstract class CollectionProxy> implements Collection, Serializable { private static final long serialVersionUID = 8698249863871832402L; - private transient org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor initializor; + private transient org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor initializor; protected T delegate; protected CollectionProxy() { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/ListProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/ListProxy.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/ListProxy.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/ListProxy.java index be2289995f..348f778711 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/ListProxy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/ListProxy.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy; import java.util.Collection; import java.util.List; import java.util.ListIterator; @@ -35,7 +35,7 @@ public class ListProxy extends CollectionProxy> implements List public ListProxy() { } - public ListProxy(org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor> initializor) { + public ListProxy(org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor> initializor) { super(initializor); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/MapProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/MapProxy.java similarity index 91% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/MapProxy.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/MapProxy.java index 39ff01e4b5..bbc4e97386 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/MapProxy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/MapProxy.java @@ -21,13 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy; import java.io.Serializable; import java.util.Collection; import java.util.Map; import java.util.Set; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor; /** * @author Adam Warski (adam at warski dot org) @@ -41,7 +41,7 @@ public class MapProxy implements Map, Serializable { public MapProxy() { } - public MapProxy(org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor> initializor) { + public MapProxy(org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor> initializor) { this.initializor = initializor; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SetProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SetProxy.java similarity index 87% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SetProxy.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SetProxy.java index 0cfb5f20c5..e57473b887 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SetProxy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SetProxy.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy; import java.util.Set; /** @@ -33,7 +33,7 @@ public class SetProxy extends CollectionProxy> implements Set { public SetProxy() { } - public SetProxy(org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor> initializor) { + public SetProxy(org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor> initializor) { super(initializor); } } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedMapProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedMapProxy.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedMapProxy.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedMapProxy.java index 2eb47cdacc..51a199125f 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedMapProxy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedMapProxy.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy; import java.io.Serializable; import java.util.Collection; import java.util.Comparator; @@ -29,7 +29,7 @@ import java.util.Set; import java.util.SortedMap; -import org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor; +import org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor; /** * @author Adam Warski (adam at warski dot org) @@ -43,7 +43,7 @@ public class SortedMapProxy implements SortedMap, Serializable { public SortedMapProxy() { } - public SortedMapProxy(org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor> initializor) { + public SortedMapProxy(org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor> initializor) { this.initializor = initializor; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedSetProxy.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedSetProxy.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedSetProxy.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedSetProxy.java index a5ed381254..962a754094 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/proxy/SortedSetProxy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/lazy/proxy/SortedSetProxy.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.lazy.proxy; +package org.hibernate.envers.internal.entities.mapper.relation.lazy.proxy; import java.util.Comparator; import java.util.SortedSet; @@ -34,7 +34,7 @@ public class SortedSetProxy extends CollectionProxy> implemen public SortedSetProxy() { } - public SortedSetProxy(org.hibernate.envers.entities.mapper.relation.lazy.initializor.Initializor> initializor) { + public SortedSetProxy(org.hibernate.envers.internal.entities.mapper.relation.lazy.initializor.Initializor> initializor) { super(initializor); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/AbstractRelationQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java similarity index 80% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/AbstractRelationQueryGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java index cb3fe4a696..6d59852d21 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/AbstractRelationQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/AbstractRelationQueryGenerator.java @@ -21,17 +21,17 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.query; +package org.hibernate.envers.internal.entities.mapper.relation.query; import org.hibernate.Query; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.entities.mapper.id.QueryParameterData; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.internal.entities.mapper.id.QueryParameterData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; /** * Base class for implementers of {@code RelationQueryGenerator} contract. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java similarity index 80% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java index 953be5ee0d..68f8d04d93 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneAuditEntityQueryGenerator.java @@ -21,25 +21,20 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.query; +package org.hibernate.envers.internal.entities.mapper.relation.query; import java.util.Collections; -import org.hibernate.Query; -import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.configuration.GlobalConfiguration; -import org.hibernate.envers.entities.mapper.id.QueryParameterData; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; import org.hibernate.envers.strategy.AuditStrategy; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; /** * Selects data from an audit entity. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneEntityQueryGenerator.java similarity index 82% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneEntityQueryGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneEntityQueryGenerator.java index 45d8e47728..d3bb6e554d 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/OneEntityQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/OneEntityQueryGenerator.java @@ -21,24 +21,19 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.query; +package org.hibernate.envers.internal.entities.mapper.relation.query; import java.util.Collections; -import org.hibernate.Query; -import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.entities.mapper.id.QueryParameterData; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; import org.hibernate.envers.strategy.AuditStrategy; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; /** * Selects data from a relation middle-table only. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/QueryConstants.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/QueryConstants.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/QueryConstants.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/QueryConstants.java index 81014bd7e5..bb01740dd4 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/QueryConstants.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/QueryConstants.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.entities.mapper.relation.query; +package org.hibernate.envers.internal.entities.mapper.relation.query; /** * Constants used in JPQL queries. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/RelationQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/RelationQueryGenerator.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/RelationQueryGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/RelationQueryGenerator.java index 9957454b22..5368a11b42 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/RelationQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/RelationQueryGenerator.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.query; +package org.hibernate.envers.internal.entities.mapper.relation.query; import org.hibernate.Query; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; /** * TODO: cleanup implementations and extract common code diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/ThreeEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/ThreeEntityQueryGenerator.java similarity index 85% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/ThreeEntityQueryGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/ThreeEntityQueryGenerator.java index 782d12cea3..122d869b16 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/ThreeEntityQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/ThreeEntityQueryGenerator.java @@ -21,29 +21,24 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.query; +package org.hibernate.envers.internal.entities.mapper.relation.query; import java.util.Collections; -import org.hibernate.Query; -import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.configuration.GlobalConfiguration; -import org.hibernate.envers.entities.mapper.id.QueryParameterData; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; import org.hibernate.envers.strategy.AuditStrategy; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.INDEX_ENTITY_ALIAS; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.INDEX_ENTITY_ALIAS_DEF_AUD_STR; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.INDEX_ENTITY_ALIAS; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.INDEX_ENTITY_ALIAS_DEF_AUD_STR; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; /** * Selects data from a relation middle-table and a two related versions entity. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java similarity index 82% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java index d5402cd5cd..dc0748519d 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityOneAuditedQueryGenerator.java @@ -21,25 +21,20 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.query; +package org.hibernate.envers.internal.entities.mapper.relation.query; import java.util.Collections; -import org.hibernate.Query; -import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.entities.mapper.id.QueryParameterData; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; import org.hibernate.envers.strategy.AuditStrategy; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; /** * Selects data from a relation middle-table and a related non-audited entity. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityQueryGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityQueryGenerator.java similarity index 83% rename from hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityQueryGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityQueryGenerator.java index 42642bd7c6..93b108e8f2 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/query/TwoEntityQueryGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/entities/mapper/relation/query/TwoEntityQueryGenerator.java @@ -21,27 +21,22 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.entities.mapper.relation.query; +package org.hibernate.envers.internal.entities.mapper.relation.query; import java.util.Collections; -import org.hibernate.Query; -import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.configuration.GlobalConfiguration; -import org.hibernate.envers.entities.mapper.id.QueryParameterData; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; import org.hibernate.envers.strategy.AuditStrategy; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.DEL_REVISION_TYPE_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; /** * Selects data from a relation middle-table and a related versions entity. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/reader/AuditReaderImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/reader/AuditReaderImpl.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java index 784c7b0160..7a64945109 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/reader/AuditReaderImpl.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/AuditReaderImpl.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.reader; +package org.hibernate.envers.internal.reader; + import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -36,19 +37,19 @@ import org.hibernate.Session; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.CrossTypeRevisionChangesReader; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; import org.hibernate.envers.exception.NotAuditedException; import org.hibernate.envers.exception.RevisionDoesNotExistException; +import org.hibernate.envers.internal.synchronization.AuditProcess; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQueryCreator; -import org.hibernate.envers.synchronization.AuditProcess; import org.hibernate.event.spi.EventSource; import org.hibernate.proxy.HibernateProxy; -import static org.hibernate.envers.tools.ArgumentsTools.checkNotNull; -import static org.hibernate.envers.tools.ArgumentsTools.checkPositive; -import static org.hibernate.envers.tools.Tools.getTargetClassIfProxied; +import static org.hibernate.envers.internal.tools.ArgumentsTools.checkNotNull; +import static org.hibernate.envers.internal.tools.ArgumentsTools.checkPositive; +import static org.hibernate.envers.internal.tools.EntityTools.getTargetClassIfProxied; /** * @author Adam Warski (adam at warski dot org) @@ -254,7 +255,7 @@ public Map findRevisions(Class revisionEntityClass, Set> findEntityTypes(Number revision) throws IllegalS // Generate result that contains entity names and corresponding Java classes. Set> result = new HashSet>(); for (String entityName : entityNames) { - result.add(Pair.make(entityName, Tools.getEntityClass(sessionImplementor, session, entityName))); + result.add(Pair.make(entityName, EntityTools.getEntityClass(sessionImplementor, session, entityName))); } return result; } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/reader/FirstLevelCache.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java similarity index 95% rename from hibernate-envers/src/main/java/org/hibernate/envers/reader/FirstLevelCache.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java index a145c1dc43..db9a4a4ab6 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/reader/FirstLevelCache.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/reader/FirstLevelCache.java @@ -21,16 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.reader; +package org.hibernate.envers.internal.reader; import java.util.Map; import org.jboss.logging.Logger; import org.hibernate.envers.internal.EnversMessageLogger; -import org.hibernate.envers.tools.Triple; +import org.hibernate.envers.internal.tools.Triple; -import static org.hibernate.envers.tools.Tools.newHashMap; -import static org.hibernate.envers.tools.Triple.make; +import static org.hibernate.envers.internal.tools.Tools.newHashMap; +import static org.hibernate.envers.internal.tools.Triple.make; /** * First level cache for versioned entities, versions reader-scoped. Each entity is uniquely identified by a diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/DefaultRevisionInfoGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultRevisionInfoGenerator.java similarity index 94% rename from hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/DefaultRevisionInfoGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultRevisionInfoGenerator.java index bda9b8788b..b3d480c71a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/DefaultRevisionInfoGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultRevisionInfoGenerator.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.revisioninfo; +package org.hibernate.envers.internal.revisioninfo; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; @@ -32,9 +32,9 @@ import org.hibernate.envers.EntityTrackingRevisionListener; import org.hibernate.envers.RevisionListener; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.synchronization.SessionCacheCleaner; -import org.hibernate.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.synchronization.SessionCacheCleaner; +import org.hibernate.envers.internal.tools.ReflectionTools; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.property.Setter; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/DefaultTrackingModifiedEntitiesRevisionInfoGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultTrackingModifiedEntitiesRevisionInfoGenerator.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/DefaultTrackingModifiedEntitiesRevisionInfoGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultTrackingModifiedEntitiesRevisionInfoGenerator.java index e63b0b767d..f3da3f4d1a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/DefaultTrackingModifiedEntitiesRevisionInfoGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/DefaultTrackingModifiedEntitiesRevisionInfoGenerator.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.revisioninfo; +package org.hibernate.envers.internal.revisioninfo; import java.io.Serializable; import java.util.HashSet; @@ -8,8 +8,8 @@ import org.hibernate.envers.ModifiedEntityNames; import org.hibernate.envers.RevisionListener; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.tools.ReflectionTools; import org.hibernate.property.Getter; import org.hibernate.property.Setter; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/ModifiedEntityNamesReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/ModifiedEntityNamesReader.java similarity index 80% rename from hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/ModifiedEntityNamesReader.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/ModifiedEntityNamesReader.java index fb642c679a..f29f6846d4 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/ModifiedEntityNamesReader.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/ModifiedEntityNamesReader.java @@ -1,9 +1,9 @@ -package org.hibernate.envers.revisioninfo; +package org.hibernate.envers.internal.revisioninfo; import java.util.Set; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.tools.reflection.ReflectionTools; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.tools.ReflectionTools; import org.hibernate.property.Getter; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoGenerator.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoGenerator.java index ff08605900..cef1a14a3b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoGenerator.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.revisioninfo; +package org.hibernate.envers.internal.revisioninfo; import java.io.Serializable; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoNumberReader.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoNumberReader.java similarity index 90% rename from hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoNumberReader.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoNumberReader.java index 603c90e0bd..69f17ad8fb 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoNumberReader.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoNumberReader.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.revisioninfo; -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.tools.reflection.ReflectionTools; +package org.hibernate.envers.internal.revisioninfo; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.internal.tools.ReflectionTools; import org.hibernate.property.Getter; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoQueryCreator.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoQueryCreator.java similarity index 98% rename from hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoQueryCreator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoQueryCreator.java index b1eb11ed0b..005d29db58 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/revisioninfo/RevisionInfoQueryCreator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/revisioninfo/RevisionInfoQueryCreator.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.revisioninfo; +package org.hibernate.envers.internal.revisioninfo; import java.util.Date; import java.util.Set; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/AuditProcess.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcess.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/AuditProcess.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcess.java index b74c39feae..d8e79979b6 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/AuditProcess.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcess.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.synchronization; +package org.hibernate.envers.internal.synchronization; import java.util.HashMap; import java.util.LinkedList; @@ -33,8 +33,8 @@ import org.hibernate.Session; import org.hibernate.action.spi.BeforeTransactionCompletionProcess; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.revisioninfo.RevisionInfoGenerator; -import org.hibernate.envers.synchronization.work.AuditWorkUnit; +import org.hibernate.envers.internal.revisioninfo.RevisionInfoGenerator; +import org.hibernate.envers.internal.synchronization.work.AuditWorkUnit; import org.hibernate.envers.tools.Pair; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/AuditProcessManager.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcessManager.java similarity index 95% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/AuditProcessManager.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcessManager.java index dc39a15003..0f9c447d00 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/AuditProcessManager.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/AuditProcessManager.java @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.synchronization; +package org.hibernate.envers.internal.synchronization; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.hibernate.Transaction; import org.hibernate.action.spi.AfterTransactionCompletionProcess; import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.envers.revisioninfo.RevisionInfoGenerator; +import org.hibernate.envers.internal.revisioninfo.RevisionInfoGenerator; import org.hibernate.event.spi.EventSource; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/EntityChangeNotifier.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/EntityChangeNotifier.java similarity index 79% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/EntityChangeNotifier.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/EntityChangeNotifier.java index 1cc89e7636..c9dc6cad76 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/EntityChangeNotifier.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/EntityChangeNotifier.java @@ -1,14 +1,14 @@ -package org.hibernate.envers.synchronization; +package org.hibernate.envers.internal.synchronization; import java.io.Serializable; import org.hibernate.Session; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.revisioninfo.RevisionInfoGenerator; -import org.hibernate.envers.synchronization.work.AuditWorkUnit; -import org.hibernate.envers.synchronization.work.PersistentCollectionChangeWorkUnit; -import org.hibernate.envers.tools.Tools; +import org.hibernate.envers.internal.revisioninfo.RevisionInfoGenerator; +import org.hibernate.envers.internal.synchronization.work.AuditWorkUnit; +import org.hibernate.envers.internal.synchronization.work.PersistentCollectionChangeWorkUnit; +import org.hibernate.envers.internal.tools.EntityTools; /** * Notifies {@link RevisionInfoGenerator} about changes made in the current revision. @@ -36,7 +36,7 @@ public void entityChanged(Session session, Object currentRevisionData, AuditWork // Notify about a change in collection owner entity. entityId = ((PersistentCollectionChangeWorkUnit.PersistentCollectionChangeWorkUnitId) entityId).getOwnerId(); } - Class entityClass = Tools.getEntityClass(sessionImplementor, session, vwu.getEntityName()); + Class entityClass = EntityTools.getEntityClass(sessionImplementor, session, vwu.getEntityName()); revisionInfoGenerator.entityChanged(entityClass, vwu.getEntityName(), entityId, vwu.getRevisionType(), currentRevisionData); } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/SessionCacheCleaner.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/SessionCacheCleaner.java similarity index 95% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/SessionCacheCleaner.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/SessionCacheCleaner.java index fe7d1b4569..4c9c8c40fe 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/SessionCacheCleaner.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/SessionCacheCleaner.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.synchronization; +package org.hibernate.envers.internal.synchronization; import org.hibernate.Session; import org.hibernate.action.spi.AfterTransactionCompletionProcess; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AbstractAuditWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AbstractAuditWorkUnit.java similarity index 94% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AbstractAuditWorkUnit.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AbstractAuditWorkUnit.java index 1cc9373cd8..29bd8ce032 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AbstractAuditWorkUnit.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AbstractAuditWorkUnit.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.synchronization.work; +package org.hibernate.envers.internal.synchronization.work; import java.io.Serializable; import java.util.HashMap; @@ -30,8 +30,8 @@ import org.hibernate.Session; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.strategy.AuditStrategy; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AddWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AddWorkUnit.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AddWorkUnit.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AddWorkUnit.java index 507756690e..2650661ae7 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AddWorkUnit.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AddWorkUnit.java @@ -21,15 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.synchronization.work; +package org.hibernate.envers.internal.synchronization.work; + import java.io.Serializable; import java.util.HashMap; import java.util.Map; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.tools.Tools; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.tools.ArraysTools; import org.hibernate.persister.entity.EntityPersister; /** @@ -56,7 +57,7 @@ public AddWorkUnit(SessionImplementor sessionImplementor, String entityName, Aud this.data = data; final String[] propertyNames = sessionImplementor.getFactory().getEntityPersister(getEntityName()).getPropertyNames(); - this.state = Tools.mapToArray(data, propertyNames); + this.state = ArraysTools.mapToArray(data, propertyNames); } public boolean containsWork() { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AuditWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AuditWorkUnit.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AuditWorkUnit.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AuditWorkUnit.java index eb50f80ab8..f247f21bee 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/AuditWorkUnit.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/AuditWorkUnit.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.synchronization.work; +package org.hibernate.envers.internal.synchronization.work; import java.io.Serializable; import java.util.Map; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/CollectionChangeWorkUnit.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/CollectionChangeWorkUnit.java index f4f73786f3..eb06f1f8c1 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/CollectionChangeWorkUnit.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.synchronization.work; +package org.hibernate.envers.internal.synchronization.work; import java.io.Serializable; import java.util.HashMap; @@ -29,7 +29,7 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/DelWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/DelWorkUnit.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/DelWorkUnit.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/DelWorkUnit.java index 98771d32d6..2f131f8375 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/DelWorkUnit.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/DelWorkUnit.java @@ -21,15 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.synchronization.work; +package org.hibernate.envers.internal.synchronization.work; + import java.io.Serializable; import java.util.HashMap; import java.util.Map; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.tools.Tools; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.tools.ArraysTools; import org.hibernate.persister.entity.EntityPersister; /** @@ -70,7 +71,7 @@ public Map generateData(Object revisionData) { } public AuditWorkUnit merge(AddWorkUnit second) { - if (Tools.arraysEqual(second.getState(), state)) { + if (ArraysTools.arraysEqual(second.getState(), state)) { return null; // Return null if object's state has not changed. } return new ModWorkUnit(sessionImplementor, entityName, verCfg, id, entityPersister, second.getState(), state); diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/FakeBidirectionalRelationWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/FakeBidirectionalRelationWorkUnit.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/FakeBidirectionalRelationWorkUnit.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/FakeBidirectionalRelationWorkUnit.java index eaa2c25efc..f5c5f58e3d 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/FakeBidirectionalRelationWorkUnit.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/FakeBidirectionalRelationWorkUnit.java @@ -1,4 +1,4 @@ -package org.hibernate.envers.synchronization.work; +package org.hibernate.envers.internal.synchronization.work; import java.io.Serializable; import java.util.HashMap; import java.util.HashSet; @@ -7,8 +7,8 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.RelationDescription; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.RelationDescription; /** * A work unit that handles "fake" bidirectional one-to-many relations (mapped with {@code @OneToMany+@JoinColumn} and diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/ModWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/ModWorkUnit.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/ModWorkUnit.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/ModWorkUnit.java index 5b2454b0fa..77129d9c6a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/ModWorkUnit.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/ModWorkUnit.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.synchronization.work; +package org.hibernate.envers.internal.synchronization.work; import java.io.Serializable; import java.util.HashMap; @@ -29,7 +29,7 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.persister.entity.EntityPersister; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/PersistentCollectionChangeWorkUnit.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/PersistentCollectionChangeWorkUnit.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/PersistentCollectionChangeWorkUnit.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/PersistentCollectionChangeWorkUnit.java index 4728690502..6f87f1d19b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/PersistentCollectionChangeWorkUnit.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/PersistentCollectionChangeWorkUnit.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.synchronization.work; +package org.hibernate.envers.internal.synchronization.work; + import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; @@ -33,9 +34,9 @@ import org.hibernate.engine.spi.CollectionEntry; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.PersistentCollectionChangeData; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/WorkUnitMergeDispatcher.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeDispatcher.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/WorkUnitMergeDispatcher.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeDispatcher.java index 6a85ed8fd2..0359343771 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/WorkUnitMergeDispatcher.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeDispatcher.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.synchronization.work; +package org.hibernate.envers.internal.synchronization.work; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/WorkUnitMergeVisitor.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeVisitor.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/WorkUnitMergeVisitor.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeVisitor.java index b01e1a8b92..c47840ed00 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/synchronization/work/WorkUnitMergeVisitor.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/synchronization/work/WorkUnitMergeVisitor.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.synchronization.work; +package org.hibernate.envers.internal.synchronization.work; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/ArraysTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArgumentsTools.java similarity index 72% rename from hibernate-envers/src/main/java/org/hibernate/envers/tools/ArraysTools.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArgumentsTools.java index f24fdee4fa..d4d50ca54c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/ArraysTools.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArgumentsTools.java @@ -21,20 +21,21 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.tools; - +package org.hibernate.envers.internal.tools; /** * @author Adam Warski (adam at warski dot org) */ -public class ArraysTools { - public static boolean arrayIncludesInstanceOf(T[] array, Class cls) { - for (T obj : array) { - if (cls.isAssignableFrom(obj.getClass())) { - return true; - } - } +public abstract class ArgumentsTools { + public static void checkNotNull(Object o, String paramName) { + if ( o == null ) { + throw new IllegalArgumentException( paramName + " cannot be null." ); + } + } - return false; - } + public static void checkPositive(Number i, String paramName) { + if ( i.longValue() <= 0l ) { + throw new IllegalArgumentException( paramName + " has to be greater than 0." ); + } + } } diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java new file mode 100644 index 0000000000..8b3e5d4b71 --- /dev/null +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ArraysTools.java @@ -0,0 +1,71 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.envers.internal.tools; + +import java.util.Map; + +/** + * @author Adam Warski (adam at warski dot org) + */ +public abstract class ArraysTools { + public static boolean arrayIncludesInstanceOf(T[] array, Class cls) { + for ( T obj : array ) { + if ( cls.isAssignableFrom( obj.getClass() ) ) { + return true; + } + } + + return false; + } + + public static boolean arraysEqual(Object[] array1, Object[] array2) { + if ( array1 == null ) { + return array2 == null; + } + if ( array2 == null || array1.length != array2.length ) { + return false; + } + for ( int i = 0; i < array1.length; ++i ) { + if ( array1[i] != null ? !array1[i].equals( array2[i] ) : array2[i] != null ) { + return false; + } + } + return true; + } + + /** + * Converts map's value set to an array. {@code keys} parameter specifies requested elements and their order. + * @param data Source map. + * @param keys Array of keys that represent requested map values. + * @return Array of values stored in the map under specified keys. If map does not contain requested key, + * {@code null} is inserted. + */ + public static Object[] mapToArray(Map data, String[] keys) { + Object[] ret = new Object[keys.length]; + for ( int i = 0; i < keys.length; ++i ) { + ret[i] = data.get( keys[i] ); + } + return ret; + } +} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/EntityTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/EntityTools.java new file mode 100644 index 0000000000..f0d36f41d1 --- /dev/null +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/EntityTools.java @@ -0,0 +1,86 @@ +package org.hibernate.envers.internal.tools; + +import javassist.util.proxy.ProxyFactory; + +import org.hibernate.Session; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.persister.entity.EntityPersister; +import org.hibernate.proxy.HibernateProxy; + +/** + * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) + */ +public abstract class EntityTools { + public static boolean entitiesEqual(SessionImplementor session, String entityName, Object obj1, Object obj2) { + Object id1 = getIdentifier( session, entityName, obj1 ); + Object id2 = getIdentifier( session, entityName, obj2 ); + + return Tools.objectsEqual( id1, id2 ); + } + + public static Object getIdentifier(SessionImplementor session, String entityName, Object obj) { + if ( obj == null ) { + return null; + } + + if ( obj instanceof HibernateProxy ) { + HibernateProxy hibernateProxy = (HibernateProxy) obj; + return hibernateProxy.getHibernateLazyInitializer().getIdentifier(); + } + + return session.getEntityPersister( entityName, obj ).getIdentifier( obj, session ); + } + + public static Object getTargetFromProxy(SessionFactoryImplementor sessionFactoryImplementor, HibernateProxy proxy) { + if ( !proxy.getHibernateLazyInitializer().isUninitialized() || activeProxySession( proxy ) ) { + return proxy.getHibernateLazyInitializer().getImplementation(); + } + + SessionImplementor sessionImplementor = proxy.getHibernateLazyInitializer().getSession(); + Session tempSession = sessionImplementor == null + ? sessionFactoryImplementor.openTemporarySession() + : sessionImplementor.getFactory().openTemporarySession(); + try { + Object target = tempSession.get( + proxy.getHibernateLazyInitializer().getEntityName(), + proxy.getHibernateLazyInitializer().getIdentifier() + ); + return target; + } + finally { + tempSession.close(); + } + } + + private static boolean activeProxySession(HibernateProxy proxy) { + Session session = (Session) proxy.getHibernateLazyInitializer().getSession(); + return session != null && session.isOpen() && session.isConnected(); + } + + /** + * @param clazz Class wrapped with a proxy or not. + * @param Class type. + * @return Returns target class in case it has been wrapped with a proxy. If {@code null} reference is passed, + * method returns {@code null}. + */ + @SuppressWarnings({ "unchecked" }) + public static Class getTargetClassIfProxied(Class clazz) { + if ( clazz == null ) { + return null; + } + else if ( ProxyFactory.isProxyClass( clazz ) ) { + // Get the source class of Javassist proxy instance. + return (Class) clazz.getSuperclass(); + } + return clazz; + } + + /** + * @return Java class mapped to specified entity name. + */ + public static Class getEntityClass(SessionImplementor sessionImplementor, Session session, String entityName) { + EntityPersister entityPersister = sessionImplementor.getFactory().getEntityPersister( entityName ); + return entityPersister.getMappedClass(); + } +} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MappingTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MappingTools.java new file mode 100644 index 0000000000..5060e96eb5 --- /dev/null +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MappingTools.java @@ -0,0 +1,43 @@ +package org.hibernate.envers.internal.tools; + +import org.hibernate.mapping.Collection; +import org.hibernate.mapping.OneToMany; +import org.hibernate.mapping.ToOne; +import org.hibernate.mapping.Value; + +/** + * @author Adam Warski (adam at warski dot org) + */ +public abstract class MappingTools { + /** + * @param componentName Name of the component, that is, name of the property in the entity that references the component. + * + * @return A prefix for properties in the given component. + */ + public static String createComponentPrefix(String componentName) { + return componentName + "_"; + } + + /** + * @param referencePropertyName The name of the property that holds the relation to the entity. + * + * @return A prefix which should be used to prefix an id mapper for the related entity. + */ + public static String createToOneRelationPrefix(String referencePropertyName) { + return referencePropertyName + "_"; + } + + public static String getReferencedEntityName(Value value) { + if ( value instanceof ToOne ) { + return ( (ToOne) value ).getReferencedEntityName(); + } + else if ( value instanceof OneToMany ) { + return ( (OneToMany) value ).getReferencedEntityName(); + } + else if ( value instanceof Collection ) { + return getReferencedEntityName( ( (Collection) value ).getElement() ); + } + + return null; + } +} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/MutableBoolean.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableBoolean.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/tools/MutableBoolean.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableBoolean.java index 0d1f5d6242..d0db6c9220 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/MutableBoolean.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableBoolean.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.tools; +package org.hibernate.envers.internal.tools; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/MutableInteger.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableInteger.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/tools/MutableInteger.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableInteger.java index cbfc2ccd78..bc48be544a 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/MutableInteger.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/MutableInteger.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.tools; +package org.hibernate.envers.internal.tools; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java new file mode 100644 index 0000000000..653013aafe --- /dev/null +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/ReflectionTools.java @@ -0,0 +1,142 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.envers.internal.tools; + +import java.util.Map; + +import org.hibernate.annotations.common.reflection.XClass; +import org.hibernate.annotations.common.reflection.XProperty; +import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; +import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; +import org.hibernate.cfg.Configuration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.PropertyData; +import org.hibernate.envers.tools.Pair; +import org.hibernate.internal.util.collections.ConcurrentReferenceHashMap; +import org.hibernate.property.Getter; +import org.hibernate.property.PropertyAccessor; +import org.hibernate.property.PropertyAccessorFactory; +import org.hibernate.property.Setter; + +/** + * @author Adam Warski (adam at warski dot org) + * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) + */ +public abstract class ReflectionTools { + private static final Map, Getter> getterCache = + new ConcurrentReferenceHashMap, Getter>( + 10, ConcurrentReferenceHashMap.ReferenceType.SOFT, ConcurrentReferenceHashMap.ReferenceType.SOFT + ); + private static final Map, Setter> setterCache = + new ConcurrentReferenceHashMap, Setter>( + 10, ConcurrentReferenceHashMap.ReferenceType.SOFT, ConcurrentReferenceHashMap.ReferenceType.SOFT + ); + + private static PropertyAccessor getAccessor(String accessorType) { + return PropertyAccessorFactory.getPropertyAccessor( accessorType ); + } + + public static Getter getGetter(Class cls, PropertyData propertyData) { + return getGetter( cls, propertyData.getBeanName(), propertyData.getAccessType() ); + } + + public static Getter getGetter(Class cls, String propertyName, String accessorType) { + Pair key = Pair.make( cls, propertyName ); + Getter value = getterCache.get( key ); + if ( value == null ) { + value = getAccessor( accessorType ).getGetter( cls, propertyName ); + // It's ok if two getters are generated concurrently + getterCache.put( key, value ); + } + + return value; + } + + public static Setter getSetter(Class cls, PropertyData propertyData) { + return getSetter( cls, propertyData.getBeanName(), propertyData.getAccessType() ); + } + + private static Setter getSetter(Class cls, String propertyName, String accessorType) { + Pair key = Pair.make( cls, propertyName ); + Setter value = setterCache.get( key ); + if ( value == null ) { + value = getAccessor( accessorType ).getSetter( cls, propertyName ); + // It's ok if two setters are generated concurrently + setterCache.put( key, value ); + } + + return value; + } + + /** + * @param clazz Source class. + * @param propertyName Property name. + * @return Property object or {@code null} if none with expected name has been found. + */ + public static XProperty getProperty(XClass clazz, String propertyName) { + XProperty property = getProperty( clazz, propertyName, "field" ); + if ( property == null ) { + property = getProperty( clazz, propertyName, "property" ); + } + return property; + } + + /** + * @param clazz Source class. + * @param propertyName Property name. + * @param accessType Expected access type. Legal values are field and property. + * @return Property object or {@code null} if none with expected name and access type has been found. + */ + public static XProperty getProperty(XClass clazz, String propertyName, String accessType) { + for ( XProperty property : clazz.getDeclaredProperties( accessType ) ) { + if ( propertyName.equals( property.getName() ) ) { + return property; + } + } + return null; + } + + /** + * Locate class with a given name. + * @param name Fully qualified class name. + * @param classLoaderService Class loading service. Passing {@code null} reference + * in case of {@link AuditConfiguration#getFor(Configuration)} usage. + * @return The cass reference. + * @throws ClassLoadingException Indicates the class could not be found. + */ + @SuppressWarnings("unchecked") + public static Class loadClass(String name, ClassLoaderService classLoaderService) throws ClassLoadingException { + try { + if ( classLoaderService != null ) { + return classLoaderService.classForName( name ); + } + else { + return (Class) Thread.currentThread().getContextClassLoader().loadClass( name ); + } + } + catch ( Exception e ) { + throw new ClassLoadingException( "Unable to load class [" + name + "]", e ); + } + } +} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java new file mode 100644 index 0000000000..e44d78f3e2 --- /dev/null +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/StringTools.java @@ -0,0 +1,77 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.envers.internal.tools; + +import java.util.Iterator; + +/** + * @author Adam Warski (adam at warski dot org) + */ +public abstract class StringTools { + public static boolean isEmpty(String s) { + return s == null || "".equals( s ); + } + + public static boolean isEmpty(Object o) { + return o == null || "".equals( o ); + } + + /** + * @param s String, from which to get the last component. + * + * @return The last component of the dot-separated string s. For example, for a string + * "a.b.c", the result is "c". + */ + public static String getLastComponent(String s) { + if ( s == null ) { + return null; + } + int lastDot = s.lastIndexOf( "." ); + if ( lastDot == -1 ) { + return s; + } + else { + return s.substring( lastDot + 1 ); + } + } + + /** + * To the given string builder, appends all strings in the given iterator, separating them with the given + * separator. For example, for an interator "a" "b" "c" and separator ":" the output is "a:b:c". + * + * @param sb String builder, to which to append. + * @param contents Strings to be appended. + * @param separator Separator between subsequent content. + */ + public static void append(StringBuilder sb, Iterator contents, String separator) { + boolean isFirst = true; + while ( contents.hasNext() ) { + if ( !isFirst ) { + sb.append( separator ); + } + sb.append( contents.next() ); + isFirst = false; + } + } +} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java new file mode 100644 index 0000000000..da7e29937e --- /dev/null +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Tools.java @@ -0,0 +1,103 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.envers.internal.tools; + +import java.util.ArrayList; +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 org.hibernate.envers.tools.Pair; + +/** + * @author Adam Warski (adam at warski dot org) + * @author HernпїЅn Chanfreau + * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) + */ +public abstract class Tools { + public static Map newHashMap() { + return new HashMap(); + } + + public static Set newHashSet() { + return new HashSet(); + } + + public static Map newLinkedHashMap() { + return new LinkedHashMap(); + } + + public static boolean objectsEqual(Object obj1, Object obj2) { + if ( obj1 == null ) { + return obj2 == null; + } + + return obj1.equals( obj2 ); + } + + public static List iteratorToList(Iterator iter) { + List ret = new ArrayList(); + while ( iter.hasNext() ) { + ret.add( iter.next() ); + } + + return ret; + } + + public static boolean iteratorsContentEqual(Iterator iter1, Iterator iter2) { + while ( iter1.hasNext() && iter2.hasNext() ) { + if ( !iter1.next().equals( iter2.next() ) ) { + return false; + } + } + + //noinspection RedundantIfStatement + if ( iter1.hasNext() || iter2.hasNext() ) { + return false; + } + + return true; + } + + /** + * Transforms a list of arbitrary elements to a list of index-element pairs. + * + * @param list List to transform. + * + * @return A list of pairs: ((0, element_at_index_0), (1, element_at_index_1), ...) + */ + public static List> listToIndexElementPairList(List list) { + List> ret = new ArrayList>(); + Iterator listIter = list.iterator(); + for ( int i = 0; i < list.size(); i++ ) { + ret.add( Pair.make( i, listIter.next() ) ); + } + + return ret; + } +} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/Triple.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Triple.java similarity index 98% rename from hibernate-envers/src/main/java/org/hibernate/envers/tools/Triple.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Triple.java index a64df2a027..c63c30f560 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/Triple.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/Triple.java @@ -21,8 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.tools; - +package org.hibernate.envers.internal.tools; /** * A triple of objects. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/GraphDefiner.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphDefiner.java similarity index 96% rename from hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/GraphDefiner.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphDefiner.java index b5b3d9c394..81856b16cd 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/GraphDefiner.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphDefiner.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.tools.graph; +package org.hibernate.envers.internal.tools.graph; import java.util.List; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/GraphTopologicalSort.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphTopologicalSort.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/GraphTopologicalSort.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphTopologicalSort.java index fca60751e7..bd79f46540 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/GraphTopologicalSort.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/GraphTopologicalSort.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.tools.graph; +package org.hibernate.envers.internal.tools.graph; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/TopologicalSort.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/TopologicalSort.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/TopologicalSort.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/TopologicalSort.java index 5d1b12349d..da68cdebea 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/TopologicalSort.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/TopologicalSort.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.tools.graph; +package org.hibernate.envers.internal.tools.graph; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/Vertex.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/Vertex.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/Vertex.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/Vertex.java index 1d394017e6..c15035d7b7 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/graph/Vertex.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/graph/Vertex.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.tools.graph; +package org.hibernate.envers.internal.tools.graph; import java.util.ArrayList; import java.util.List; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/query/Parameters.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/Parameters.java similarity index 98% rename from hibernate-envers/src/main/java/org/hibernate/envers/tools/query/Parameters.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/Parameters.java index 45bdc34581..929b8b116f 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/query/Parameters.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/Parameters.java @@ -21,14 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.tools.query; +package org.hibernate.envers.internal.tools.query; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hibernate.envers.tools.MutableBoolean; -import org.hibernate.envers.tools.MutableInteger; +import org.hibernate.envers.internal.tools.MutableBoolean; +import org.hibernate.envers.internal.tools.MutableInteger; /** * Parameters of a query, built using {@link QueryBuilder}. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/query/QueryBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java similarity index 97% rename from hibernate-envers/src/main/java/org/hibernate/envers/tools/query/QueryBuilder.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java index 10cef5731b..21414a4a0b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/query/QueryBuilder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/QueryBuilder.java @@ -21,7 +21,8 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.tools.query; +package org.hibernate.envers.internal.tools.query; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -29,9 +30,9 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.hibernate.envers.tools.MutableInteger; +import org.hibernate.envers.internal.tools.MutableInteger; +import org.hibernate.envers.internal.tools.StringTools; import org.hibernate.envers.tools.Pair; -import org.hibernate.envers.tools.StringTools; /** * A class for incrementaly building a HQL query. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/query/UpdateBuilder.java b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java similarity index 91% rename from hibernate-envers/src/main/java/org/hibernate/envers/tools/query/UpdateBuilder.java rename to hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java index 0707e81a4f..99729fd1eb 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/query/UpdateBuilder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/internal/tools/query/UpdateBuilder.java @@ -1,15 +1,11 @@ -package org.hibernate.envers.tools.query; +package org.hibernate.envers.internal.tools.query; + +import java.util.HashMap; +import java.util.Map; import org.hibernate.Query; import org.hibernate.Session; -import org.hibernate.envers.tools.MutableInteger; -import org.hibernate.envers.tools.Pair; -import org.hibernate.envers.tools.StringTools; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.hibernate.envers.internal.tools.MutableInteger; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditEntity.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditEntity.java index a59f1b9eb7..a6df9c09e3 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditEntity.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditEntity.java @@ -31,12 +31,12 @@ import org.hibernate.envers.query.criteria.AuditId; import org.hibernate.envers.query.criteria.AuditProperty; import org.hibernate.envers.query.criteria.AuditRelatedId; -import org.hibernate.envers.query.criteria.LogicalAuditExpression; -import org.hibernate.envers.query.criteria.NotAuditExpression; -import org.hibernate.envers.query.property.EntityPropertyName; -import org.hibernate.envers.query.property.RevisionNumberPropertyName; -import org.hibernate.envers.query.property.RevisionPropertyPropertyName; -import org.hibernate.envers.query.property.RevisionTypePropertyName; +import org.hibernate.envers.query.criteria.internal.LogicalAuditExpression; +import org.hibernate.envers.query.criteria.internal.NotAuditExpression; +import org.hibernate.envers.query.internal.property.EntityPropertyName; +import org.hibernate.envers.query.internal.property.RevisionNumberPropertyName; +import org.hibernate.envers.query.internal.property.RevisionPropertyPropertyName; +import org.hibernate.envers.query.internal.property.RevisionTypePropertyName; /** * TODO: ilike diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java index 0bd8c4f063..a682cc8dd6 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java @@ -23,15 +23,15 @@ */ package org.hibernate.envers.query; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.query.impl.EntitiesAtRevisionQuery; -import org.hibernate.envers.query.impl.EntitiesModifiedAtRevisionQuery; -import org.hibernate.envers.query.impl.RevisionsOfEntityQuery; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.query.internal.impl.EntitiesAtRevisionQuery; +import org.hibernate.envers.query.internal.impl.EntitiesModifiedAtRevisionQuery; +import org.hibernate.envers.query.internal.impl.RevisionsOfEntityQuery; -import static org.hibernate.envers.tools.ArgumentsTools.checkNotNull; -import static org.hibernate.envers.tools.ArgumentsTools.checkPositive; -import static org.hibernate.envers.tools.Tools.getTargetClassIfProxied; +import static org.hibernate.envers.internal.tools.ArgumentsTools.checkNotNull; +import static org.hibernate.envers.internal.tools.ArgumentsTools.checkPositive; +import static org.hibernate.envers.internal.tools.EntityTools.getTargetClassIfProxied; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java index 23077445a4..1bd81eae31 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java @@ -22,14 +22,16 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.envers.query.criteria; + import java.util.ArrayList; import java.util.List; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.query.property.PropertyNameGetter; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.internal.CriteriaTools; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditConjunction.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditConjunction.java index 8c5b28d460..88db0426c5 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditConjunction.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditConjunction.java @@ -22,13 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.envers.query.criteria; + import java.util.ArrayList; import java.util.List; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditCriterion.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditCriterion.java index cdc53caa8b..5be631cb23 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditCriterion.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditCriterion.java @@ -23,10 +23,10 @@ */ package org.hibernate.envers.query.criteria; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditDisjunction.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditDisjunction.java index 401bcfa0d5..4693f6374c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditDisjunction.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditDisjunction.java @@ -22,13 +22,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.envers.query.criteria; + import java.util.ArrayList; import java.util.List; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditId.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditId.java index 08f5bd5823..08e5f138b4 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditId.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditId.java @@ -23,11 +23,12 @@ */ package org.hibernate.envers.query.criteria; +import org.hibernate.envers.query.criteria.internal.IdentifierEqAuditExpression; import org.hibernate.envers.query.projection.AuditProjection; -import org.hibernate.envers.query.projection.PropertyAuditProjection; -import org.hibernate.envers.query.property.EntityPropertyName; -import org.hibernate.envers.query.property.OriginalIdPropertyName; -import org.hibernate.envers.query.property.PropertyNameGetter; +import org.hibernate.envers.query.projection.internal.PropertyAuditProjection; +import org.hibernate.envers.query.internal.property.EntityPropertyName; +import org.hibernate.envers.query.internal.property.OriginalIdPropertyName; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * Create restrictions and projections for the id of an audited entity. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java index 1b2211e2a8..a7824ea494 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditProperty.java @@ -21,19 +21,25 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ - package org.hibernate.envers.query.criteria; + import java.util.Collection; import org.hibernate.criterion.MatchMode; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.tools.Triple; +import org.hibernate.envers.query.criteria.internal.BetweenAuditExpression; +import org.hibernate.envers.query.criteria.internal.InAuditExpression; +import org.hibernate.envers.query.criteria.internal.NotNullAuditExpression; +import org.hibernate.envers.query.criteria.internal.NullAuditExpression; +import org.hibernate.envers.query.criteria.internal.PropertyAuditExpression; +import org.hibernate.envers.query.criteria.internal.SimpleAuditExpression; import org.hibernate.envers.query.order.AuditOrder; -import org.hibernate.envers.query.order.PropertyAuditOrder; +import org.hibernate.envers.query.order.internal.PropertyAuditOrder; import org.hibernate.envers.query.projection.AuditProjection; -import org.hibernate.envers.query.projection.PropertyAuditProjection; -import org.hibernate.envers.query.property.ModifiedFlagPropertyName; -import org.hibernate.envers.query.property.PropertyNameGetter; -import org.hibernate.envers.tools.Triple; +import org.hibernate.envers.query.projection.internal.PropertyAuditProjection; +import org.hibernate.envers.query.internal.property.ModifiedFlagPropertyName; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * Create restrictions, projections and specify order for a property of an audited entity. @@ -194,8 +200,7 @@ public AuditCriterion isNotNull() { * property */ public AggregatedAuditExpression maximize() { - return new AggregatedAuditExpression(propertyNameGetter, - AggregatedAuditExpression.AggregatedMode.MAX); + return new AggregatedAuditExpression(propertyNameGetter, AggregatedAuditExpression.AggregatedMode.MAX); } /** @@ -203,8 +208,7 @@ public AggregatedAuditExpression maximize() { * property */ public AggregatedAuditExpression minimize() { - return new AggregatedAuditExpression(propertyNameGetter, - AggregatedAuditExpression.AggregatedMode.MIN); + return new AggregatedAuditExpression(propertyNameGetter, AggregatedAuditExpression.AggregatedMode.MIN); } // Projections diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditRelatedId.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditRelatedId.java index 60a81d178d..c18cac02eb 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditRelatedId.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AuditRelatedId.java @@ -21,9 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ - package org.hibernate.envers.query.criteria; -import org.hibernate.envers.query.property.PropertyNameGetter; + +import org.hibernate.envers.query.criteria.internal.RelatedAuditExpression; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * Create restrictions on an id of an entity related to an audited entity. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/BetweenAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/BetweenAuditExpression.java similarity index 82% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/BetweenAuditExpression.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/BetweenAuditExpression.java index 14f44a81e1..e86e65744b 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/BetweenAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/BetweenAuditExpression.java @@ -21,12 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.query.property.PropertyNameGetter; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +package org.hibernate.envers.query.criteria.internal; + +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.AuditCriterion; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/CriteriaTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/CriteriaTools.java similarity index 86% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/CriteriaTools.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/CriteriaTools.java index 46bb2ebfde..6bf447f165 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/CriteriaTools.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/CriteriaTools.java @@ -21,21 +21,20 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; +package org.hibernate.envers.query.criteria.internal; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.RelationDescription; -import org.hibernate.envers.entities.RelationType; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.query.property.PropertyNameGetter; -import org.hibernate.envers.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.entities.RelationDescription; +import org.hibernate.envers.internal.entities.RelationType; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.query.criteria.AuditId; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * @author Adam Warski (adam at warski dot org) */ -public class CriteriaTools { - private CriteriaTools() { } - +public abstract class CriteriaTools { public static void checkPropertyNotARelation(AuditConfiguration verCfg, String entityName, String propertyName) throws AuditException { if (verCfg.getEntCfg().get(entityName).isRelation(propertyName)) { @@ -73,7 +72,7 @@ public static String determinePropertyName(AuditConfiguration auditCfg, AuditRea * @param versionsReader Versions reader. * @param entityName Original entity name (not audited). * @param propertyName Property name or placeholder. - * @return Path to property. Handles identifier placeholder used by {@link AuditId}. + * @return Path to property. Handles identifier placeholder used by {@link org.hibernate.envers.query.criteria.AuditId}. */ public static String determinePropertyName(AuditConfiguration auditCfg, AuditReaderImplementor versionsReader, String entityName, String propertyName) { diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/IdentifierEqAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IdentifierEqAuditExpression.java similarity index 83% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/IdentifierEqAuditExpression.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IdentifierEqAuditExpression.java index a6346aad01..1e916c987c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/IdentifierEqAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IdentifierEqAuditExpression.java @@ -21,11 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +package org.hibernate.envers.query.criteria.internal; + +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.AuditCriterion; /** * A criterion that expresses that the id of an entity is equal or not equal to some specified value. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/InAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/InAuditExpression.java similarity index 78% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/InAuditExpression.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/InAuditExpression.java index 1c2e5b3165..ea009093e4 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/InAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/InAuditExpression.java @@ -21,13 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; +package org.hibernate.envers.query.criteria.internal; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.query.property.PropertyNameGetter; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.AuditCriterion; +import org.hibernate.envers.query.criteria.internal.CriteriaTools; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/LogicalAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/LogicalAuditExpression.java similarity index 83% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/LogicalAuditExpression.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/LogicalAuditExpression.java index 5ab9f0612e..d0f213965e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/LogicalAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/LogicalAuditExpression.java @@ -21,11 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +package org.hibernate.envers.query.criteria.internal; + +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.AuditCriterion; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/NotAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotAuditExpression.java similarity index 81% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/NotAuditExpression.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotAuditExpression.java index 85e1ac5dbf..cfb5d016ba 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/NotAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotAuditExpression.java @@ -21,12 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; +package org.hibernate.envers.query.criteria.internal; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.AuditCriterion; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/NotNullAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotNullAuditExpression.java similarity index 79% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/NotNullAuditExpression.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotNullAuditExpression.java index 6c6f1806d3..1a3bfc855e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/NotNullAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NotNullAuditExpression.java @@ -21,14 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; +package org.hibernate.envers.query.criteria.internal; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.RelationDescription; -import org.hibernate.envers.query.property.PropertyNameGetter; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.RelationDescription; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.AuditCriterion; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/NullAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NullAuditExpression.java similarity index 79% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/NullAuditExpression.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NullAuditExpression.java index d18a183bf4..5bfa5d97db 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/NullAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/NullAuditExpression.java @@ -21,14 +21,15 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; +package org.hibernate.envers.query.criteria.internal; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.RelationDescription; -import org.hibernate.envers.query.property.PropertyNameGetter; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.RelationDescription; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.AuditCriterion; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/PropertyAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/PropertyAuditExpression.java similarity index 82% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/PropertyAuditExpression.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/PropertyAuditExpression.java index e3347c38f9..ba2e6d741d 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/PropertyAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/PropertyAuditExpression.java @@ -21,13 +21,14 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; +package org.hibernate.envers.query.criteria.internal; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.query.property.PropertyNameGetter; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.AuditCriterion; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/RelatedAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RelatedAuditExpression.java similarity index 81% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/RelatedAuditExpression.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RelatedAuditExpression.java index 6d2bb74b9e..8feefad4ac 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/RelatedAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RelatedAuditExpression.java @@ -21,15 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; +package org.hibernate.envers.query.criteria.internal; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.RelationDescription; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.query.property.PropertyNameGetter; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.internal.entities.RelationDescription; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.AuditCriterion; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/RevisionTypeAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RevisionTypeAuditExpression.java similarity index 81% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/RevisionTypeAuditExpression.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RevisionTypeAuditExpression.java index ece2c48226..59f7b1b802 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/RevisionTypeAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/RevisionTypeAuditExpression.java @@ -21,12 +21,13 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; +package org.hibernate.envers.query.criteria.internal; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.AuditCriterion; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/SimpleAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/SimpleAuditExpression.java similarity index 83% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/SimpleAuditExpression.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/SimpleAuditExpression.java index 121deef5b2..8307a90654 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/SimpleAuditExpression.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/SimpleAuditExpression.java @@ -21,15 +21,16 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.criteria; +package org.hibernate.envers.query.criteria.internal; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.RelationDescription; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; -import org.hibernate.envers.query.property.PropertyNameGetter; -import org.hibernate.envers.reader.AuditReaderImplementor; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.internal.entities.RelationDescription; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; +import org.hibernate.envers.query.criteria.AuditCriterion; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/AbstractAuditQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/impl/AbstractAuditQuery.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java index a3d8863a26..ec891363a0 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/AbstractAuditQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/AbstractAuditQuery.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.impl; +package org.hibernate.envers.query.internal.impl; import java.util.ArrayList; import java.util.List; @@ -33,20 +33,20 @@ import org.hibernate.LockMode; import org.hibernate.LockOptions; import org.hibernate.Query; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.entities.EntityInstantiator; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; +import org.hibernate.envers.internal.entities.EntityInstantiator; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; +import org.hibernate.envers.internal.tools.Triple; +import org.hibernate.envers.internal.tools.query.QueryBuilder; import org.hibernate.envers.query.AuditQuery; import org.hibernate.envers.query.criteria.AuditCriterion; -import org.hibernate.envers.query.criteria.CriteriaTools; +import org.hibernate.envers.query.criteria.internal.CriteriaTools; import org.hibernate.envers.query.order.AuditOrder; import org.hibernate.envers.query.projection.AuditProjection; -import org.hibernate.envers.reader.AuditReaderImplementor; import org.hibernate.envers.tools.Pair; -import org.hibernate.envers.tools.Triple; -import org.hibernate.envers.tools.query.QueryBuilder; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionQuery.java similarity index 87% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionQuery.java index e2df3aafe2..4f05d4f568 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesAtRevisionQuery.java @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.impl; +package org.hibernate.envers.query.internal.impl; import java.util.ArrayList; import java.util.Arrays; @@ -29,15 +29,15 @@ import org.hibernate.Query; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; import org.hibernate.envers.query.criteria.AuditCriterion; -import org.hibernate.envers.reader.AuditReaderImplementor; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REFERENCED_ENTITY_ALIAS_DEF_AUD_STR; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/EntitiesModifiedAtRevisionQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesModifiedAtRevisionQuery.java similarity index 89% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/impl/EntitiesModifiedAtRevisionQuery.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesModifiedAtRevisionQuery.java index 391df73533..deb8f41b06 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/EntitiesModifiedAtRevisionQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/EntitiesModifiedAtRevisionQuery.java @@ -1,13 +1,13 @@ -package org.hibernate.envers.query.impl; +package org.hibernate.envers.query.internal.impl; import java.util.ArrayList; import java.util.List; import org.hibernate.Query; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; import org.hibernate.envers.query.criteria.AuditCriterion; -import org.hibernate.envers.reader.AuditReaderImplementor; /** * In comparison to {@link EntitiesAtRevisionQuery} this query returns an empty collection if an entity diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/RevisionsOfEntityQuery.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java similarity index 95% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/impl/RevisionsOfEntityQuery.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java index a33eb533c0..93ca0742d3 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/impl/RevisionsOfEntityQuery.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/impl/RevisionsOfEntityQuery.java @@ -21,17 +21,18 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.impl; +package org.hibernate.envers.query.internal.impl; + import java.util.ArrayList; import java.util.List; import java.util.Map; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.exception.AuditException; +import org.hibernate.envers.internal.reader.AuditReaderImplementor; import org.hibernate.envers.query.criteria.AuditCriterion; -import org.hibernate.envers.reader.AuditReaderImplementor; import org.hibernate.proxy.HibernateProxy; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/EntityPropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/EntityPropertyName.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/property/EntityPropertyName.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/EntityPropertyName.java index e872cf233f..7174136bca 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/EntityPropertyName.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/EntityPropertyName.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ +package org.hibernate.envers.query.internal.property; -package org.hibernate.envers.query.property; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; /** * Used for specifying restrictions on a property of an audited entity. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/ModifiedFlagPropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/ModifiedFlagPropertyName.java similarity index 89% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/property/ModifiedFlagPropertyName.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/ModifiedFlagPropertyName.java index af9deb170c..de4cedef35 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/ModifiedFlagPropertyName.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/ModifiedFlagPropertyName.java @@ -21,10 +21,10 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ +package org.hibernate.envers.query.internal.property; -package org.hibernate.envers.query.property; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.configuration.metadata.MetadataTools; +import org.hibernate.envers.configuration.internal.metadata.MetadataTools; +import org.hibernate.envers.configuration.spi.AuditConfiguration; /** * PropertyNameGetter for modified flags diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/OriginalIdPropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/OriginalIdPropertyName.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/property/OriginalIdPropertyName.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/OriginalIdPropertyName.java index 58044944d1..a6cbcbd462 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/OriginalIdPropertyName.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/OriginalIdPropertyName.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.envers.query.property; +package org.hibernate.envers.query.internal.property; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.query.criteria.AuditId; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/PropertyNameGetter.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/PropertyNameGetter.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/property/PropertyNameGetter.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/PropertyNameGetter.java index 9729c1edea..e49475e23e 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/PropertyNameGetter.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/PropertyNameGetter.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ +package org.hibernate.envers.query.internal.property; -package org.hibernate.envers.query.property; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; /** * Provides a function to get the name of a property, which is used in a query, to apply some restrictions on it. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/RevisionNumberPropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionNumberPropertyName.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/property/RevisionNumberPropertyName.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionNumberPropertyName.java index 62e2d230e2..60530df288 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/RevisionNumberPropertyName.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionNumberPropertyName.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ +package org.hibernate.envers.query.internal.property; -package org.hibernate.envers.query.property; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; /** * Used for specifying restrictions on the revision number, corresponding to an audit entity. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/RevisionPropertyPropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionPropertyPropertyName.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/property/RevisionPropertyPropertyName.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionPropertyPropertyName.java index f5feed0486..93d300e223 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/RevisionPropertyPropertyName.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionPropertyPropertyName.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ +package org.hibernate.envers.query.internal.property; -package org.hibernate.envers.query.property; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; /** * Used for specifying restrictions on a property of the revision entity, which is associated with an audit entity. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/RevisionTypePropertyName.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionTypePropertyName.java similarity index 92% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/property/RevisionTypePropertyName.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionTypePropertyName.java index ff8c96c5e2..772015d0ee 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/property/RevisionTypePropertyName.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/internal/property/RevisionTypePropertyName.java @@ -21,9 +21,9 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ +package org.hibernate.envers.query.internal.property; -package org.hibernate.envers.query.property; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; /** * Used for specifying restrictions on the revision number, corresponding to an audit entity. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/order/AuditOrder.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/order/AuditOrder.java index be0ae95e13..8575fc7115 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/order/AuditOrder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/order/AuditOrder.java @@ -22,7 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.envers.query.order; -import org.hibernate.envers.configuration.AuditConfiguration; + +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.envers.tools.Pair; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/order/PropertyAuditOrder.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/order/internal/PropertyAuditOrder.java similarity index 86% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/order/PropertyAuditOrder.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/order/internal/PropertyAuditOrder.java index b2c05c864b..77ec0470f1 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/order/PropertyAuditOrder.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/order/internal/PropertyAuditOrder.java @@ -21,10 +21,11 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ +package org.hibernate.envers.query.order.internal; -package org.hibernate.envers.query.order; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.query.property.PropertyNameGetter; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; +import org.hibernate.envers.query.order.AuditOrder; import org.hibernate.envers.tools.Pair; /** diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/AuditProjection.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/AuditProjection.java index 4fae8ced65..469909787c 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/AuditProjection.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/AuditProjection.java @@ -22,8 +22,9 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.envers.query.projection; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.tools.Triple; + +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.tools.Triple; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/PropertyAuditProjection.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/internal/PropertyAuditProjection.java similarity index 85% rename from hibernate-envers/src/main/java/org/hibernate/envers/query/projection/PropertyAuditProjection.java rename to hibernate-envers/src/main/java/org/hibernate/envers/query/projection/internal/PropertyAuditProjection.java index 7038ed2fac..9e3a4ee2a6 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/PropertyAuditProjection.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/query/projection/internal/PropertyAuditProjection.java @@ -21,11 +21,12 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ +package org.hibernate.envers.query.projection.internal; -package org.hibernate.envers.query.projection; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.query.property.PropertyNameGetter; -import org.hibernate.envers.tools.Triple; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.tools.Triple; +import org.hibernate.envers.query.internal.property.PropertyNameGetter; +import org.hibernate.envers.query.projection.AuditProjection; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/AuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/AuditStrategy.java index 3a84d1ecb3..d5c37fb119 100755 --- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/AuditStrategy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/AuditStrategy.java @@ -4,12 +4,12 @@ import org.hibernate.Session; import org.hibernate.collection.spi.PersistentCollection; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.configuration.GlobalConfiguration; -import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.tools.query.QueryBuilder; /** * Behaviours of different audit strategy for populating audit data. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java index 5959c75d94..5e0cf2e4e5 100755 --- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/DefaultAuditStrategy.java @@ -3,17 +3,17 @@ import java.io.Serializable; import org.hibernate.Session; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.configuration.GlobalConfiguration; -import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.synchronization.SessionCacheCleaner; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.synchronization.SessionCacheCleaner; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS_DEF_AUD_STR; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS_DEF_AUD_STR; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; /** * Default strategy is to simply persist the audit data. diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java index 6e2c6cc808..4fb451473d 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidityAuditStrategy.java @@ -1,8 +1,5 @@ package org.hibernate.envers.strategy; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; -import static org.hibernate.envers.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; - import java.io.Serializable; import java.sql.Connection; import java.sql.PreparedStatement; @@ -13,21 +10,23 @@ import java.util.Map; import java.util.Set; +import org.jboss.logging.Logger; + import org.hibernate.LockOptions; import org.hibernate.Session; import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.envers.RevisionType; -import org.hibernate.envers.configuration.AuditConfiguration; -import org.hibernate.envers.configuration.AuditEntitiesConfiguration; -import org.hibernate.envers.configuration.GlobalConfiguration; -import org.hibernate.envers.entities.mapper.PersistentCollectionChangeData; -import org.hibernate.envers.entities.mapper.relation.MiddleComponentData; -import org.hibernate.envers.entities.mapper.relation.MiddleIdData; -import org.hibernate.envers.synchronization.SessionCacheCleaner; -import org.hibernate.envers.tools.query.Parameters; -import org.hibernate.envers.tools.query.QueryBuilder; +import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration; +import org.hibernate.envers.configuration.internal.GlobalConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; +import org.hibernate.envers.internal.entities.mapper.PersistentCollectionChangeData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleComponentData; +import org.hibernate.envers.internal.entities.mapper.relation.MiddleIdData; +import org.hibernate.envers.internal.synchronization.SessionCacheCleaner; +import org.hibernate.envers.internal.tools.query.Parameters; +import org.hibernate.envers.internal.tools.query.QueryBuilder; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.AutoFlushEvent; import org.hibernate.event.spi.AutoFlushEventListener; @@ -41,7 +40,9 @@ import org.hibernate.type.CollectionType; import org.hibernate.type.ComponentType; import org.hibernate.type.Type; -import org.jboss.logging.Logger; + +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.MIDDLE_ENTITY_ALIAS; +import static org.hibernate.envers.internal.entities.mapper.relation.query.QueryConstants.REVISION_PARAMETER; /** * Audit strategy which persists and retrieves audit information using a validity algorithm, based on the diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/ArgumentsTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/tools/ArgumentsTools.java deleted file mode 100644 index 688b18367e..0000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/ArgumentsTools.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.envers.tools; - - -/** - * @author Adam Warski (adam at warski dot org) - */ -public class ArgumentsTools { - public static void checkNotNull(Object o, String paramName) { - if (o == null) { - throw new IllegalArgumentException(paramName + " cannot be null."); - } - } - - public static void checkPositive(Number i, String paramName) { - if (i.longValue() <= 0l) { - throw new IllegalArgumentException(paramName + " has to be greater than 0."); - } - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/MappingTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/tools/MappingTools.java deleted file mode 100644 index 71a69a9457..0000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/MappingTools.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.hibernate.envers.tools; -import org.hibernate.mapping.Collection; -import org.hibernate.mapping.OneToMany; -import org.hibernate.mapping.ToOne; -import org.hibernate.mapping.Value; - -/** - * @author Adam Warski (adam at warski dot org) - */ -public class MappingTools { - /** - * @param componentName Name of the component, that is, name of the property in the entity that references the - * component. - * @return A prefix for properties in the given component. - */ - public static String createComponentPrefix(String componentName) { - return componentName + "_"; - } - - /** - * @param referencePropertyName The name of the property that holds the relation to the entity. - * @return A prefix which should be used to prefix an id mapper for the related entity. - */ - public static String createToOneRelationPrefix(String referencePropertyName) { - return referencePropertyName + "_"; - } - - public static String getReferencedEntityName(Value value) { - if (value instanceof ToOne) { - return ((ToOne) value).getReferencedEntityName(); - } else if (value instanceof OneToMany) { - return ((OneToMany) value).getReferencedEntityName(); - } else if (value instanceof Collection) { - return getReferencedEntityName(((Collection) value).getElement()); - } - - return null; - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/Pair.java b/hibernate-envers/src/main/java/org/hibernate/envers/tools/Pair.java index af968ebdff..7ac039ba00 100644 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/Pair.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/tools/Pair.java @@ -23,7 +23,6 @@ */ package org.hibernate.envers.tools; - /** * A pair of objects. * @param diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/StringTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/tools/StringTools.java deleted file mode 100644 index 09f955064e..0000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/StringTools.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.envers.tools; -import java.util.Iterator; - -/** - * @author Adam Warski (adam at warski dot org) - */ -public class StringTools { - public static boolean isEmpty(String s) { - return s == null || "".equals(s); - } - - public static boolean isEmpty(Object o) { - return o == null || "".equals(o); - } - - /** - * @param s String, from which to get the last component. - * @return The last component of the dot-separated string s. For example, for a string - * "a.b.c", the result is "c". - */ - public static String getLastComponent(String s) { - if (s == null) { - return null; - } - - int lastDot = s.lastIndexOf("."); - if (lastDot == -1) { - return s; - } else { - return s.substring(lastDot + 1); - } - } - - /** - * To the given string builder, appends all strings in the given iterator, separating them with the given - * separator. For example, for an interator "a" "b" "c" and separator ":" the output is "a:b:c". - * @param sb String builder, to which to append. - * @param contents Strings to be appended. - * @param separator Separator between subsequent content. - */ - public static void append(StringBuilder sb, Iterator contents, String separator) { - boolean isFirst = true; - - while (contents.hasNext()) { - if (!isFirst) { - sb.append(separator); - } - - sb.append(contents.next()); - - isFirst = false; - } - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java b/hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java deleted file mode 100644 index 5f388b9075..0000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java +++ /dev/null @@ -1,253 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.envers.tools; -import java.util.ArrayList; -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.Properties; -import java.util.Set; - -import javassist.util.proxy.ProxyFactory; - -import org.hibernate.Session; -import org.hibernate.annotations.common.reflection.XClass; -import org.hibernate.annotations.common.reflection.XProperty; -import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.engine.spi.SessionImplementor; -import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.proxy.HibernateProxy; - -/** - * @author Adam Warski (adam at warski dot org) - * @author HernпїЅn Chanfreau - * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) - */ -public class Tools { - public static Map newHashMap() { - return new HashMap(); - } - - public static Set newHashSet() { - return new HashSet(); - } - - public static Map newLinkedHashMap() { - return new LinkedHashMap(); - } - - public static boolean entitiesEqual(SessionImplementor session, String entityName, Object obj1, Object obj2) { - Object id1 = getIdentifier(session, entityName, obj1); - Object id2 = getIdentifier(session, entityName, obj2); - - return objectsEqual(id1, id2); - } - - public static Object getIdentifier(SessionImplementor session, String entityName, Object obj) { - if (obj == null) { - return null; - } - - if (obj instanceof HibernateProxy) { - HibernateProxy hibernateProxy = (HibernateProxy) obj; - return hibernateProxy.getHibernateLazyInitializer().getIdentifier(); - } - - return session.getEntityPersister(entityName, obj).getIdentifier(obj, session); - } - - - public static Object getTargetFromProxy(SessionFactoryImplementor sessionFactoryImplementor, HibernateProxy proxy) { - if (!proxy.getHibernateLazyInitializer().isUninitialized() || activeProxySession(proxy)) { - return proxy.getHibernateLazyInitializer().getImplementation(); - } - - SessionImplementor sessionImplementor = proxy.getHibernateLazyInitializer().getSession(); - Session tempSession = sessionImplementor==null - ? sessionFactoryImplementor.openTemporarySession() - : sessionImplementor.getFactory().openTemporarySession(); - try { - Object target = tempSession.get( - proxy.getHibernateLazyInitializer().getEntityName(), - proxy.getHibernateLazyInitializer().getIdentifier() - ); - return target; - } - finally { - tempSession.close(); - } - } - - private static boolean activeProxySession(HibernateProxy proxy) { - Session session = (Session) proxy.getHibernateLazyInitializer().getSession(); - return session != null && session.isOpen() && session.isConnected(); - } - - /** - * @param clazz Class wrapped with a proxy or not. - * @param Class type. - * @return Returns target class in case it has been wrapped with a proxy. If {@code null} reference is passed, - * method returns {@code null}. - */ - @SuppressWarnings({"unchecked"}) - public static Class getTargetClassIfProxied(Class clazz) { - if (clazz == null) { - return null; - } else if (ProxyFactory.isProxyClass(clazz)) { - // Get the source class of Javassist proxy instance. - return (Class) clazz.getSuperclass(); - } - return clazz; - } - - public static boolean objectsEqual(Object obj1, Object obj2) { - if (obj1 == null) { - return obj2 == null; - } - - return obj1.equals(obj2); - } - - public static boolean arraysEqual(Object[] array1, Object[] array2) { - if (array1 == null) return array2 == null; - if (array2 == null || array1.length != array2.length) return false; - for (int i = 0; i < array1.length; ++i) { - if (array1[i] != null ? !array1[i].equals(array2[i]) : array2[i] != null) { - return false; - } - } - return true; - } - - public static List iteratorToList(Iterator iter) { - List ret = new ArrayList(); - while (iter.hasNext()) { - ret.add(iter.next()); - } - - return ret; - } - - public static boolean iteratorsContentEqual(Iterator iter1, Iterator iter2) { - while (iter1.hasNext() && iter2.hasNext()) { - if (!iter1.next().equals(iter2.next())) { - return false; - } - } - - //noinspection RedundantIfStatement - if (iter1.hasNext() || iter2.hasNext()) { - return false; - } - - return true; - } - - /** - * Transforms a list of arbitrary elements to a list of index-element pairs. - * @param list List to transform. - * @return A list of pairs: ((0, element_at_index_0), (1, element_at_index_1), ...) - */ - public static List> listToIndexElementPairList(List list) { - List> ret = new ArrayList>(); - Iterator listIter = list.iterator(); - for (int i=0; i data, String[] keys) { - Object[] ret = new Object[keys.length]; - for (int i = 0; i < keys.length; ++i) { - ret[i] = data.get(keys[i]); - } - return ret; - } - - /** - * @param clazz Source class. - * @param propertyName Property name. - * @return Property object or {@code null} if none with expected name has been found. - */ - public static XProperty getProperty(XClass clazz, String propertyName) { - XProperty property = getProperty(clazz, propertyName, "field"); - if (property == null) { - property = getProperty(clazz, propertyName, "property"); - } - return property; - } - - /** - * @param clazz Source class. - * @param propertyName Property name. - * @param accessType Expected access type. Legal values are field and property. - * @return Property object or {@code null} if none with expected name and access type has been found. - */ - public static XProperty getProperty(XClass clazz, String propertyName, String accessType) { - for (XProperty property : clazz.getDeclaredProperties(accessType)) { - if (propertyName.equals(property.getName())) { - return property; - } - } - return null; - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/tool/EnversSchemaGenerator.java b/hibernate-envers/src/main/java/org/hibernate/envers/tools/hbm2ddl/EnversSchemaGenerator.java similarity index 93% rename from hibernate-envers/src/main/java/org/hibernate/tool/EnversSchemaGenerator.java rename to hibernate-envers/src/main/java/org/hibernate/envers/tools/hbm2ddl/EnversSchemaGenerator.java index c5701cb244..de20ea4463 100644 --- a/hibernate-envers/src/main/java/org/hibernate/tool/EnversSchemaGenerator.java +++ b/hibernate-envers/src/main/java/org/hibernate/envers/tools/hbm2ddl/EnversSchemaGenerator.java @@ -1,11 +1,11 @@ -package org.hibernate.tool; +package org.hibernate.envers.tools.hbm2ddl; import java.sql.Connection; import java.util.Properties; import org.hibernate.HibernateException; import org.hibernate.cfg.Configuration; -import org.hibernate.envers.configuration.AuditConfiguration; +import org.hibernate.envers.configuration.spi.AuditConfiguration; import org.hibernate.service.ServiceRegistry; import org.hibernate.tool.hbm2ddl.SchemaExport; diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/tools/reflection/ReflectionTools.java b/hibernate-envers/src/main/java/org/hibernate/envers/tools/reflection/ReflectionTools.java deleted file mode 100644 index da7908aa1d..0000000000 --- a/hibernate-envers/src/main/java/org/hibernate/envers/tools/reflection/ReflectionTools.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.envers.tools.reflection; -import static org.hibernate.envers.tools.Pair.make; - -import java.util.Map; - -import org.hibernate.envers.entities.PropertyData; -import org.hibernate.envers.tools.Pair; -import org.hibernate.internal.util.collections.ConcurrentReferenceHashMap; -import org.hibernate.property.Getter; -import org.hibernate.property.PropertyAccessor; -import org.hibernate.property.PropertyAccessorFactory; -import org.hibernate.property.Setter; - -/** - * @author Adam Warski (adam at warski dot org) - */ -public class ReflectionTools { - private static final Map, Getter> getterCache = - new ConcurrentReferenceHashMap, Getter>(10, - ConcurrentReferenceHashMap.ReferenceType.SOFT, - ConcurrentReferenceHashMap.ReferenceType.SOFT); - private static final Map, Setter> setterCache = - new ConcurrentReferenceHashMap, Setter>(10, - ConcurrentReferenceHashMap.ReferenceType.SOFT, - ConcurrentReferenceHashMap.ReferenceType.SOFT); - - private static PropertyAccessor getAccessor(String accessorType) { - return PropertyAccessorFactory.getPropertyAccessor(accessorType); - } - - public static Getter getGetter(Class cls, PropertyData propertyData) { - return getGetter(cls, propertyData.getBeanName(), propertyData.getAccessType()); - } - - public static Getter getGetter(Class cls, String propertyName, String accessorType) { - Pair key = make(cls, propertyName); - Getter value = getterCache.get(key); - if (value == null) { - value = getAccessor(accessorType).getGetter(cls, propertyName); - // It's ok if two getters are generated concurrently - getterCache.put(key, value); - } - - return value; - } - - public static Setter getSetter(Class cls, PropertyData propertyData) { - return getSetter(cls, propertyData.getBeanName(), propertyData.getAccessType()); - } - - private static Setter getSetter(Class cls, String propertyName, String accessorType) { - Pair key = make(cls, propertyName); - Setter value = setterCache.get(key); - if (value == null) { - value = getAccessor(accessorType).getSetter(cls, propertyName); - // It's ok if two setters are generated concurrently - setterCache.put(key, value); - } - - return value; - } -} diff --git a/hibernate-envers/src/main/java/org/hibernate/tool/ant/EnversHibernateToolTask.java b/hibernate-envers/src/main/java/org/hibernate/tool/ant/EnversHibernateToolTask.java deleted file mode 100644 index 81c609010f..0000000000 --- a/hibernate-envers/src/main/java/org/hibernate/tool/ant/EnversHibernateToolTask.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.tool.ant; -import org.apache.tools.ant.BuildException; - -import org.hibernate.envers.ant.AnnotationConfigurationTaskWithEnvers; -import org.hibernate.envers.ant.ConfigurationTaskWithEnvers; -import org.hibernate.envers.ant.JPAConfigurationTaskWithEnvers; - -/** - * @author Adam Warski (adam at warski dot org) - */ -public class EnversHibernateToolTask extends HibernateToolTask { - private void checkConfiguration() { - if (configurationTask!=null) { - throw new BuildException("Only a single configuration is allowed."); - } - } - - public JPAConfigurationTask createJpaConfiguration() { - checkConfiguration(); - JPAConfigurationTask task = new JPAConfigurationTaskWithEnvers(); - configurationTask = task; - return task; - } - - public ConfigurationTask createConfiguration() { - checkConfiguration(); - ConfigurationTaskWithEnvers task = new ConfigurationTaskWithEnvers(); - configurationTask = task; - return task; - } - - public AnnotationConfigurationTask createAnnotationConfiguration() { - checkConfiguration(); - AnnotationConfigurationTaskWithEnvers task = new AnnotationConfigurationTaskWithEnvers(); - configurationTask = task; - return task; - } -} diff --git a/hibernate-envers/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator b/hibernate-envers/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator index dac1b598b9..4155dd7232 100644 --- a/hibernate-envers/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator +++ b/hibernate-envers/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator @@ -1 +1 @@ -org.hibernate.envers.event.EnversIntegrator \ No newline at end of file +org.hibernate.envers.event.spi.EnversIntegrator \ No newline at end of file diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java index f14de44b5b..9ece4924be 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java @@ -4,15 +4,16 @@ import java.net.URISyntaxException; import java.net.URL; -import org.hibernate.cfg.Environment; import org.junit.Before; import org.hibernate.MappingException; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.service.ServiceRegistry; import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.BeforeClassOnce; @@ -40,10 +41,10 @@ public void init() throws URISyntaxException { String auditStrategy = getAuditStrategy(); if (auditStrategy != null && !"".equals(auditStrategy)) { - config.setProperty("org.hibernate.envers.audit_strategy", auditStrategy); + config.setProperty(EnversSettings.AUDIT_STRATEGY, auditStrategy); } config.setProperty( Environment.USE_NEW_ID_GENERATOR_MAPPINGS, "true" ); - config.setProperty("org.hibernate.envers.use_revision_entity_with_native_id", "false"); + config.setProperty(EnversSettings.USE_REVISION_ENTITY_WITH_NATIVE_ID, "false"); addProperties(config); this.initMappings(); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java index 963a57db23..e6b91a26f5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversFunctionalTestCase.java @@ -3,13 +3,14 @@ import java.util.Arrays; import java.util.List; -import org.hibernate.cfg.Configuration; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.hibernate.Session; +import org.hibernate.cfg.Configuration; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; /** @@ -49,7 +50,7 @@ protected AuditReader getAuditReader(){ @Override protected Configuration constructConfiguration() { Configuration configuration = super.constructConfiguration(); - configuration.setProperty("org.hibernate.envers.use_revision_entity_with_native_id", "false"); + configuration.setProperty(EnversSettings.USE_REVISION_ENTITY_WITH_NATIVE_ID, "false"); return configuration; } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java index 242761b26c..0590352301 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/BaseEnversJPAFunctionalTestCase.java @@ -23,34 +23,33 @@ */ package org.hibernate.envers.test; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.transaction.SystemException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.transaction.SystemException; import org.jboss.logging.Logger; +import org.junit.After; +import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.H2Dialect; -import org.hibernate.jpa.test.PersistenceUnitDescriptorAdapter; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.envers.event.EnversIntegrator; +import org.hibernate.envers.configuration.EnversSettings; +import org.hibernate.envers.event.spi.EnversIntegrator; import org.hibernate.internal.util.StringHelper; import org.hibernate.jpa.AvailableSettings; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; import org.hibernate.jpa.boot.spi.Bootstrap; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; import org.hibernate.jpa.internal.EntityManagerFactoryImpl; -import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; - -import org.junit.After; - +import org.hibernate.jpa.test.PersistenceUnitDescriptorAdapter; import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.BeforeClassOnce; import org.hibernate.testing.jta.TestingJtaPlatformImpl; @@ -126,14 +125,14 @@ private Map buildSettings() { } if ( StringHelper.isNotEmpty( getAuditStrategy() ) ) { - settings.put( "org.hibernate.envers.audit_strategy", getAuditStrategy() ); + settings.put( EnversSettings.AUDIT_STRATEGY, getAuditStrategy() ); } if ( ! autoRegisterListeners() ) { settings.put( EnversIntegrator.AUTO_REGISTER, "false" ); } - settings.put( "org.hibernate.envers.use_revision_entity_with_native_id", "false" ); + settings.put( EnversSettings.USE_REVISION_ENTITY_WITH_NATIVE_ID, "false" ); settings.put( org.hibernate.cfg.AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true" ); settings.put( org.hibernate.cfg.AvailableSettings.DIALECT, getDialect().getClass().getName() ); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java index 17330e46ea..65e838148a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/entities/reventity/trackmodifiedentities/ExtendedRevisionEntity.java @@ -3,8 +3,8 @@ import javax.persistence.Column; import javax.persistence.Entity; -import org.hibernate.envers.enhanced.SequenceIdTrackingModifiedEntitiesRevisionEntity; import org.hibernate.envers.RevisionEntity; +import org.hibernate.envers.enhanced.SequenceIdTrackingModifiedEntitiesRevisionEntity; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java index 259331a5be..d3589e03cc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/Delete.java @@ -28,7 +28,7 @@ import org.junit.Test; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/OutsideTransactionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/OutsideTransactionTest.java index 1c00e7f7c8..7eeffd735f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/OutsideTransactionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/OutsideTransactionTest.java @@ -1,14 +1,16 @@ package org.hibernate.envers.test.integration.basic; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.cfg.Configuration; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.exception.AuditException; import org.hibernate.envers.test.BaseEnversFunctionalTestCase; import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.integration.collection.norevision.Name; import org.hibernate.envers.test.integration.collection.norevision.Person; import org.hibernate.testing.TestForIssue; -import org.junit.Test; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) @@ -22,8 +24,8 @@ protected Class[] getAnnotatedClasses() { @Override protected void configure(Configuration configuration) { - configuration.setProperty("org.hibernate.envers.store_data_at_delete", "true"); - configuration.setProperty("org.hibernate.envers.revision_on_collection_change", "true"); + configuration.setProperty(EnversSettings.STORE_DATA_AT_DELETE, "true"); + configuration.setProperty(EnversSettings.REVISION_ON_COLLECTION_CHANGE, "true"); } @Test(expected = AuditException.class) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/TransactionRollbackBehaviour.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/TransactionRollbackBehaviour.java index b6622af69b..46c1d7a383 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/TransactionRollbackBehaviour.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/TransactionRollbackBehaviour.java @@ -1,13 +1,13 @@ package org.hibernate.envers.test.integration.basic; import java.util.List; - import javax.persistence.EntityManager; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.entities.IntTestEntity; -import org.junit.Assert; -import org.junit.Test; /** * @author Tomasz Dziurko (tdziurko at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java index 1fe190b602..7ecb37da29 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/basic/UnversionedProperty.java @@ -28,7 +28,7 @@ import org.junit.Test; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.UnversionedEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java index 842c1396fe..92239ec28c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/EnumSet.java @@ -30,7 +30,7 @@ import org.junit.Assert; import org.junit.Test; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.collection.EnumSetEntity; import org.hibernate.envers.test.entities.collection.EnumSetEntity.E1; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList2.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList2.java index 4d325b8504..7cfc454008 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList2.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableList2.java @@ -24,7 +24,6 @@ package org.hibernate.envers.test.integration.collection.embeddable; import java.util.Arrays; -import java.util.Date; import javax.persistence.EntityManager; import org.junit.Test; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableMap.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableMap.java index 2a2895dd77..869c908cc2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableMap.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/embeddable/EmbeddableMap.java @@ -25,9 +25,11 @@ import java.util.Arrays; import java.util.Collections; - import javax.persistence.EntityManager; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.collection.EmbeddableMapEntity; @@ -36,9 +38,6 @@ import org.hibernate.envers.test.tools.TestTools; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - /** * @author Kristoffer Lundberg (kristoffer at cambio dot se) */ diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java index 950a6981ef..194bf6cbe7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/collection/norevision/AbstractCollectionChangeTest.java @@ -1,19 +1,21 @@ package org.hibernate.envers.test.integration.collection.norevision; +import java.util.List; + +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.cfg.Configuration; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.BaseEnversFunctionalTestCase; import org.hibernate.envers.test.Priority; -import org.junit.Test; - -import java.util.List; public abstract class AbstractCollectionChangeTest extends BaseEnversFunctionalTestCase { protected Integer personId; @Override protected void configure(Configuration configuration) { - configuration.setProperty("org.hibernate.envers.revision_on_collection_change", getCollectionChangeValue()); + configuration.setProperty(EnversSettings.REVISION_ON_COLLECTION_CHANGE, getCollectionChangeValue()); } @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java index ca82f31884..56ed7f0d76 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/Components.java @@ -28,7 +28,7 @@ import org.junit.Test; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.components.Component1; import org.hibernate.envers.test.entities.components.Component2; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/PropertiesGroupTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/PropertiesGroupTest.java index 7c09e7c644..34c6b0e4a6 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/PropertiesGroupTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/PropertiesGroupTest.java @@ -1,14 +1,9 @@ package org.hibernate.envers.test.integration.components; -import java.io.File; -import java.net.URISyntaxException; -import java.net.URL; - -import org.hibernate.Session; import org.junit.Assert; import org.junit.Test; -import org.hibernate.MappingException; +import org.hibernate.Session; import org.hibernate.envers.test.BaseEnversFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.components.UniquePropsEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java index 3c2679030f..4ef4e24211 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/ManyToOneInComponent.java @@ -28,7 +28,7 @@ import org.junit.Test; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.components.relations.ManyToOneComponent; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java index 9d277b2bff..480c1a277f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/relations/OneToManyInComponent.java @@ -28,7 +28,7 @@ import org.junit.Test; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.components.relations.OneToManyComponent; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java index 45ddd3efd6..f6d7a87613 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/customtype/ObjectUserTypeTest.java @@ -8,6 +8,7 @@ import org.junit.Test; import org.hibernate.dialect.Oracle8iDialect; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.testing.RequiresDialect; @@ -29,7 +30,7 @@ protected Class[] getAnnotatedClasses() { @Override protected void addConfigOptions(Map options) { super.addConfigOptions( options ); - options.put( "org.hibernate.envers.store_data_at_delete", "true" ); + options.put( EnversSettings.STORE_DATA_AT_DELETE, "true" ); } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java index c4f2bc7aa2..07402f1fcd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java @@ -27,9 +27,9 @@ import java.util.Map; import javax.persistence.EntityManager; -import org.hibernate.dialect.PostgreSQL82Dialect; import org.junit.Test; +import org.hibernate.dialect.PostgreSQL82Dialect; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.testing.DialectChecks; import org.hibernate.testing.RequiresDialectFeature; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java index 5a914e8d62..03663d91ed 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/Lobs.java @@ -27,9 +27,9 @@ import java.util.Map; import javax.persistence.EntityManager; -import org.hibernate.dialect.PostgreSQL82Dialect; import org.junit.Test; +import org.hibernate.dialect.PostgreSQL82Dialect; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.testing.DialectChecks; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlushAutoCommitDisabled.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlushAutoCommitDisabled.java index c12e3f4e56..d6f94a5fdf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlushAutoCommitDisabled.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/flush/ManualFlushAutoCommitDisabled.java @@ -1,9 +1,9 @@ package org.hibernate.envers.test.integration.flush; -import org.hibernate.testing.TestForIssue; - import java.util.Map; +import org.hibernate.testing.TestForIssue; + /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Item.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Item.java index 6372a5d337..b95b70d5ea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Item.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Item.java @@ -1,11 +1,11 @@ package org.hibernate.envers.test.integration.ids.embeddedid; -import org.hibernate.envers.Audited; - import java.io.Serializable; import javax.persistence.EmbeddedId; import javax.persistence.Entity; +import org.hibernate.envers.Audited; + /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Producer.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Producer.java index 8df7a5d974..27538a6d0b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Producer.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/Producer.java @@ -1,12 +1,12 @@ package org.hibernate.envers.test.integration.ids.embeddedid; -import org.hibernate.envers.Audited; - import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; +import org.hibernate.envers.Audited; + /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/PurchaseOrder.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/PurchaseOrder.java index b322221442..892e32da72 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/PurchaseOrder.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/PurchaseOrder.java @@ -1,9 +1,15 @@ package org.hibernate.envers.test.integration.ids.embeddedid; -import org.hibernate.envers.Audited; - -import javax.persistence.*; import java.io.Serializable; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinColumns; +import javax.persistence.ManyToOne; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableTest.java index ff55496404..28ee8adacc 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/embeddedid/RelationInsideEmbeddableTest.java @@ -1,13 +1,14 @@ package org.hibernate.envers.test.integration.ids.embeddedid; +import java.util.Arrays; +import javax.persistence.EntityManager; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.Arrays; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ClassType.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ClassType.java index b077b2d6e4..f4a75f2ca4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ClassType.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/ClassType.java @@ -4,7 +4,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import javax.persistence.Table; import org.hibernate.envers.Audited; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassWithRelationTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassWithRelationTest.java index 7556b990e1..e76ab25a00 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassWithRelationTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/ids/idclass/IdClassWithRelationTest.java @@ -1,13 +1,14 @@ package org.hibernate.envers.test.integration.ids.idclass; +import java.util.Arrays; +import javax.persistence.EntityManager; + import junit.framework.Assert; +import org.junit.Test; + import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.testing.TestForIssue; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.Arrays; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java index 28e2afc886..e676e3659d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/inheritance/mixed/MixedInheritanceStrategiesEntityTest.java @@ -4,7 +4,7 @@ import org.junit.Test; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.integration.inheritance.mixed.entities.AbstractActivity; import org.hibernate.envers.test.integration.inheritance.mixed.entities.AbstractCheckActivity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java index 6889fe0dca..f85c393403 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/interfaces/hbm/propertiesAudited/AbstractPropertiesAuditedTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.hibernate.envers.exception.NotAuditedException; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java index 720d6dcd3b..643f41bf35 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaExceptionListener.java @@ -34,7 +34,6 @@ import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.integration.reventity.ExceptionListenerRevEntity; - import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java index 67f87c50b8..529749f7b7 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/jta/JtaTransaction.java @@ -2,16 +2,16 @@ import java.util.List; import java.util.Map; - import javax.persistence.EntityManager; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.IntTestEntity; import org.hibernate.testing.jta.TestingJtaBootstrap; import org.hibernate.testing.jta.TestingJtaPlatformImpl; -import org.junit.Assert; -import org.junit.Test; /** * Same as {@link org.hibernate.envers.test.integration.basic.Simple}, but in a JTA environment. diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java index 0a8d2e82fc..0355e817e4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/BasicSet.java @@ -30,7 +30,7 @@ import org.junit.Test; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.manytomany.SetOwnedEntity; import org.hibernate.envers.test.entities.manytomany.SetOwningEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java index f1dfac71d5..16deaf5b4f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/inverseToSuperclass/ManyToManyInverseToSuperclassTest.java @@ -1,13 +1,13 @@ package org.hibernate.envers.test.integration.manytomany.inverseToSuperclass; -import javax.persistence.EntityManager; import java.util.ArrayList; +import javax.persistence.EntityManager; + +import org.junit.Test; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; -import org.junit.Test; - /** * @author Hern�n Chanfreau * diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java index 32f3f74c02..df91a972f9 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/manytomany/sametable/BasicSametable.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.hibernate.Session; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.manytomany.sametable.Child1Entity; import org.hibernate.envers.test.entities.manytomany.sametable.Child2Entity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/AddDelTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/AddDelTest.java index 57f464138e..fc0530472e 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/AddDelTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/merge/AddDelTest.java @@ -2,10 +2,10 @@ import java.util.Arrays; -import org.hibernate.Session; import org.junit.Assert; import org.junit.Test; +import org.hibernate.Session; import org.hibernate.envers.test.BaseEnversFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java index 801c06d9b4..59998f8ad5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsEntityTest.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQuery; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; @@ -41,7 +41,7 @@ public abstract class AbstractModifiedFlagsEntityTest extends BaseEnversJPAFunct protected void addConfigOptions(Map options) { super.addConfigOptions(options); if (forceModifiedFlags()) { - options.put(GlobalConfiguration.GLOBAL_WITH_MODIFIED_FLAG_PROPERTY, "true"); + options.put(EnversSettings.GLOBAL_WITH_MODIFIED_FLAG, "true"); } } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java index 5a606bd154..48372fbead 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/AbstractModifiedFlagsOneSessionTest.java @@ -24,7 +24,7 @@ package org.hibernate.envers.test.integration.modifiedflags; import org.hibernate.cfg.Configuration; -import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.AbstractOneSessionTest; /** @@ -39,8 +39,7 @@ public abstract class AbstractModifiedFlagsOneSessionTest extends protected void addProperties(Configuration configuration) { super.addProperties(configuration); if (forceModifiedFlags()) { - configuration.setProperty( - GlobalConfiguration.GLOBAL_WITH_MODIFIED_FLAG_PROPERTY, "true"); + configuration.setProperty(EnversSettings.GLOBAL_WITH_MODIFIED_FLAG, "true"); } } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentCollection.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentCollection.java index cfb4953b00..29de8400cd 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedComponentCollection.java @@ -11,9 +11,9 @@ import org.hibernate.envers.test.entities.components.Component4; import org.hibernate.testing.TestForIssue; -import static org.junit.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.junit.Assert.assertEquals; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDetachedMultipleCollection.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDetachedMultipleCollection.java index 05602fba00..7c6036b562 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDetachedMultipleCollection.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/HasChangedDetachedMultipleCollection.java @@ -14,9 +14,9 @@ import org.hibernate.testing.SkipForDialect; import org.hibernate.testing.TestForIssue; -import static org.junit.Assert.assertEquals; import static org.hibernate.envers.test.tools.TestTools.extractRevisionNumbers; import static org.hibernate.envers.test.tools.TestTools.makeList; +import static org.junit.Assert.assertEquals; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java index d6c005958f..dcef9d8aa5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/modifiedflags/ModifiedFlagSuffix.java @@ -29,7 +29,7 @@ import org.junit.Test; -import org.hibernate.envers.configuration.GlobalConfiguration; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.integration.basic.BasicTestEntity1; @@ -54,7 +54,7 @@ protected Class[] getAnnotatedClasses() { @Override protected void addConfigOptions(Map options) { super.addConfigOptions(options); - options.put(GlobalConfiguration.MODIFIED_FLAG_SUFFIX_PROPERTY, "_CHANGED"); + options.put(EnversSettings.MODIFIED_FLAG_SUFFIX, "_CHANGED"); } private Integer addNewEntity(String str, long lng) { diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java index d9ccfd1aa4..a211b42ba5 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/naming/ids/JoinMulIdNamingRefIngEntity.java @@ -22,8 +22,8 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.envers.test.integration.naming.ids; + import javax.persistence.Entity; -import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.IdClass; import javax.persistence.JoinColumn; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java index 5ef6cbf9fd..e9abc7425c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/notupdatable/PropertyNotUpdatableTest.java @@ -1,16 +1,17 @@ package org.hibernate.envers.test.integration.notupdatable; -import junit.framework.Assert; - -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; -import org.hibernate.envers.test.Priority; -import org.hibernate.testing.TestForIssue; -import org.junit.Test; - -import javax.persistence.EntityManager; import java.util.Arrays; import java.util.List; import java.util.Map; +import javax.persistence.EntityManager; + +import junit.framework.Assert; +import org.junit.Test; + +import org.hibernate.envers.configuration.EnversSettings; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; +import org.hibernate.envers.test.Priority; +import org.hibernate.testing.TestForIssue; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) @@ -21,7 +22,7 @@ public class PropertyNotUpdatableTest extends BaseEnversJPAFunctionalTestCase { @Override protected void addConfigOptions(Map options) { - options.put("org.hibernate.envers.store_data_at_delete", "true"); + options.put(EnversSettings.STORE_DATA_AT_DELETE, "true"); } @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java index f1935f0c11..e2ae66a345 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/BasicList.java @@ -28,7 +28,7 @@ import org.junit.Test; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.onetomany.ListRefEdEntity; import org.hibernate.envers.test.entities.onetomany.ListRefIngEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java index 34abc270a0..0f7645de26 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/detached/DataChangesDetachedSet.java @@ -29,7 +29,7 @@ import org.junit.Test; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase ; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; import org.hibernate.envers.test.entities.onetomany.detached.SetRefCollEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Constant.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Constant.java index 14ed0b0665..9db330a594 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Constant.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Constant.java @@ -1,11 +1,11 @@ package org.hibernate.envers.test.integration.onetomany.embeddedid; -import org.hibernate.envers.Audited; - +import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; -import java.io.Serializable; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/MapsIdTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/MapsIdTest.java index b5964d4fd0..a785b53263 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/MapsIdTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/MapsIdTest.java @@ -1,15 +1,14 @@ package org.hibernate.envers.test.integration.onetomany.embeddedid; +import java.util.Arrays; import javax.persistence.EntityManager; -import org.hibernate.envers.test.Priority; -import org.hibernate.testing.TestForIssue; import org.junit.Assert; import org.junit.Test; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; - -import java.util.Arrays; +import org.hibernate.envers.test.Priority; +import org.hibernate.testing.TestForIssue; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Person.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Person.java index f38fea9ee8..5c834a651d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Person.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/Person.java @@ -1,11 +1,14 @@ package org.hibernate.envers.test.integration.onetomany.embeddedid; -import org.hibernate.envers.Audited; - -import javax.persistence.*; import java.io.Serializable; import java.util.HashSet; import java.util.Set; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.OneToMany; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/PersonTuple.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/PersonTuple.java index 4305a52c3f..0767999040 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/PersonTuple.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/embeddedid/PersonTuple.java @@ -1,9 +1,15 @@ package org.hibernate.envers.test.integration.onetomany.embeddedid; -import org.hibernate.envers.Audited; - -import javax.persistence.*; import java.io.Serializable; +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.EmbeddedId; +import javax.persistence.Entity; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.MapsId; + +import org.hibernate.envers.Audited; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java index 5c3f401797..0097db671b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/onetomany/inverseToSuperclass/OneToManyInverseToSuperclassTest.java @@ -1,13 +1,13 @@ package org.hibernate.envers.test.integration.onetomany.inverseToSuperclass; -import javax.persistence.EntityManager; import java.util.ArrayList; +import javax.persistence.EntityManager; + +import org.junit.Test; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; -import org.junit.Test; - /** * @author Hern�n Chanfreau * diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java index 767c85face..eef446a43d 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/UnversionedOptimisticLockingField.java @@ -30,6 +30,7 @@ import org.junit.Test; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.mapping.PersistentClass; @@ -44,14 +45,12 @@ public class UnversionedOptimisticLockingField extends BaseEnversJPAFunctionalTe @Override protected Class[] getAnnotatedClasses() { return new Class[] { UnversionedOptimisticLockingFieldEntity.class }; - } @Override public void addConfigOptions(Map configuration) { super.addConfigOptions( configuration ); - configuration.put("org.hibernate.envers.doNotAuditOptimisticLockingField", "true"); - + configuration.put(EnversSettings.DO_NOT_AUDIT_OPTIMISTIC_LOCKING_FIELD, "true"); } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java index 8d9ac6fba3..92c51d991a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/properties/VersionsProperties.java @@ -29,6 +29,7 @@ import org.junit.Test; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; @@ -46,10 +47,10 @@ protected Class[] getAnnotatedClasses() { @Override protected void addConfigOptions(Map options) { super.addConfigOptions( options ); - options.put("org.hibernate.envers.auditTablePrefix", "VP_"); - options.put("org.hibernate.envers.auditTableSuffix", "_VS"); - options.put("org.hibernate.envers.revisionFieldName", "ver_rev"); - options.put("org.hibernate.envers.revisionTypeFieldName", "ver_rev_type"); + options.put(EnversSettings.AUDIT_TABLE_PREFIX, "VP_"); + options.put(EnversSettings.AUDIT_TABLE_SUFFIX, "_VS"); + options.put(EnversSettings.REVISION_FIELD_NAME, "ver_rev"); + options.put(EnversSettings.REVISION_TYPE_FIELD_NAME, "ver_rev_type"); } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java index 49d435e382..effb0f3958 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/QueryingWithProxyObjectTest.java @@ -1,13 +1,11 @@ package org.hibernate.envers.test.integration.proxy; -import java.net.URISyntaxException; import java.util.Arrays; import java.util.List; import org.junit.Assert; import org.junit.Test; -import org.hibernate.MappingException; import org.hibernate.envers.test.BaseEnversFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/RemovedObjectQueryTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/RemovedObjectQueryTest.java index 9ff95b3429..0c0a1be181 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/RemovedObjectQueryTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/proxy/RemovedObjectQueryTest.java @@ -1,7 +1,15 @@ package org.hibernate.envers.test.integration.proxy; +import java.util.List; +import java.util.Map; +import javax.persistence.EntityManager; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.Hibernate; import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditQuery; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; @@ -11,20 +19,13 @@ import org.hibernate.envers.test.tools.TestTools; import org.hibernate.testing.FailureExpected; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - -import java.util.List; -import java.util.Map; - -import javax.persistence.EntityManager; @TestForIssue(jiraKey = "HHH-5845") public class RemovedObjectQueryTest extends BaseEnversJPAFunctionalTestCase { @Override @SuppressWarnings("unchecked") protected void addConfigOptions(Map options) { - options.put("org.hibernate.envers.store_data_at_delete", "true"); + options.put(EnversSettings.STORE_DATA_AT_DELETE, "true"); } @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java index 6b83d16139..5403661968 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/CustomRevEntityQuery.java @@ -26,10 +26,10 @@ import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.junit.Test; import org.hibernate.envers.query.AuditEntity; +import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrIntTestEntity; import org.hibernate.envers.test.entities.reventity.CustomRevEntity; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java index ea1f3a36f3..88961086c4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/DeletedEntities.java @@ -28,8 +28,8 @@ import org.junit.Test; -import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.RevisionType; +import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java index 764075cc45..ed80431564 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/MaximalizePropertyQuery.java @@ -27,9 +27,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; - import javax.persistence.EntityManager; +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.envers.RevisionType; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.query.AuditEntity; @@ -39,9 +41,6 @@ import org.hibernate.envers.test.entities.StrIntTestEntity; import org.hibernate.testing.TestForIssue; -import org.junit.Assert; -import org.junit.Test; - /** * @author Adam Warski (adam at warski dot org) * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java index c0870036fb..e8b361ea3b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/RevisionConstraintQuery.java @@ -28,7 +28,6 @@ import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.envers.test.tools.TestTools; import org.junit.Assert; import org.junit.Test; @@ -37,6 +36,7 @@ import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrIntTestEntity; +import org.hibernate.envers.test.tools.TestTools; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java index c3515dec45..f74e9667a8 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/SimpleQuery.java @@ -31,8 +31,8 @@ import org.junit.Assert; import org.junit.Test; -import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.RevisionType; +import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java index 6e9d3763c7..9ba7e07231 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/query/StoreDeletedData.java @@ -32,6 +32,7 @@ import org.junit.Test; import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.criteria.AuditCriterion; @@ -59,7 +60,7 @@ protected Class[] getAnnotatedClasses() { @Override protected void addConfigOptions(Map options) { super.addConfigOptions( options ); - options.put( "org.hibernate.envers.storeDataAtDelete", "true" ); + options.put( EnversSettings.STORE_DATA_AT_DELETE, "true" ); } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java index 446a6122d1..d1a6edf212 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/readwriteexpression/ReadWriteExpressionChange.java @@ -4,10 +4,10 @@ import java.util.List; import javax.persistence.EntityManager; -import org.hibernate.dialect.Oracle8iDialect; import org.junit.Assert; import org.junit.Test; +import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java index 32a1ea6b88..4fb540ad74 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/DifferentDBSchemaTest.java @@ -8,6 +8,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; @@ -29,7 +30,7 @@ protected void addConfigOptions(Map options) { super.addConfigOptions(options); // Creates new schema after establishing connection options.putAll(Environment.getProperties()); - options.put("org.hibernate.envers.default_schema", SCHEMA_NAME); + options.put(EnversSettings.DEFAULT_SCHEMA, SCHEMA_NAME); } @Override diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/GloballyConfiguredRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/GloballyConfiguredRevListenerTest.java index 1630895f08..00acda9ede 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/GloballyConfiguredRevListenerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/GloballyConfiguredRevListenerTest.java @@ -6,6 +6,7 @@ import org.junit.Assert; import org.junit.Test; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; @@ -24,7 +25,7 @@ protected Class[] getAnnotatedClasses() { @Override protected void addConfigOptions(Map options) { super.addConfigOptions( options ); - options.put("org.hibernate.envers.revision_listener", "org.hibernate.envers.test.integration.reventity.CountingRevisionListener"); + options.put(EnversSettings.REVISION_LISTENER, CountingRevisionListener.class.getName()); } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java index 285b705dea..a356408c48 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/InheritedRevEntity.java @@ -22,10 +22,11 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.envers.test.integration.reventity; + import javax.persistence.Entity; -import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.RevisionEntity; +import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; /** * @author Adam Warski (adam at warski dot org) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideCustomRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideCustomRevListenerTest.java index f992ca2bea..ccaf0f5aea 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideCustomRevListenerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideCustomRevListenerTest.java @@ -1,7 +1,6 @@ package org.hibernate.envers.test.integration.reventity; import org.hibernate.internal.util.collections.ArrayHelper; - import org.hibernate.testing.TestForIssue; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideDefaultRevListenerTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideDefaultRevListenerTest.java index bc7af2ee23..097dd41932 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideDefaultRevListenerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/OverrideDefaultRevListenerTest.java @@ -1,7 +1,6 @@ package org.hibernate.envers.test.integration.reventity; import org.hibernate.internal.util.collections.ArrayHelper; - import org.hibernate.testing.TestForIssue; /** diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java index d772cf1bab..2d1255dcd4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/AnnotatedTrackingEntitiesTest.java @@ -3,6 +3,7 @@ import java.util.Map; import org.hibernate.envers.ModifiedEntityNames; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.entities.reventity.trackmodifiedentities.AnnotatedTrackingRevisionEntity; import org.hibernate.internal.util.collections.ArrayHelper; @@ -19,6 +20,6 @@ protected Class[] getAnnotatedClasses() { @Override public void addConfigOptions(Map configuration) { super.addConfigOptions( configuration ); - configuration.put("org.hibernate.envers.track_entities_changed_in_revision", "false"); + configuration.put(EnversSettings.TRACK_ENTITIES_CHANGED_IN_REVISION, "false"); } } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java index ed0669ef75..3865b63b90 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/DefaultTrackingEntitiesTest.java @@ -9,6 +9,7 @@ import org.hibernate.envers.CrossTypeRevisionChangesReader; import org.hibernate.envers.RevisionType; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrIntTestEntity; @@ -36,7 +37,7 @@ protected Class[] getAnnotatedClasses() { @Override public void addConfigOptions(Map configuration) { super.addConfigOptions( configuration ); - configuration.put("org.hibernate.envers.track_entities_changed_in_revision", "true"); + configuration.put(EnversSettings.TRACK_ENTITIES_CHANGED_IN_REVISION, "true"); } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/EntityNamesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/EntityNamesTest.java index ea326bf556..1f9c245d9c 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/EntityNamesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/EntityNamesTest.java @@ -1,16 +1,18 @@ package org.hibernate.envers.test.integration.reventity.trackmodifiedentities; +import java.util.ArrayList; +import java.util.List; + +import org.junit.Test; + import org.hibernate.cfg.Configuration; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.BaseEnversFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.integration.entityNames.manyToManyAudited.Car; import org.hibernate.envers.test.integration.entityNames.manyToManyAudited.Person; import org.hibernate.envers.test.tools.TestTools; import org.hibernate.envers.tools.Pair; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.List; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) @@ -23,7 +25,7 @@ protected String[] getMappings() { @Override protected void configure(Configuration configuration) { - configuration.setProperty("org.hibernate.envers.track_entities_changed_in_revision", "true"); + configuration.setProperty(EnversSettings.TRACK_ENTITIES_CHANGED_IN_REVISION, "true"); } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java index 101a96afb2..39f3385e9b 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/ExtendedRevisionEntityTest.java @@ -6,6 +6,7 @@ import org.junit.Test; import org.hibernate.envers.DefaultTrackingModifiedEntitiesRevisionEntity; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.entities.reventity.trackmodifiedentities.ExtendedRevisionEntity; import org.hibernate.envers.test.entities.reventity.trackmodifiedentities.ExtendedRevisionListener; import org.hibernate.internal.util.collections.ArrayHelper; @@ -23,7 +24,7 @@ protected Class[] getAnnotatedClasses() { @Override public void addConfigOptions(Map configuration) { super.addConfigOptions(configuration); - configuration.put("org.hibernate.envers.track_entities_changed_in_revision", "false"); + configuration.put(EnversSettings.TRACK_ENTITIES_CHANGED_IN_REVISION, "false"); } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java index 32a2d900d5..59f947b103 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/reventity/trackmodifiedentities/TrackingEntitiesMultipleChangesTest.java @@ -8,6 +8,7 @@ import org.junit.Test; import org.hibernate.envers.CrossTypeRevisionChangesReader; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; @@ -28,7 +29,7 @@ protected Class[] getAnnotatedClasses() { @Override protected void addConfigOptions(Map options) { super.addConfigOptions( options ); - options.put( "org.hibernate.envers.track_entities_changed_in_revision", "true" ) ; + options.put( EnversSettings.TRACK_ENTITIES_CHANGED_IN_REVISION, "true" ) ; } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyManyToManyTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyManyToManyTest.java index e9358313a4..2e96ea9a7f 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyManyToManyTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyManyToManyTest.java @@ -7,6 +7,7 @@ import org.junit.Test; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.manytomany.SetOwnedEntity; @@ -36,7 +37,7 @@ protected Class[] getAnnotatedClasses() { @Override protected void addConfigOptions(Map options) { - options.put("org.hibernate.envers.audit_strategy", "org.hibernate.envers.strategy.ValidityAuditStrategy"); + options.put(EnversSettings.AUDIT_STRATEGY, "org.hibernate.envers.strategy.ValidityAuditStrategy"); } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java index 21526d4b84..d0d6007575 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTestCustomRevEnt.java @@ -36,6 +36,7 @@ import org.junit.Test; import org.hibernate.Session; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.strategy.ValidityAuditStrategy; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; import org.hibernate.envers.test.Priority; @@ -75,9 +76,9 @@ protected Class[] getAnnotatedClasses() { @Override protected void addConfigOptions(Map options) { super.addConfigOptions( options ); - options.put("org.hibernate.envers.audit_strategy", "org.hibernate.envers.strategy.ValidityAuditStrategy"); - options.put("org.hibernate.envers.audit_strategy_validity_store_revend_timestamp", "true"); - options.put("org.hibernate.envers.audit_strategy_validity_revend_timestamp_field_name", revendTimestampColumName); + options.put(EnversSettings.AUDIT_STRATEGY, "org.hibernate.envers.strategy.ValidityAuditStrategy"); + options.put(EnversSettings.AUDIT_STRATEGY_VALIDITY_STORE_REVEND_TIMESTAMP, "true"); + options.put(EnversSettings.AUDIT_STRATEGY_VALIDITY_REVEND_TIMESTAMP_FIELD_NAME, revendTimestampColumName); } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java index cb7bb7d462..6c79992434 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/strategy/ValidityAuditStrategyRevEndTsTest.java @@ -39,6 +39,7 @@ import org.hibernate.Session; import org.hibernate.dialect.MySQL5Dialect; import org.hibernate.dialect.SybaseASE15Dialect; +import org.hibernate.envers.configuration.EnversSettings; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; import org.hibernate.envers.strategy.ValidityAuditStrategy; import org.hibernate.envers.test.BaseEnversJPAFunctionalTestCase; @@ -73,9 +74,9 @@ protected Class[] getAnnotatedClasses() { @Override protected void addConfigOptions(Map options) { super.addConfigOptions( options ); - options.put("org.hibernate.envers.audit_strategy", "org.hibernate.envers.strategy.ValidityAuditStrategy"); - options.put("org.hibernate.envers.audit_strategy_validity_store_revend_timestamp", "true"); - options.put("org.hibernate.envers.audit_strategy_validity_revend_timestamp_field_name", revendTimestampColumName); + options.put(EnversSettings.AUDIT_STRATEGY, "org.hibernate.envers.strategy.ValidityAuditStrategy"); + options.put(EnversSettings.AUDIT_STRATEGY_VALIDITY_STORE_REVEND_TIMESTAMP, "true"); + options.put(EnversSettings.AUDIT_STRATEGY_VALIDITY_REVEND_TIMESTAMP_FIELD_NAME, revendTimestampColumName); } @Test diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java index 5b9a1476b4..130eea54a4 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/tools/SchemaExportTest.java @@ -1,15 +1,16 @@ package org.hibernate.envers.test.integration.tools; +import java.util.Arrays; + +import org.junit.Assert; +import org.junit.Test; + import org.hibernate.Session; import org.hibernate.envers.test.BaseEnversFunctionalTestCase; import org.hibernate.envers.test.Priority; import org.hibernate.envers.test.entities.StrTestEntity; +import org.hibernate.envers.tools.hbm2ddl.EnversSchemaGenerator; import org.hibernate.testing.TestForIssue; -import org.hibernate.tool.EnversSchemaGenerator; -import org.junit.Assert; -import org.junit.Test; - -import java.util.Arrays; /** * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java index 1f823d2254..d388dc9ecf 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/performance/AbstractEntityManagerTest.java @@ -28,21 +28,22 @@ import java.util.Properties; import javax.persistence.EntityManager; -import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; -import org.hibernate.jpa.test.PersistenceUnitDescriptorAdapter; -import org.hibernate.envers.test.AbstractEnversTest; import org.junit.Before; +import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; +import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; +import org.hibernate.envers.AuditReader; +import org.hibernate.envers.AuditReaderFactory; +import org.hibernate.envers.configuration.EnversSettings; +import org.hibernate.envers.event.spi.EnversIntegrator; +import org.hibernate.envers.test.AbstractEnversTest; import org.hibernate.jpa.AvailableSettings; import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl; import org.hibernate.jpa.boot.spi.Bootstrap; import org.hibernate.jpa.internal.EntityManagerFactoryImpl; -import org.hibernate.envers.AuditReader; -import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.envers.event.EnversIntegrator; -import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl; +import org.hibernate.jpa.test.PersistenceUnitDescriptorAdapter; import org.hibernate.testing.AfterClassOnce; import org.hibernate.testing.BeforeClassOnce; @@ -96,12 +97,12 @@ protected void init(boolean audited, String auditStrategy) throws IOException { Properties configurationProperties = new Properties(); configurationProperties.putAll( Environment.getProperties() ); if (!audited) { - configurationProperties.setProperty(EnversIntegrator.AUTO_REGISTER, "false"); + configurationProperties.setProperty( EnversIntegrator.AUTO_REGISTER, "false"); } if ( createSchema() ) { configurationProperties.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); configurationProperties.setProperty( Environment.USE_NEW_ID_GENERATOR_MAPPINGS, "true" ); - configurationProperties.setProperty("org.hibernate.envers.use_revision_entity_with_native_id", "false"); + configurationProperties.setProperty( EnversSettings.USE_REVISION_ENTITY_WITH_NATIVE_ID, "false" ); } if (auditStrategy != null && !"".equals(auditStrategy)) { configurationProperties.setProperty("org.hibernate.envers.audit_strategy", auditStrategy); diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java index ae3dfcd492..1e1e6108e2 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/tools/TestTools.java @@ -33,7 +33,6 @@ import java.util.Set; import org.hibernate.envers.enhanced.SequenceIdRevisionEntity; -import org.hibernate.envers.configuration.GlobalConfiguration; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; @@ -41,70 +40,61 @@ * @author Adam Warski (adam at warski dot org) */ public class TestTools { - public static Set makeSet(T... objects) { - Set ret = new HashSet(); - //noinspection ManualArrayToCollectionCopy - for (T o : objects) { - ret.add(o); - } + public static Set makeSet(T... objects) { + final Set ret = new HashSet(); + //noinspection ManualArrayToCollectionCopy + for ( T o : objects ) { + ret.add( o ); + } + return ret; + } - return ret; - } + public static List makeList(T... objects) { + return Arrays.asList( objects ); + } - public static List makeList(T... objects) { - return Arrays.asList(objects); - } + public static Map makeMap(Object... objects) { + final Map ret = new HashMap(); + // The number of objects must be divisable by 2. + //noinspection ManualArrayToCollectionCopy + for ( int i = 0; i < objects.length; i += 2 ) { + ret.put( objects[i], objects[i + 1] ); + } + return ret; + } - public static Map makeMap(Object... objects) { - Map ret = new HashMap(); - // The number of objects must be divisable by 2. - //noinspection ManualArrayToCollectionCopy - for (int i=0; i boolean checkList(List list, T... objects) { - if (list.size() != objects.length) { - return false; - } - - for (T obj : objects) { - if (!list.contains(obj)) { - return false; - } - } - - return true; - } + public static boolean checkList(List list, T... objects) { + if ( list.size() != objects.length ) { + return false; + } + for ( T obj : objects ) { + if ( !list.contains( obj ) ) { + return false; + } + } + return true; + } public static List extractRevisionNumbers(List queryResults) { - List result = new ArrayList(); - for (Object queryResult : queryResults) { - result.add(((SequenceIdRevisionEntity) ((Object[]) queryResult)[1]) - .getId()); + final List result = new ArrayList(); + for ( Object queryResult : queryResults ) { + result.add( ( (SequenceIdRevisionEntity) ( (Object[]) queryResult )[1] ).getId() ); } return result; } - public static Set extractModProperties( - PersistentClass persistentClass) { - return extractModProperties(persistentClass, - GlobalConfiguration.DEFAULT_MODIFIED_FLAG_SUFFIX); + public static Set extractModProperties(PersistentClass persistentClass) { + return extractModProperties( persistentClass, "_MOD" ); } - public static Set extractModProperties( - PersistentClass persistentClass, String suffix) { - Set result = new HashSet(); - Iterator iterator = persistentClass.getPropertyIterator(); - - while (iterator.hasNext()) { - Property property = (Property) iterator.next(); - String propertyName = property.getName(); - if (propertyName.endsWith(suffix)) { - result.add(propertyName); + public static Set extractModProperties(PersistentClass persistentClass, String suffix) { + final Set result = new HashSet(); + final Iterator iterator = persistentClass.getPropertyIterator(); + while ( iterator.hasNext() ) { + final Property property = (Property) iterator.next(); + final String propertyName = property.getName(); + if ( propertyName.endsWith( suffix ) ) { + result.add( propertyName ); } } return result;