From fb4efc5975452cec3cf73e3dd9be09393e588fe1 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Sun, 19 Nov 2023 05:17:50 -0600 Subject: [PATCH] #79 - Realign classes under hibernate-core package structure --- .../AccessTypeDeterminationException.java | 2 +- .../models}/AccessTypePlacementException.java | 2 +- .../models}/AnnotationPlacementException.java | 2 +- .../{models/orm => boot/models}/Copied.java | 2 +- .../models}/HibernateAnnotations.java | 4 +- .../orm => boot/models}/JpaAnnotations.java | 4 +- .../models}/MemberResolutionException.java | 2 +- .../MultipleAttributeNaturesException.java | 4 +- .../models}/bind/ModelBindingLogging.java | 2 +- .../bind}/internal/AnyKeyType.java | 2 +- .../bind/internal/BindingContextImpl.java | 9 +- .../models}/bind/internal/BindingHelper.java | 10 +- .../bind/internal/BindingOptionsImpl.java | 6 +- .../bind/internal/BindingStateImpl.java | 22 ++-- .../models}/bind/internal/InLineView.java | 4 +- .../models}/bind/internal/PhysicalTable.java | 4 +- .../models}/bind/internal/PhysicalView.java | 4 +- .../models}/bind/internal/SecondPass.java | 2 +- .../models}/bind/internal/SecondaryTable.java | 4 +- .../internal/binders/AttributeBinder.java | 20 ++-- .../bind/internal/binders/ColumnBinder.java | 4 +- .../internal/binders/DelegateBinders.java | 8 +- .../internal/binders/EntityTypeBinder.java | 26 ++--- .../binders/IdentifiableTypeBinder.java | 18 ++-- .../internal/binders/ManagedTypeBinder.java | 10 +- .../binders/MappedSuperTypeBinder.java | 16 +-- .../bind/internal/binders/TableBinder.java | 50 ++++----- .../models}/bind/spi/BindingContext.java | 5 +- .../models}/bind/spi/BindingCoordinator.java | 26 ++--- .../models}/bind/spi/BindingOptions.java | 2 +- .../models}/bind/spi/BindingState.java | 12 +-- .../bind/spi/PersistentTableReference.java | 2 +- .../bind/spi/PhysicalTableReference.java | 2 +- .../bind/spi/QuotedIdentifierTarget.java | 2 +- .../models}/bind/spi/SchemaAware.java | 2 +- .../models}/bind/spi/TableReference.java | 10 +- .../ModelCategorizationLogging.java | 2 +- .../AbstractIdentifiableTypeMetadata.java | 14 +-- .../internal/AbstractManagedTypeMetadata.java | 20 ++-- ...ractPersistentAttributeMemberResolver.java | 10 +- .../internal/AggregatedKeyMappingImpl.java | 6 +- .../internal/AttributeMetadataImpl.java | 4 +- .../internal/BasicKeyMappingImpl.java | 6 +- .../internal/CategorizationHelper.java | 4 +- .../internal/CategorizedDomainModelImpl.java | 8 +- .../internal/ClassLoaderServiceLoading.java | 2 +- .../DomainModelCategorizationCollector.java | 8 +- .../internal/EntityHierarchyBuilder.java | 12 +-- .../internal/EntityHierarchyImpl.java | 27 +++-- .../internal/EntityTypeMetadataImpl.java | 14 +-- .../internal/GlobalRegistrationsImpl.java | 54 +++++----- .../internal/HierarchyMetadataCollector.java | 14 +-- .../internal/HierarchyTypeConsumer.java | 4 +- .../internal/HierarchyTypeHandling.java | 2 +- .../internal/LifecycleCallbackCollector.java | 12 +-- .../MappedSuperclassTypeMetadataImpl.java | 12 +-- .../ModelCategorizationContextImpl.java | 8 +- .../internal/NamedQueryRegistration.java | 6 +- .../internal/NonAggregatedKeyMappingImpl.java | 8 +- .../internal/OrmAnnotationHelper.java | 6 +- ...dardPersistentAttributeMemberResolver.java | 8 +- .../models}/categorize/package-info.java | 6 +- .../categorize/spi/AggregatedKeyMapping.java | 2 +- .../categorize/spi/AllMemberConsumer.java | 2 +- .../categorize/spi/AttributeConsumer.java | 2 +- .../categorize/spi/AttributeMetadata.java | 2 +- .../categorize/spi/BasicKeyMapping.java | 2 +- .../models}/categorize/spi/CacheRegion.java | 2 +- .../spi/CategorizedDomainModel.java | 2 +- .../spi/CollectionTypeRegistration.java | 2 +- .../categorize/spi/CompositeKeyMapping.java | 2 +- .../spi/CompositeUserTypeRegistration.java | 2 +- .../spi/ConversionRegistration.java | 4 +- .../EmbeddableInstantiatorRegistration.java | 2 +- .../categorize/spi/EntityHierarchy.java | 4 +- .../categorize/spi/EntityTypeMetadata.java | 2 +- .../categorize/spi/FilterDefRegistration.java | 2 +- .../spi/GenericGeneratorRegistration.java | 2 +- .../categorize/spi/GlobalRegistrations.java | 2 +- .../models}/categorize/spi/IdMapping.java | 4 +- .../spi/IdentifiableTypeMetadata.java | 2 +- .../categorize/spi/JavaTypeRegistration.java | 2 +- .../categorize/spi/JdbcTypeRegistration.java | 2 +- .../categorize/spi/JpaEventListener.java | 2 +- .../categorize/spi/JpaEventListenerStyle.java | 2 +- .../models}/categorize/spi/KeyMapping.java | 2 +- .../spi/ManagedResourcesProcessor.java | 22 ++-- .../categorize/spi/ManagedTypeMetadata.java | 2 +- .../spi/MappedSuperclassTypeMetadata.java | 2 +- .../spi/ModelCategorizationContext.java | 4 +- .../categorize/spi/NaturalIdCacheRegion.java | 2 +- .../spi/NonAggregatedKeyMapping.java | 2 +- .../PersistentAttributeMemberResolver.java | 2 +- .../spi/SequenceGeneratorRegistration.java | 2 +- .../spi/SingleAttributeIdMapping.java | 2 +- .../spi/SingleAttributeKeyMapping.java | 2 +- .../spi/TableGeneratorRegistration.java | 2 +- .../categorize/spi/UserTypeRegistration.java | 2 +- .../categorize/xml/XmlResourceException.java | 2 +- .../xml/internal/AttributeProcessor.java | 41 ++++--- .../xml/internal/ManagedTypeProcessor.java | 18 ++-- .../internal/PersistenceUnitMetadataImpl.java | 6 +- .../internal/ResourceStreamLocatorImpl.java | 2 +- .../xml/internal/XmlAnnotationHelper.java | 101 +++++++++--------- .../xml/internal/XmlDocumentContextImpl.java | 8 +- .../xml/internal/XmlDocumentImpl.java | 6 +- .../internal/XmlPreProcessingResultImpl.java | 4 +- .../xml/internal/XmlProcessingHelper.java | 6 +- .../xml/internal/XmlProcessingResultImpl.java | 7 +- .../attr/AnyMappingAttributeProcessing.java | 30 +++--- .../attr/BasicAttributeProcessing.java | 18 ++-- .../attr/BasicIdAttributeProcessing.java | 16 ++- .../attr/CommonAttributeProcessing.java | 15 ++- .../ElementCollectionAttributeProcessing.java | 67 ++++++------ .../attr/EmbeddedAttributeProcessing.java | 15 ++- .../attr/EmbeddedIdAttributeProcessing.java | 14 ++- .../attr/ManyToManyAttributeProcessing.java | 5 +- .../attr/ManyToOneAttributeProcessing.java | 22 ++-- .../attr/OneToManyAttributeProcessing.java | 5 +- .../attr/OneToOneAttributeProcessing.java | 4 +- .../PluralAnyMappingAttributeProcessing.java | 4 +- .../xml/internal/db/ColumnProcessing.java | 9 +- .../categorize/xml/internal/package-info.java | 4 +- .../models}/categorize/xml/package-info.java | 8 +- .../xml/spi/PersistenceUnitMetadata.java | 2 +- .../categorize/xml/spi/XmlDocument.java | 2 +- .../xml/spi/XmlDocumentContext.java | 2 +- .../xml/spi/XmlPreProcessingResult.java | 3 +- .../categorize/xml/spi/XmlPreProcessor.java | 4 +- .../xml/spi/XmlProcessingResult.java | 2 +- .../categorize/xml/spi/XmlProcessor.java | 12 +-- .../orm => boot/models}/package-info.java | 4 +- .../models/orm/SourceModelTestHelper.java | 4 +- .../org/hibernate/models/orm/XmlHelper.java | 2 +- .../models/orm/bind/BindingTestingHelper.java | 12 +-- .../HierarchyMetadataProcessorSmokeTests.java | 18 ++-- .../bind/SimpleBindingCoordinatorTests.java | 4 +- .../orm/process/SimpleProcessorTests.java | 10 +- .../resources/ManagedResourcesSmokeTests.java | 12 +-- .../ModelCategorizationContextTesting.java | 4 +- .../orm/xml/XmlProcessingSmokeTests.java | 12 +-- .../models/orm/xml/attr/AnyTests.java | 8 +- .../models/orm/xml/attr/ManyToOneTests.java | 8 +- .../models/orm/xml/column/ColumnTests.java | 9 +- .../complete/CompleteXmlInheritanceTests.java | 10 +- .../CompleteXmlWithEmbeddableTests.java | 14 +-- .../xml/complete/SimpleCompleteXmlTests.java | 10 +- .../orm/xml/dynamic/DynamicModelTests.java | 8 +- .../models/orm/xml/dynamic/RowIdTest.java | 8 +- .../xml/globals/JpaEventListenerTests.java | 6 +- .../xml/lifecycle/EntityLifecycleTests.java | 6 +- .../xml/override/SimpleOverrideXmlTests.java | 10 +- 152 files changed, 647 insertions(+), 679 deletions(-) rename src/main/java/org/hibernate/{models/orm => boot/models}/AccessTypeDeterminationException.java (95%) rename src/main/java/org/hibernate/{models/orm => boot/models}/AccessTypePlacementException.java (97%) rename src/main/java/org/hibernate/{models/orm => boot/models}/AnnotationPlacementException.java (92%) rename src/main/java/org/hibernate/{models/orm => boot/models}/Copied.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/HibernateAnnotations.java (99%) rename src/main/java/org/hibernate/{models/orm => boot/models}/JpaAnnotations.java (99%) rename src/main/java/org/hibernate/{models/orm => boot/models}/MemberResolutionException.java (93%) rename src/main/java/org/hibernate/{models/orm => boot/models}/MultipleAttributeNaturesException.java (91%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/ModelBindingLogging.java (92%) rename src/main/java/org/hibernate/boot/{ => models/bind}/internal/AnyKeyType.java (91%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/BindingContextImpl.java (89%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/BindingHelper.java (93%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/BindingOptionsImpl.java (95%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/BindingStateImpl.java (89%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/InLineView.java (87%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/PhysicalTable.java (92%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/PhysicalView.java (90%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/SecondPass.java (84%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/SecondaryTable.java (91%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/binders/AttributeBinder.java (95%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/binders/ColumnBinder.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/binders/DelegateBinders.java (70%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/binders/EntityTypeBinder.java (96%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/binders/IdentifiableTypeBinder.java (87%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/binders/ManagedTypeBinder.java (80%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/binders/MappedSuperTypeBinder.java (82%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/internal/binders/TableBinder.java (87%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/spi/BindingContext.java (85%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/spi/BindingCoordinator.java (91%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/spi/BindingOptions.java (91%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/spi/BindingState.java (78%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/spi/PersistentTableReference.java (86%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/spi/PhysicalTableReference.java (88%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/spi/QuotedIdentifierTarget.java (89%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/spi/SchemaAware.java (90%) rename src/main/java/org/hibernate/{models/orm => boot/models}/bind/spi/TableReference.java (78%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/ModelCategorizationLogging.java (96%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/AbstractIdentifiableTypeMetadata.java (93%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/AbstractManagedTypeMetadata.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/AbstractPersistentAttributeMemberResolver.java (91%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/AggregatedKeyMappingImpl.java (71%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/AttributeMetadataImpl.java (87%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/BasicKeyMappingImpl.java (71%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/CategorizationHelper.java (87%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/CategorizedDomainModelImpl.java (88%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/ClassLoaderServiceLoading.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/DomainModelCategorizationCollector.java (95%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/EntityHierarchyBuilder.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/EntityHierarchyImpl.java (90%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/EntityTypeMetadataImpl.java (96%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/GlobalRegistrationsImpl.java (92%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/HierarchyMetadataCollector.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/HierarchyTypeConsumer.java (73%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/HierarchyTypeHandling.java (80%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/LifecycleCallbackCollector.java (90%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/MappedSuperclassTypeMetadataImpl.java (85%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/ModelCategorizationContextImpl.java (88%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/NamedQueryRegistration.java (88%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/NonAggregatedKeyMappingImpl.java (82%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/OrmAnnotationHelper.java (88%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/internal/StandardPersistentAttributeMemberResolver.java (96%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/package-info.java (76%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/AggregatedKeyMapping.java (89%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/AllMemberConsumer.java (87%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/AttributeConsumer.java (87%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/AttributeMetadata.java (93%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/BasicKeyMapping.java (83%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/CacheRegion.java (98%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/CategorizedDomainModel.java (98%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/CollectionTypeRegistration.java (96%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/CompositeKeyMapping.java (88%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/CompositeUserTypeRegistration.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/ConversionRegistration.java (98%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/EmbeddableInstantiatorRegistration.java (95%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/EntityHierarchy.java (95%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/EntityTypeMetadata.java (97%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/FilterDefRegistration.java (95%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/GenericGeneratorRegistration.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/GlobalRegistrations.java (96%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/IdMapping.java (64%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/IdentifiableTypeMetadata.java (97%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/JavaTypeRegistration.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/JdbcTypeRegistration.java (93%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/JpaEventListener.java (99%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/JpaEventListenerStyle.java (93%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/KeyMapping.java (89%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/ManagedResourcesProcessor.java (92%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/ManagedTypeMetadata.java (95%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/MappedSuperclassTypeMetadata.java (90%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/ModelCategorizationContext.java (85%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/NaturalIdCacheRegion.java (95%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/NonAggregatedKeyMapping.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/PersistentAttributeMemberResolver.java (96%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/SequenceGeneratorRegistration.java (93%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/SingleAttributeIdMapping.java (91%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/SingleAttributeKeyMapping.java (93%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/TableGeneratorRegistration.java (93%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/spi/UserTypeRegistration.java (93%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/XmlResourceException.java (90%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/AttributeProcessor.java (78%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/ManagedTypeProcessor.java (97%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/PersistenceUnitMetadataImpl.java (95%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/ResourceStreamLocatorImpl.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/XmlAnnotationHelper.java (87%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/XmlDocumentContextImpl.java (80%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/XmlDocumentImpl.java (98%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/XmlPreProcessingResultImpl.java (94%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/XmlProcessingHelper.java (97%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/XmlProcessingResultImpl.java (87%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/AnyMappingAttributeProcessing.java (77%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/BasicAttributeProcessing.java (70%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/BasicIdAttributeProcessing.java (69%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/CommonAttributeProcessing.java (85%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/ElementCollectionAttributeProcessing.java (69%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/EmbeddedAttributeProcessing.java (68%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/EmbeddedIdAttributeProcessing.java (63%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/ManyToManyAttributeProcessing.java (80%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/ManyToOneAttributeProcessing.java (85%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/OneToManyAttributeProcessing.java (80%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/OneToOneAttributeProcessing.java (85%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/attr/PluralAnyMappingAttributeProcessing.java (86%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/db/ColumnProcessing.java (95%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/internal/package-info.java (90%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/package-info.java (64%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/spi/PersistenceUnitMetadata.java (97%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/spi/XmlDocument.java (98%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/spi/XmlDocumentContext.java (89%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/spi/XmlPreProcessingResult.java (88%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/spi/XmlPreProcessor.java (88%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/spi/XmlProcessingResult.java (96%) rename src/main/java/org/hibernate/{models/orm => boot/models}/categorize/xml/spi/XmlProcessor.java (86%) rename src/main/java/org/hibernate/{models/orm => boot/models}/package-info.java (86%) diff --git a/src/main/java/org/hibernate/models/orm/AccessTypeDeterminationException.java b/src/main/java/org/hibernate/boot/models/AccessTypeDeterminationException.java similarity index 95% rename from src/main/java/org/hibernate/models/orm/AccessTypeDeterminationException.java rename to src/main/java/org/hibernate/boot/models/AccessTypeDeterminationException.java index 77ca613..cea0a09 100644 --- a/src/main/java/org/hibernate/models/orm/AccessTypeDeterminationException.java +++ b/src/main/java/org/hibernate/boot/models/AccessTypeDeterminationException.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm; +package org.hibernate.boot.models; import java.util.Locale; diff --git a/src/main/java/org/hibernate/models/orm/AccessTypePlacementException.java b/src/main/java/org/hibernate/boot/models/AccessTypePlacementException.java similarity index 97% rename from src/main/java/org/hibernate/models/orm/AccessTypePlacementException.java rename to src/main/java/org/hibernate/boot/models/AccessTypePlacementException.java index c2581ea..19a1a69 100644 --- a/src/main/java/org/hibernate/models/orm/AccessTypePlacementException.java +++ b/src/main/java/org/hibernate/boot/models/AccessTypePlacementException.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm; +package org.hibernate.boot.models; import java.util.Locale; diff --git a/src/main/java/org/hibernate/models/orm/AnnotationPlacementException.java b/src/main/java/org/hibernate/boot/models/AnnotationPlacementException.java similarity index 92% rename from src/main/java/org/hibernate/models/orm/AnnotationPlacementException.java rename to src/main/java/org/hibernate/boot/models/AnnotationPlacementException.java index e7d45ae..e348c37 100644 --- a/src/main/java/org/hibernate/models/orm/AnnotationPlacementException.java +++ b/src/main/java/org/hibernate/boot/models/AnnotationPlacementException.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm; +package org.hibernate.boot.models; /** * @author Steve Ebersole diff --git a/src/main/java/org/hibernate/models/orm/Copied.java b/src/main/java/org/hibernate/boot/models/Copied.java similarity index 94% rename from src/main/java/org/hibernate/models/orm/Copied.java rename to src/main/java/org/hibernate/boot/models/Copied.java index 6d0497f..d72c225 100644 --- a/src/main/java/org/hibernate/models/orm/Copied.java +++ b/src/main/java/org/hibernate/boot/models/Copied.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm; +package org.hibernate.boot.models; import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/org/hibernate/models/orm/HibernateAnnotations.java b/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java similarity index 99% rename from src/main/java/org/hibernate/models/orm/HibernateAnnotations.java rename to src/main/java/org/hibernate/boot/models/HibernateAnnotations.java index e5deb33..746ea73 100644 --- a/src/main/java/org/hibernate/models/orm/HibernateAnnotations.java +++ b/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm; +package org.hibernate.boot.models; import java.lang.annotation.Annotation; import java.util.function.Consumer; @@ -14,7 +14,7 @@ import org.hibernate.boot.internal.CollectionClassification; import org.hibernate.boot.internal.Extends; import org.hibernate.boot.internal.Target; -import org.hibernate.models.orm.categorize.internal.OrmAnnotationHelper; +import org.hibernate.boot.models.categorize.internal.OrmAnnotationHelper; import org.hibernate.models.spi.AnnotationDescriptor; import static org.hibernate.models.internal.AnnotationHelper.createOrmDescriptor; diff --git a/src/main/java/org/hibernate/models/orm/JpaAnnotations.java b/src/main/java/org/hibernate/boot/models/JpaAnnotations.java similarity index 99% rename from src/main/java/org/hibernate/models/orm/JpaAnnotations.java rename to src/main/java/org/hibernate/boot/models/JpaAnnotations.java index 3952af2..06b47e6 100644 --- a/src/main/java/org/hibernate/models/orm/JpaAnnotations.java +++ b/src/main/java/org/hibernate/boot/models/JpaAnnotations.java @@ -4,12 +4,12 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm; +package org.hibernate.boot.models; import java.lang.annotation.Annotation; import java.util.function.Consumer; -import org.hibernate.models.orm.categorize.internal.OrmAnnotationHelper; +import org.hibernate.boot.models.categorize.internal.OrmAnnotationHelper; import org.hibernate.models.spi.AnnotationDescriptor; import jakarta.persistence.Access; diff --git a/src/main/java/org/hibernate/models/orm/MemberResolutionException.java b/src/main/java/org/hibernate/boot/models/MemberResolutionException.java similarity index 93% rename from src/main/java/org/hibernate/models/orm/MemberResolutionException.java rename to src/main/java/org/hibernate/boot/models/MemberResolutionException.java index 71bbcef..4a4b177 100644 --- a/src/main/java/org/hibernate/models/orm/MemberResolutionException.java +++ b/src/main/java/org/hibernate/boot/models/MemberResolutionException.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm; +package org.hibernate.boot.models; /** * Indicates a problem resolving a member from {@linkplain org.hibernate.models.spi.ClassDetails} diff --git a/src/main/java/org/hibernate/models/orm/MultipleAttributeNaturesException.java b/src/main/java/org/hibernate/boot/models/MultipleAttributeNaturesException.java similarity index 91% rename from src/main/java/org/hibernate/models/orm/MultipleAttributeNaturesException.java rename to src/main/java/org/hibernate/boot/models/MultipleAttributeNaturesException.java index e782d39..3c4651a 100644 --- a/src/main/java/org/hibernate/models/orm/MultipleAttributeNaturesException.java +++ b/src/main/java/org/hibernate/boot/models/MultipleAttributeNaturesException.java @@ -4,12 +4,12 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm; +package org.hibernate.boot.models; import java.util.EnumSet; import org.hibernate.MappingException; -import org.hibernate.models.orm.categorize.spi.AttributeMetadata; +import org.hibernate.boot.models.categorize.spi.AttributeMetadata; /** * Condition where an attribute indicates multiple {@linkplain AttributeMetadata.AttributeNature natures} diff --git a/src/main/java/org/hibernate/models/orm/bind/ModelBindingLogging.java b/src/main/java/org/hibernate/boot/models/bind/ModelBindingLogging.java similarity index 92% rename from src/main/java/org/hibernate/models/orm/bind/ModelBindingLogging.java rename to src/main/java/org/hibernate/boot/models/bind/ModelBindingLogging.java index 10e1903..29ad70e 100644 --- a/src/main/java/org/hibernate/models/orm/bind/ModelBindingLogging.java +++ b/src/main/java/org/hibernate/boot/models/bind/ModelBindingLogging.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind; +package org.hibernate.boot.models.bind; import org.hibernate.Internal; diff --git a/src/main/java/org/hibernate/boot/internal/AnyKeyType.java b/src/main/java/org/hibernate/boot/models/bind/internal/AnyKeyType.java similarity index 91% rename from src/main/java/org/hibernate/boot/internal/AnyKeyType.java rename to src/main/java/org/hibernate/boot/models/bind/internal/AnyKeyType.java index cdd51d5..d5a25df 100644 --- a/src/main/java/org/hibernate/boot/internal/AnyKeyType.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/AnyKeyType.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.boot.internal; +package org.hibernate.boot.models.bind.internal; import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/BindingContextImpl.java b/src/main/java/org/hibernate/boot/models/bind/internal/BindingContextImpl.java similarity index 89% rename from src/main/java/org/hibernate/models/orm/bind/internal/BindingContextImpl.java rename to src/main/java/org/hibernate/boot/models/bind/internal/BindingContextImpl.java index 013b46c..dd2910e 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/BindingContextImpl.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/BindingContextImpl.java @@ -4,16 +4,15 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal; +package org.hibernate.boot.models.bind.internal; import org.hibernate.boot.internal.ClassmateContext; +import org.hibernate.boot.models.bind.spi.BindingContext; import org.hibernate.boot.spi.BootstrapContext; -import org.hibernate.models.orm.bind.spi.BindingContext; -import org.hibernate.models.orm.categorize.spi.CategorizedDomainModel; -import org.hibernate.models.orm.categorize.spi.GlobalRegistrations; +import org.hibernate.boot.models.categorize.spi.CategorizedDomainModel; +import org.hibernate.boot.models.categorize.spi.GlobalRegistrations; import org.hibernate.models.spi.AnnotationDescriptorRegistry; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.hibernate.service.ServiceRegistry; import jakarta.persistence.SharedCacheMode; diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/BindingHelper.java b/src/main/java/org/hibernate/boot/models/bind/internal/BindingHelper.java similarity index 93% rename from src/main/java/org/hibernate/models/orm/bind/internal/BindingHelper.java rename to src/main/java/org/hibernate/boot/models/bind/internal/BindingHelper.java index 54ee58c..5532fdb 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/BindingHelper.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/BindingHelper.java @@ -4,23 +4,23 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal; +package org.hibernate.boot.models.bind.internal; import java.lang.annotation.Annotation; import java.util.Iterator; import java.util.List; import org.hibernate.boot.model.naming.Identifier; +import org.hibernate.boot.models.bind.spi.BindingContext; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.models.ModelsException; -import org.hibernate.models.orm.bind.spi.BindingContext; -import org.hibernate.models.orm.bind.spi.BindingOptions; -import org.hibernate.models.orm.bind.spi.QuotedIdentifierTarget; +import org.hibernate.boot.models.bind.spi.BindingOptions; +import org.hibernate.boot.models.bind.spi.QuotedIdentifierTarget; import org.hibernate.models.spi.AnnotationDescriptor; import org.hibernate.models.spi.AnnotationUsage; import org.hibernate.models.spi.AttributeDescriptor; -import static org.hibernate.models.orm.bind.ModelBindingLogging.MODEL_BINDING_LOGGER; +import static org.hibernate.boot.models.bind.ModelBindingLogging.MODEL_BINDING_LOGGER; /** * @author Steve Ebersole diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/BindingOptionsImpl.java b/src/main/java/org/hibernate/boot/models/bind/internal/BindingOptionsImpl.java similarity index 95% rename from src/main/java/org/hibernate/models/orm/bind/internal/BindingOptionsImpl.java rename to src/main/java/org/hibernate/boot/models/bind/internal/BindingOptionsImpl.java index e010d70..ab1a0f8 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/BindingOptionsImpl.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/BindingOptionsImpl.java @@ -4,19 +4,19 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal; +package org.hibernate.boot.models.bind.internal; import java.lang.annotation.Annotation; import java.util.EnumSet; import org.hibernate.boot.model.naming.Identifier; +import org.hibernate.boot.models.bind.spi.QuotedIdentifierTarget; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.cfg.AvailableSettings; import org.hibernate.engine.config.spi.ConfigurationService; import org.hibernate.engine.config.spi.StandardConverters; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; -import org.hibernate.models.orm.bind.spi.BindingOptions; -import org.hibernate.models.orm.bind.spi.QuotedIdentifierTarget; +import org.hibernate.boot.models.bind.spi.BindingOptions; /** * @author Steve Ebersole diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/BindingStateImpl.java b/src/main/java/org/hibernate/boot/models/bind/internal/BindingStateImpl.java similarity index 89% rename from src/main/java/org/hibernate/models/orm/bind/internal/BindingStateImpl.java rename to src/main/java/org/hibernate/boot/models/bind/internal/BindingStateImpl.java index 73b9ee3..d147f0e 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/BindingStateImpl.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/BindingStateImpl.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal; +package org.hibernate.boot.models.bind.internal; import java.util.ArrayList; import java.util.Collections; @@ -15,22 +15,22 @@ import java.util.function.BiConsumer; import org.hibernate.boot.model.naming.Identifier; +import org.hibernate.boot.models.bind.spi.BindingState; +import org.hibernate.boot.models.bind.spi.TableReference; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.engine.spi.FilterDefinition; import org.hibernate.internal.util.KeyedConsumer; import org.hibernate.internal.util.collections.CollectionHelper; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.models.ModelsException; -import org.hibernate.models.orm.bind.internal.binders.EntityTypeBinder; -import org.hibernate.models.orm.bind.internal.binders.IdentifiableTypeBinder; -import org.hibernate.models.orm.bind.internal.binders.ManagedTypeBinder; -import org.hibernate.models.orm.bind.internal.binders.MappedSuperTypeBinder; -import org.hibernate.models.orm.bind.internal.binders.TableBinder; -import org.hibernate.models.orm.bind.spi.BindingState; -import org.hibernate.models.orm.bind.spi.TableReference; -import org.hibernate.models.orm.categorize.spi.FilterDefRegistration; -import org.hibernate.models.orm.categorize.spi.IdentifiableTypeMetadata; -import org.hibernate.models.orm.categorize.spi.ManagedTypeMetadata; +import org.hibernate.boot.models.bind.internal.binders.EntityTypeBinder; +import org.hibernate.boot.models.bind.internal.binders.IdentifiableTypeBinder; +import org.hibernate.boot.models.bind.internal.binders.ManagedTypeBinder; +import org.hibernate.boot.models.bind.internal.binders.MappedSuperTypeBinder; +import org.hibernate.boot.models.bind.internal.binders.TableBinder; +import org.hibernate.boot.models.categorize.spi.FilterDefRegistration; +import org.hibernate.boot.models.categorize.spi.IdentifiableTypeMetadata; +import org.hibernate.boot.models.categorize.spi.ManagedTypeMetadata; import org.hibernate.models.spi.ClassDetails; import org.hibernate.type.spi.TypeConfiguration; diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/InLineView.java b/src/main/java/org/hibernate/boot/models/bind/internal/InLineView.java similarity index 87% rename from src/main/java/org/hibernate/models/orm/bind/internal/InLineView.java rename to src/main/java/org/hibernate/boot/models/bind/internal/InLineView.java index 1625a41..9559642 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/InLineView.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/InLineView.java @@ -4,11 +4,11 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal; +package org.hibernate.boot.models.bind.internal; import org.hibernate.boot.model.naming.Identifier; +import org.hibernate.boot.models.bind.spi.TableReference; import org.hibernate.mapping.Table; -import org.hibernate.models.orm.bind.spi.TableReference; /** * Models a from-clause sub-query. diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/PhysicalTable.java b/src/main/java/org/hibernate/boot/models/bind/internal/PhysicalTable.java similarity index 92% rename from src/main/java/org/hibernate/models/orm/bind/internal/PhysicalTable.java rename to src/main/java/org/hibernate/boot/models/bind/internal/PhysicalTable.java index 5f9e228..1498b3f 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/PhysicalTable.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/PhysicalTable.java @@ -4,11 +4,11 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal; +package org.hibernate.boot.models.bind.internal; import org.hibernate.boot.model.naming.Identifier; +import org.hibernate.boot.models.bind.spi.PhysicalTableReference; import org.hibernate.mapping.Table; -import org.hibernate.models.orm.bind.spi.PhysicalTableReference; /** * Models a physical table from the underlying database schema diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/PhysicalView.java b/src/main/java/org/hibernate/boot/models/bind/internal/PhysicalView.java similarity index 90% rename from src/main/java/org/hibernate/models/orm/bind/internal/PhysicalView.java rename to src/main/java/org/hibernate/boot/models/bind/internal/PhysicalView.java index 5c62f0d..f3ed5ed 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/PhysicalView.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/PhysicalView.java @@ -4,11 +4,11 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal; +package org.hibernate.boot.models.bind.internal; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.mapping.Table; -import org.hibernate.models.orm.bind.spi.PersistentTableReference; +import org.hibernate.boot.models.bind.spi.PersistentTableReference; /** * @see org.hibernate.annotations.View diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/SecondPass.java b/src/main/java/org/hibernate/boot/models/bind/internal/SecondPass.java similarity index 84% rename from src/main/java/org/hibernate/models/orm/bind/internal/SecondPass.java rename to src/main/java/org/hibernate/boot/models/bind/internal/SecondPass.java index 9d8c6dd..e940cb3 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/SecondPass.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/SecondPass.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal; +package org.hibernate.boot.models.bind.internal; /** * @author Steve Ebersole diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/SecondaryTable.java b/src/main/java/org/hibernate/boot/models/bind/internal/SecondaryTable.java similarity index 91% rename from src/main/java/org/hibernate/models/orm/bind/internal/SecondaryTable.java rename to src/main/java/org/hibernate/boot/models/bind/internal/SecondaryTable.java index 12dd982..d70eefc 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/SecondaryTable.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/SecondaryTable.java @@ -4,11 +4,11 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal; +package org.hibernate.boot.models.bind.internal; import org.hibernate.boot.model.naming.Identifier; +import org.hibernate.boot.models.bind.spi.PhysicalTableReference; import org.hibernate.mapping.Table; -import org.hibernate.models.orm.bind.spi.PhysicalTableReference; /** * @see jakarta.persistence.SecondaryTable diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/binders/AttributeBinder.java b/src/main/java/org/hibernate/boot/models/bind/internal/binders/AttributeBinder.java similarity index 95% rename from src/main/java/org/hibernate/models/orm/bind/internal/binders/AttributeBinder.java rename to src/main/java/org/hibernate/boot/models/bind/internal/binders/AttributeBinder.java index 6020498..96e416c 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/binders/AttributeBinder.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/binders/AttributeBinder.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal.binders; +package org.hibernate.boot.models.bind.internal.binders; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -22,17 +22,17 @@ import org.hibernate.annotations.TimeZoneStorageType; import org.hibernate.boot.model.convert.internal.ClassBasedConverterDescriptor; import org.hibernate.boot.model.naming.Identifier; +import org.hibernate.boot.models.bind.internal.BindingHelper; +import org.hibernate.boot.models.bind.spi.BindingContext; +import org.hibernate.boot.models.bind.spi.BindingOptions; +import org.hibernate.boot.models.bind.spi.BindingState; +import org.hibernate.boot.models.bind.spi.TableReference; import org.hibernate.mapping.BasicValue; import org.hibernate.mapping.Property; import org.hibernate.models.ModelsException; -import org.hibernate.models.orm.AnnotationPlacementException; -import org.hibernate.models.orm.bind.internal.BindingHelper; -import org.hibernate.models.orm.bind.internal.SecondPass; -import org.hibernate.models.orm.bind.spi.BindingContext; -import org.hibernate.models.orm.bind.spi.BindingOptions; -import org.hibernate.models.orm.bind.spi.BindingState; -import org.hibernate.models.orm.bind.spi.TableReference; -import org.hibernate.models.orm.categorize.spi.AttributeMetadata; +import org.hibernate.boot.models.AnnotationPlacementException; +import org.hibernate.boot.models.bind.internal.SecondPass; +import org.hibernate.boot.models.categorize.spi.AttributeMetadata; import org.hibernate.models.spi.AnnotationUsage; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.MemberDetails; @@ -50,7 +50,7 @@ import static jakarta.persistence.EnumType.ORDINAL; import static org.hibernate.annotations.TimeZoneStorageType.AUTO; import static org.hibernate.annotations.TimeZoneStorageType.COLUMN; -import static org.hibernate.models.orm.categorize.spi.AttributeMetadata.AttributeNature.BASIC; +import static org.hibernate.boot.models.categorize.spi.AttributeMetadata.AttributeNature.BASIC; /** * @author Steve Ebersole diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/binders/ColumnBinder.java b/src/main/java/org/hibernate/boot/models/bind/internal/binders/ColumnBinder.java similarity index 94% rename from src/main/java/org/hibernate/models/orm/bind/internal/binders/ColumnBinder.java rename to src/main/java/org/hibernate/boot/models/bind/internal/binders/ColumnBinder.java index 0ab9e98..f8a5910 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/binders/ColumnBinder.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/binders/ColumnBinder.java @@ -4,12 +4,12 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal.binders; +package org.hibernate.boot.models.bind.internal.binders; import java.util.function.Supplier; +import org.hibernate.boot.models.bind.internal.BindingHelper; import org.hibernate.mapping.Column; -import org.hibernate.models.orm.bind.internal.BindingHelper; import org.hibernate.models.spi.AnnotationUsage; import static org.hibernate.internal.util.NullnessHelper.nullif; diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/binders/DelegateBinders.java b/src/main/java/org/hibernate/boot/models/bind/internal/binders/DelegateBinders.java similarity index 70% rename from src/main/java/org/hibernate/models/orm/bind/internal/binders/DelegateBinders.java rename to src/main/java/org/hibernate/boot/models/bind/internal/binders/DelegateBinders.java index 89df932..330804c 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/binders/DelegateBinders.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/binders/DelegateBinders.java @@ -4,11 +4,11 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal.binders; +package org.hibernate.boot.models.bind.internal.binders; -import org.hibernate.models.orm.bind.spi.BindingContext; -import org.hibernate.models.orm.bind.spi.BindingOptions; -import org.hibernate.models.orm.bind.spi.BindingState; +import org.hibernate.boot.models.bind.spi.BindingContext; +import org.hibernate.boot.models.bind.spi.BindingOptions; +import org.hibernate.boot.models.bind.spi.BindingState; /** * @author Steve Ebersole diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/binders/EntityTypeBinder.java b/src/main/java/org/hibernate/boot/models/bind/internal/binders/EntityTypeBinder.java similarity index 96% rename from src/main/java/org/hibernate/models/orm/bind/internal/binders/EntityTypeBinder.java rename to src/main/java/org/hibernate/boot/models/bind/internal/binders/EntityTypeBinder.java index f02346c..1bac75b 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/binders/EntityTypeBinder.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/binders/EntityTypeBinder.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal.binders; +package org.hibernate.boot.models.bind.internal.binders; import java.lang.reflect.Method; import java.util.ArrayList; @@ -21,6 +21,11 @@ import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.PhysicalNamingStrategy; import org.hibernate.boot.model.relational.Database; +import org.hibernate.boot.models.bind.internal.BindingHelper; +import org.hibernate.boot.models.bind.internal.SecondaryTable; +import org.hibernate.boot.models.bind.spi.BindingContext; +import org.hibernate.boot.models.bind.spi.BindingOptions; +import org.hibernate.boot.models.bind.spi.BindingState; import org.hibernate.engine.OptimisticLockStyle; import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.collections.CollectionHelper; @@ -42,18 +47,13 @@ import org.hibernate.mapping.TableOwner; import org.hibernate.mapping.UnionSubclass; import org.hibernate.models.ModelsException; -import org.hibernate.models.orm.bind.internal.BindingHelper; -import org.hibernate.models.orm.bind.internal.SecondaryTable; -import org.hibernate.models.orm.bind.spi.BindingContext; -import org.hibernate.models.orm.bind.spi.BindingOptions; -import org.hibernate.models.orm.bind.spi.BindingState; -import org.hibernate.models.orm.categorize.spi.CacheRegion; -import org.hibernate.models.orm.categorize.spi.EntityHierarchy; -import org.hibernate.models.orm.categorize.spi.EntityTypeMetadata; -import org.hibernate.models.orm.categorize.spi.IdentifiableTypeMetadata; -import org.hibernate.models.orm.categorize.spi.JpaEventListener; -import org.hibernate.models.orm.categorize.spi.JpaEventListenerStyle; -import org.hibernate.models.orm.categorize.spi.NaturalIdCacheRegion; +import org.hibernate.boot.models.categorize.spi.CacheRegion; +import org.hibernate.boot.models.categorize.spi.EntityHierarchy; +import org.hibernate.boot.models.categorize.spi.EntityTypeMetadata; +import org.hibernate.boot.models.categorize.spi.IdentifiableTypeMetadata; +import org.hibernate.boot.models.categorize.spi.JpaEventListener; +import org.hibernate.boot.models.categorize.spi.JpaEventListenerStyle; +import org.hibernate.boot.models.categorize.spi.NaturalIdCacheRegion; import org.hibernate.models.spi.AnnotationUsage; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.MethodDetails; diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/binders/IdentifiableTypeBinder.java b/src/main/java/org/hibernate/boot/models/bind/internal/binders/IdentifiableTypeBinder.java similarity index 87% rename from src/main/java/org/hibernate/models/orm/bind/internal/binders/IdentifiableTypeBinder.java rename to src/main/java/org/hibernate/boot/models/bind/internal/binders/IdentifiableTypeBinder.java index f3cb39e..295c88b 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/binders/IdentifiableTypeBinder.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/binders/IdentifiableTypeBinder.java @@ -4,26 +4,26 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal.binders; +package org.hibernate.boot.models.bind.internal.binders; import java.util.ArrayList; import java.util.List; import org.hibernate.annotations.NaturalId; +import org.hibernate.boot.models.bind.spi.BindingContext; +import org.hibernate.boot.models.bind.spi.BindingOptions; +import org.hibernate.boot.models.bind.spi.BindingState; import org.hibernate.mapping.BasicValue; import org.hibernate.mapping.IdentifiableTypeClass; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; import org.hibernate.mapping.Table; import org.hibernate.mapping.Value; -import org.hibernate.models.orm.bind.spi.BindingContext; -import org.hibernate.models.orm.bind.spi.BindingOptions; -import org.hibernate.models.orm.bind.spi.BindingState; -import org.hibernate.models.orm.categorize.spi.AttributeMetadata; -import org.hibernate.models.orm.categorize.spi.EntityHierarchy; -import org.hibernate.models.orm.categorize.spi.EntityTypeMetadata; -import org.hibernate.models.orm.categorize.spi.IdentifiableTypeMetadata; -import org.hibernate.models.orm.categorize.spi.KeyMapping; +import org.hibernate.boot.models.categorize.spi.AttributeMetadata; +import org.hibernate.boot.models.categorize.spi.EntityHierarchy; +import org.hibernate.boot.models.categorize.spi.EntityTypeMetadata; +import org.hibernate.boot.models.categorize.spi.IdentifiableTypeMetadata; +import org.hibernate.boot.models.categorize.spi.KeyMapping; /** * @author Steve Ebersole diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/binders/ManagedTypeBinder.java b/src/main/java/org/hibernate/boot/models/bind/internal/binders/ManagedTypeBinder.java similarity index 80% rename from src/main/java/org/hibernate/models/orm/bind/internal/binders/ManagedTypeBinder.java rename to src/main/java/org/hibernate/boot/models/bind/internal/binders/ManagedTypeBinder.java index 27b0cd6..3bdd1e2 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/binders/ManagedTypeBinder.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/binders/ManagedTypeBinder.java @@ -4,12 +4,12 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal.binders; +package org.hibernate.boot.models.bind.internal.binders; -import org.hibernate.models.orm.bind.spi.BindingContext; -import org.hibernate.models.orm.bind.spi.BindingOptions; -import org.hibernate.models.orm.bind.spi.BindingState; -import org.hibernate.models.orm.categorize.spi.ManagedTypeMetadata; +import org.hibernate.boot.models.bind.spi.BindingContext; +import org.hibernate.boot.models.bind.spi.BindingOptions; +import org.hibernate.boot.models.bind.spi.BindingState; +import org.hibernate.boot.models.categorize.spi.ManagedTypeMetadata; /** * @author Steve Ebersole diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/binders/MappedSuperTypeBinder.java b/src/main/java/org/hibernate/boot/models/bind/internal/binders/MappedSuperTypeBinder.java similarity index 82% rename from src/main/java/org/hibernate/models/orm/bind/internal/binders/MappedSuperTypeBinder.java rename to src/main/java/org/hibernate/boot/models/bind/internal/binders/MappedSuperTypeBinder.java index f4cbff7..b766c07 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/binders/MappedSuperTypeBinder.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/binders/MappedSuperTypeBinder.java @@ -4,19 +4,19 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal.binders; +package org.hibernate.boot.models.bind.internal.binders; +import org.hibernate.boot.models.bind.spi.BindingContext; +import org.hibernate.boot.models.bind.spi.BindingOptions; +import org.hibernate.boot.models.bind.spi.BindingState; import org.hibernate.internal.util.StringHelper; import org.hibernate.mapping.MappedSuperclass; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; -import org.hibernate.models.orm.bind.spi.BindingContext; -import org.hibernate.models.orm.bind.spi.BindingOptions; -import org.hibernate.models.orm.bind.spi.BindingState; -import org.hibernate.models.orm.categorize.spi.EntityHierarchy; -import org.hibernate.models.orm.categorize.spi.EntityTypeMetadata; -import org.hibernate.models.orm.categorize.spi.IdentifiableTypeMetadata; -import org.hibernate.models.orm.categorize.spi.MappedSuperclassTypeMetadata; +import org.hibernate.boot.models.categorize.spi.EntityHierarchy; +import org.hibernate.boot.models.categorize.spi.EntityTypeMetadata; +import org.hibernate.boot.models.categorize.spi.IdentifiableTypeMetadata; +import org.hibernate.boot.models.categorize.spi.MappedSuperclassTypeMetadata; /** * @author Steve Ebersole diff --git a/src/main/java/org/hibernate/models/orm/bind/internal/binders/TableBinder.java b/src/main/java/org/hibernate/boot/models/bind/internal/binders/TableBinder.java similarity index 87% rename from src/main/java/org/hibernate/models/orm/bind/internal/binders/TableBinder.java rename to src/main/java/org/hibernate/boot/models/bind/internal/binders/TableBinder.java index c3c5576..ed18a1b 100644 --- a/src/main/java/org/hibernate/models/orm/bind/internal/binders/TableBinder.java +++ b/src/main/java/org/hibernate/boot/models/bind/internal/binders/TableBinder.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.internal.binders; +package org.hibernate.boot.models.bind.internal.binders; import java.lang.annotation.Annotation; import java.util.ArrayList; @@ -18,31 +18,27 @@ import org.hibernate.boot.model.naming.ImplicitEntityNameSource; import org.hibernate.boot.model.naming.ImplicitNamingStrategy; import org.hibernate.boot.model.naming.PhysicalNamingStrategy; +import org.hibernate.boot.models.bind.internal.BindingHelper; +import org.hibernate.boot.models.bind.internal.InLineView; +import org.hibernate.boot.models.bind.internal.PhysicalTable; +import org.hibernate.boot.models.bind.internal.SecondPass; +import org.hibernate.boot.models.bind.spi.BindingContext; +import org.hibernate.boot.models.bind.spi.BindingOptions; +import org.hibernate.boot.models.bind.spi.BindingState; +import org.hibernate.boot.models.bind.spi.PhysicalTableReference; +import org.hibernate.boot.models.bind.spi.QuotedIdentifierTarget; +import org.hibernate.boot.models.bind.spi.TableReference; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.internal.util.StringHelper; import org.hibernate.mapping.Table; -import org.hibernate.models.orm.AnnotationPlacementException; -import org.hibernate.models.orm.bind.internal.InLineView; -import org.hibernate.models.orm.bind.internal.PhysicalTable; -import org.hibernate.models.orm.bind.internal.SecondPass; -import org.hibernate.models.orm.bind.spi.BindingContext; -import org.hibernate.models.orm.bind.internal.BindingHelper; -import org.hibernate.models.orm.bind.spi.BindingOptions; -import org.hibernate.models.orm.bind.spi.BindingState; -import org.hibernate.models.orm.bind.spi.PhysicalTableReference; -import org.hibernate.models.orm.bind.spi.QuotedIdentifierTarget; -import org.hibernate.models.orm.bind.spi.TableReference; -import org.hibernate.models.orm.categorize.spi.EntityTypeMetadata; +import org.hibernate.boot.models.AnnotationPlacementException; +import org.hibernate.boot.models.categorize.spi.EntityTypeMetadata; import org.hibernate.models.spi.AnnotationUsage; import org.hibernate.models.spi.ClassDetails; import jakarta.persistence.SecondaryTable; -import static org.hibernate.models.orm.bind.spi.QuotedIdentifierTarget.CATALOG_NAME; -import static org.hibernate.models.orm.bind.spi.QuotedIdentifierTarget.SCHEMA_NAME; -import static org.hibernate.models.orm.bind.spi.QuotedIdentifierTarget.TABLE_NAME; - /** * @author Steve Ebersole */ @@ -104,11 +100,11 @@ public TableReference processPrimaryTable(EntityTypeMetadata type) { return tableReference; } - public List processSecondaryTables(EntityTypeMetadata type) { + public List processSecondaryTables(EntityTypeMetadata type) { final ClassDetails typeClassDetails = type.getClassDetails(); final List> secondaryTableAnns = typeClassDetails.getRepeatedAnnotationUsages( SecondaryTable.class ); - final List result = new ArrayList<>( secondaryTableAnns.size() ); + final List result = new ArrayList<>( secondaryTableAnns.size() ); secondaryTableAnns.forEach( (secondaryTableAnn) -> { final AnnotationUsage secondaryRowAnn = typeClassDetails.getNamedAnnotationUsage( @@ -116,7 +112,7 @@ public List processSecond secondaryTableAnn.getString( "name" ), "table" ); - final org.hibernate.models.orm.bind.internal.SecondaryTable binding = processSecondaryTable( type, secondaryTableAnn, secondaryRowAnn ); + final org.hibernate.boot.models.bind.internal.SecondaryTable binding = processSecondaryTable( type, secondaryTableAnn, secondaryRowAnn ); result.add( binding ); bindingState.addTable( binding ); } ); @@ -220,7 +216,7 @@ private Identifier determineLogicalName(EntityTypeMetadata type, AnnotationUsage if ( tableAnn != null ) { final String name = StringHelper.nullIfEmpty( tableAnn.getString( "name" ) ); if ( name != null ) { - return BindingHelper.toIdentifier( name, TABLE_NAME, bindingOptions, jdbcEnvironment ); + return BindingHelper.toIdentifier( name, QuotedIdentifierTarget.TABLE_NAME, bindingOptions, jdbcEnvironment ); } } @@ -249,14 +245,14 @@ private PhysicalTable createExplicitPhysicalTable( "schema", jakarta.persistence.Table.class, bindingOptions.getDefaultSchemaName(), - SCHEMA_NAME + QuotedIdentifierTarget.SCHEMA_NAME ); final Identifier logicalCatalogName = resolveDatabaseIdentifier( tableAnn, "catalog", jakarta.persistence.Table.class, bindingOptions.getDefaultCatalogName(), - CATALOG_NAME + QuotedIdentifierTarget.CATALOG_NAME ); final var binding = bindingState.getMetadataBuildingContext().getMetadataCollector().addTable( @@ -282,7 +278,7 @@ private PhysicalTable createExplicitPhysicalTable( ); } - private org.hibernate.models.orm.bind.internal.SecondaryTable processSecondaryTable( + private org.hibernate.boot.models.bind.internal.SecondaryTable processSecondaryTable( EntityTypeMetadata type, AnnotationUsage secondaryTableAnn, AnnotationUsage secondaryRowAnn) { @@ -292,14 +288,14 @@ private org.hibernate.models.orm.bind.internal.SecondaryTable processSecondaryTa "schema", SecondaryTable.class, bindingOptions.getDefaultSchemaName(), - SCHEMA_NAME + QuotedIdentifierTarget.SCHEMA_NAME ); final Identifier catalogName = resolveDatabaseIdentifier( secondaryTableAnn, "catalog", SecondaryTable.class, bindingOptions.getDefaultCatalogName(), - CATALOG_NAME + QuotedIdentifierTarget.CATALOG_NAME ); final var binding = bindingState.getMetadataBuildingContext().getMetadataCollector().addTable( @@ -314,7 +310,7 @@ private org.hibernate.models.orm.bind.internal.SecondaryTable processSecondaryTa applyComment( binding, secondaryTableAnn, findCommentAnnotation( type, logicalName, false ) ); applyOptions( binding, secondaryTableAnn ); - return new org.hibernate.models.orm.bind.internal.SecondaryTable ( + return new org.hibernate.boot.models.bind.internal.SecondaryTable( logicalName, catalogName, schemaName, diff --git a/src/main/java/org/hibernate/models/orm/bind/spi/BindingContext.java b/src/main/java/org/hibernate/boot/models/bind/spi/BindingContext.java similarity index 85% rename from src/main/java/org/hibernate/models/orm/bind/spi/BindingContext.java rename to src/main/java/org/hibernate/boot/models/bind/spi/BindingContext.java index 869c336..3cc872e 100644 --- a/src/main/java/org/hibernate/models/orm/bind/spi/BindingContext.java +++ b/src/main/java/org/hibernate/boot/models/bind/spi/BindingContext.java @@ -4,12 +4,11 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.spi; +package org.hibernate.boot.models.bind.spi; import org.hibernate.boot.internal.ClassmateContext; import org.hibernate.boot.spi.BootstrapContext; -import org.hibernate.boot.spi.MetadataBuildingContext; -import org.hibernate.models.orm.categorize.spi.GlobalRegistrations; +import org.hibernate.boot.models.categorize.spi.GlobalRegistrations; import org.hibernate.models.spi.SourceModelContext; import org.hibernate.service.ServiceRegistry; diff --git a/src/main/java/org/hibernate/models/orm/bind/spi/BindingCoordinator.java b/src/main/java/org/hibernate/boot/models/bind/spi/BindingCoordinator.java similarity index 91% rename from src/main/java/org/hibernate/models/orm/bind/spi/BindingCoordinator.java rename to src/main/java/org/hibernate/boot/models/bind/spi/BindingCoordinator.java index 29ba0b2..f16c13f 100644 --- a/src/main/java/org/hibernate/models/orm/bind/spi/BindingCoordinator.java +++ b/src/main/java/org/hibernate/boot/models/bind/spi/BindingCoordinator.java @@ -4,25 +4,25 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.spi; +package org.hibernate.boot.models.bind.spi; import java.util.List; import org.hibernate.annotations.Any; import org.hibernate.annotations.ManyToAny; import org.hibernate.mapping.RootClass; -import org.hibernate.models.orm.AnnotationPlacementException; -import org.hibernate.models.orm.bind.internal.binders.DelegateBinders; -import org.hibernate.models.orm.bind.internal.binders.EntityTypeBinder; -import org.hibernate.models.orm.bind.internal.binders.MappedSuperTypeBinder; -import org.hibernate.models.orm.categorize.spi.AttributeMetadata; -import org.hibernate.models.orm.categorize.spi.CategorizedDomainModel; -import org.hibernate.models.orm.categorize.spi.EntityHierarchy; -import org.hibernate.models.orm.categorize.spi.EntityTypeMetadata; -import org.hibernate.models.orm.categorize.spi.GlobalRegistrations; -import org.hibernate.models.orm.categorize.spi.IdentifiableTypeMetadata; -import org.hibernate.models.orm.categorize.spi.ManagedTypeMetadata; -import org.hibernate.models.orm.categorize.spi.MappedSuperclassTypeMetadata; +import org.hibernate.boot.models.AnnotationPlacementException; +import org.hibernate.boot.models.bind.internal.binders.DelegateBinders; +import org.hibernate.boot.models.bind.internal.binders.EntityTypeBinder; +import org.hibernate.boot.models.bind.internal.binders.MappedSuperTypeBinder; +import org.hibernate.boot.models.categorize.spi.AttributeMetadata; +import org.hibernate.boot.models.categorize.spi.CategorizedDomainModel; +import org.hibernate.boot.models.categorize.spi.EntityHierarchy; +import org.hibernate.boot.models.categorize.spi.EntityTypeMetadata; +import org.hibernate.boot.models.categorize.spi.GlobalRegistrations; +import org.hibernate.boot.models.categorize.spi.IdentifiableTypeMetadata; +import org.hibernate.boot.models.categorize.spi.ManagedTypeMetadata; +import org.hibernate.boot.models.categorize.spi.MappedSuperclassTypeMetadata; import org.hibernate.models.spi.AnnotationUsage; import org.hibernate.models.spi.ClassDetails; diff --git a/src/main/java/org/hibernate/models/orm/bind/spi/BindingOptions.java b/src/main/java/org/hibernate/boot/models/bind/spi/BindingOptions.java similarity index 91% rename from src/main/java/org/hibernate/models/orm/bind/spi/BindingOptions.java rename to src/main/java/org/hibernate/boot/models/bind/spi/BindingOptions.java index 2d25a45..e623fb0 100644 --- a/src/main/java/org/hibernate/models/orm/bind/spi/BindingOptions.java +++ b/src/main/java/org/hibernate/boot/models/bind/spi/BindingOptions.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.spi; +package org.hibernate.boot.models.bind.spi; import java.util.EnumSet; diff --git a/src/main/java/org/hibernate/models/orm/bind/spi/BindingState.java b/src/main/java/org/hibernate/boot/models/bind/spi/BindingState.java similarity index 78% rename from src/main/java/org/hibernate/models/orm/bind/spi/BindingState.java rename to src/main/java/org/hibernate/boot/models/bind/spi/BindingState.java index a060e77..d4e87bf 100644 --- a/src/main/java/org/hibernate/models/orm/bind/spi/BindingState.java +++ b/src/main/java/org/hibernate/boot/models/bind/spi/BindingState.java @@ -4,16 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.spi; +package org.hibernate.boot.models.bind.spi; import org.hibernate.boot.model.relational.Database; import org.hibernate.boot.spi.MetadataBuildingContext; import org.hibernate.internal.util.KeyedConsumer; -import org.hibernate.models.orm.bind.internal.binders.IdentifiableTypeBinder; -import org.hibernate.models.orm.bind.internal.binders.ManagedTypeBinder; -import org.hibernate.models.orm.bind.internal.binders.TableBinder; -import org.hibernate.models.orm.categorize.spi.FilterDefRegistration; -import org.hibernate.models.orm.categorize.spi.ManagedTypeMetadata; +import org.hibernate.boot.models.bind.internal.binders.IdentifiableTypeBinder; +import org.hibernate.boot.models.bind.internal.binders.ManagedTypeBinder; +import org.hibernate.boot.models.bind.internal.binders.TableBinder; +import org.hibernate.boot.models.categorize.spi.FilterDefRegistration; +import org.hibernate.boot.models.categorize.spi.ManagedTypeMetadata; import org.hibernate.models.spi.ClassDetails; /** diff --git a/src/main/java/org/hibernate/models/orm/bind/spi/PersistentTableReference.java b/src/main/java/org/hibernate/boot/models/bind/spi/PersistentTableReference.java similarity index 86% rename from src/main/java/org/hibernate/models/orm/bind/spi/PersistentTableReference.java rename to src/main/java/org/hibernate/boot/models/bind/spi/PersistentTableReference.java index e4406d9..4ceb8de 100644 --- a/src/main/java/org/hibernate/models/orm/bind/spi/PersistentTableReference.java +++ b/src/main/java/org/hibernate/boot/models/bind/spi/PersistentTableReference.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.spi; +package org.hibernate.boot.models.bind.spi; /** * @author Steve Ebersole diff --git a/src/main/java/org/hibernate/models/orm/bind/spi/PhysicalTableReference.java b/src/main/java/org/hibernate/boot/models/bind/spi/PhysicalTableReference.java similarity index 88% rename from src/main/java/org/hibernate/models/orm/bind/spi/PhysicalTableReference.java rename to src/main/java/org/hibernate/boot/models/bind/spi/PhysicalTableReference.java index 421998a..78d42cb 100644 --- a/src/main/java/org/hibernate/models/orm/bind/spi/PhysicalTableReference.java +++ b/src/main/java/org/hibernate/boot/models/bind/spi/PhysicalTableReference.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.spi; +package org.hibernate.boot.models.bind.spi; import org.hibernate.boot.model.naming.Identifier; diff --git a/src/main/java/org/hibernate/models/orm/bind/spi/QuotedIdentifierTarget.java b/src/main/java/org/hibernate/boot/models/bind/spi/QuotedIdentifierTarget.java similarity index 89% rename from src/main/java/org/hibernate/models/orm/bind/spi/QuotedIdentifierTarget.java rename to src/main/java/org/hibernate/boot/models/bind/spi/QuotedIdentifierTarget.java index 4c86d74..3b33264 100644 --- a/src/main/java/org/hibernate/models/orm/bind/spi/QuotedIdentifierTarget.java +++ b/src/main/java/org/hibernate/boot/models/bind/spi/QuotedIdentifierTarget.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.spi; +package org.hibernate.boot.models.bind.spi; /** * @author Steve Ebersole diff --git a/src/main/java/org/hibernate/models/orm/bind/spi/SchemaAware.java b/src/main/java/org/hibernate/boot/models/bind/spi/SchemaAware.java similarity index 90% rename from src/main/java/org/hibernate/models/orm/bind/spi/SchemaAware.java rename to src/main/java/org/hibernate/boot/models/bind/spi/SchemaAware.java index 6000d15..19ccdd9 100644 --- a/src/main/java/org/hibernate/models/orm/bind/spi/SchemaAware.java +++ b/src/main/java/org/hibernate/boot/models/bind/spi/SchemaAware.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.spi; +package org.hibernate.boot.models.bind.spi; import org.hibernate.boot.model.naming.Identifier; diff --git a/src/main/java/org/hibernate/models/orm/bind/spi/TableReference.java b/src/main/java/org/hibernate/boot/models/bind/spi/TableReference.java similarity index 78% rename from src/main/java/org/hibernate/models/orm/bind/spi/TableReference.java rename to src/main/java/org/hibernate/boot/models/bind/spi/TableReference.java index 7280062..109cd98 100644 --- a/src/main/java/org/hibernate/models/orm/bind/spi/TableReference.java +++ b/src/main/java/org/hibernate/boot/models/bind/spi/TableReference.java @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright: Red Hat Inc. and Hibernate Authors */ -package org.hibernate.models.orm.bind.spi; +package org.hibernate.boot.models.bind.spi; import org.hibernate.boot.model.naming.Identifier; +import org.hibernate.boot.models.bind.internal.PhysicalView; import org.hibernate.mapping.Table; -import org.hibernate.models.orm.bind.internal.InLineView; -import org.hibernate.models.orm.bind.internal.PhysicalTable; -import org.hibernate.models.orm.bind.internal.PhysicalView; -import org.hibernate.models.orm.bind.internal.SecondaryTable; +import org.hibernate.boot.models.bind.internal.InLineView; +import org.hibernate.boot.models.bind.internal.PhysicalTable; +import org.hibernate.boot.models.bind.internal.SecondaryTable; /** * Following the SQL "table reference" rule, will be one of