#79 - Realign classes under hibernate-core package structure

sebersole · Nov 19, 2023 · fb4efc5 · fb4efc5
1 parent fdc65cd
commit fb4efc5
Show file tree

Hide file tree

Showing 152 changed files with 647 additions and 679 deletions.
diff --git a/...orm/AccessTypeDeterminationException.java → ...els/AccessTypeDeterminationException.java b/...orm/AccessTypeDeterminationException.java → ...els/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/...els/orm/AccessTypePlacementException.java → .../models/AccessTypePlacementException.java b/...els/orm/AccessTypePlacementException.java → .../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/...els/orm/AnnotationPlacementException.java → .../models/AnnotationPlacementException.java b/...els/orm/AnnotationPlacementException.java → .../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/...java/org/hibernate/models/orm/Copied.java → ...ava/org/hibernate/boot/models/Copied.java b/...java/org/hibernate/models/orm/Copied.java → ...ava/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/...nate/models/orm/HibernateAnnotations.java → ...ate/boot/models/HibernateAnnotations.java b/...nate/models/orm/HibernateAnnotations.java → ...ate/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/.../hibernate/models/orm/JpaAnnotations.java → ...hibernate/boot/models/JpaAnnotations.java b/.../hibernate/models/orm/JpaAnnotations.java → ...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/...models/orm/MemberResolutionException.java → ...oot/models/MemberResolutionException.java b/...models/orm/MemberResolutionException.java → ...oot/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/...rm/MultipleAttributeNaturesException.java → ...ls/MultipleAttributeNaturesException.java b/...rm/MultipleAttributeNaturesException.java → ...ls/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/.../models/orm/bind/ModelBindingLogging.java → ...boot/models/bind/ModelBindingLogging.java b/.../models/orm/bind/ModelBindingLogging.java → ...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/...g/hibernate/boot/internal/AnyKeyType.java → ...boot/models/bind/internal/AnyKeyType.java b/...g/hibernate/boot/internal/AnyKeyType.java → ...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/...orm/bind/internal/BindingContextImpl.java → ...els/bind/internal/BindingContextImpl.java b/...orm/bind/internal/BindingContextImpl.java → ...els/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/...dels/orm/bind/internal/BindingHelper.java → ...t/models/bind/internal/BindingHelper.java b/...dels/orm/bind/internal/BindingHelper.java → ...t/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/...orm/bind/internal/BindingOptionsImpl.java → ...els/bind/internal/BindingOptionsImpl.java b/...orm/bind/internal/BindingOptionsImpl.java → ...els/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/...s/orm/bind/internal/BindingStateImpl.java → ...odels/bind/internal/BindingStateImpl.java b/...s/orm/bind/internal/BindingStateImpl.java → ...odels/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/.../models/orm/bind/internal/InLineView.java → ...boot/models/bind/internal/InLineView.java b/.../models/orm/bind/internal/InLineView.java → ...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/...dels/orm/bind/internal/PhysicalTable.java → ...t/models/bind/internal/PhysicalTable.java b/...dels/orm/bind/internal/PhysicalTable.java → ...t/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/...odels/orm/bind/internal/PhysicalView.java → ...ot/models/bind/internal/PhysicalView.java b/...odels/orm/bind/internal/PhysicalView.java → ...ot/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/.../models/orm/bind/internal/SecondPass.java → ...boot/models/bind/internal/SecondPass.java b/.../models/orm/bind/internal/SecondPass.java → ...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/...els/orm/bind/internal/SecondaryTable.java → .../models/bind/internal/SecondaryTable.java b/...els/orm/bind/internal/SecondaryTable.java → .../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/...ind/internal/binders/AttributeBinder.java → ...ind/internal/binders/AttributeBinder.java b/...ind/internal/binders/AttributeBinder.java → ...ind/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/...m/bind/internal/binders/ColumnBinder.java → ...s/bind/internal/binders/ColumnBinder.java b/...m/bind/internal/binders/ColumnBinder.java → ...s/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/...ind/internal/binders/DelegateBinders.java → ...ind/internal/binders/DelegateBinders.java b/...ind/internal/binders/DelegateBinders.java → ...ind/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